Browse Source

补全捐赠绘卷任务

yEs1do 1 year ago
parent
commit
57950800a5

+ 1 - 0
tasks/Exploration/base.py

@@ -323,6 +323,7 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
         next_run = datetime.now() + con_scrolls.scrolls_cd
         next_run = datetime.now() + con_scrolls.scrolls_cd
         self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
         self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
         self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
         self.set_next_run(task='RealmRaid', success=False, finish=False, target=datetime.now())
+        self.set_next_run(task='MemoryScrolls', success=False, finish=False, target=datetime.now())
         raise TaskEnd
         raise TaskEnd
 
 
     #
     #

+ 11 - 21
tasks/MemoryScrolls/assets.py

@@ -11,8 +11,6 @@ class MemoryScrollsAssets:
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets
-	# 进入绘卷主界面 
-	C_MS_ENTER = RuleClick(roi_front=(1166,148,29,78), roi_back=(1166,148,29,78), name="ms_enter")
 	# 进入卷一 
 	# 进入卷一 
 	C_MS_SCROLL_1 = RuleClick(roi_front=(170,157,279,192), roi_back=(170,157,279,192), name="ms_scroll_1")
 	C_MS_SCROLL_1 = RuleClick(roi_front=(170,157,279,192), roi_back=(170,157,279,192), name="ms_scroll_1")
 	# 进入卷二 
 	# 进入卷二 
@@ -25,39 +23,31 @@ class MemoryScrollsAssets:
 	C_MS_SCROLL_5 = RuleClick(roi_front=(491,390,303,207), roi_back=(491,390,303,207), name="ms_scroll_5")
 	C_MS_SCROLL_5 = RuleClick(roi_front=(491,390,303,207), roi_back=(491,390,303,207), name="ms_scroll_5")
 	# 进入卷六 
 	# 进入卷六 
 	C_MS_SCROLL_6 = RuleClick(roi_front=(835,389,303,204), roi_back=(835,389,303,204), name="ms_scroll_6")
 	C_MS_SCROLL_6 = RuleClick(roi_front=(835,389,303,204), roi_back=(835,389,303,204), name="ms_scroll_6")
-	# 退出绘卷主界面 
-	C_MS_BACK = RuleClick(roi_front=(26,32,49,42), roi_back=(26,32,49,42), name="ms_back")
-	# 退出捐献界面 
-	C_MS_CLOSE = RuleClick(roi_front=(1142,48,45,36), roi_back=(1142,48,45,36), name="ms_close")
-	# 贡献碎片 
-	C_MS_CONTRIBUTE = RuleClick(roi_front=(991,572,168,53), roi_back=(991,572,168,53), name="ms_contribute")
 	# 贡献完成跳结算 
 	# 贡献完成跳结算 
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入绘卷主界面 
 	# 进入绘卷主界面 
-	I_MS_ENTER = RuleImage(roi_front=(1169,155,24,55), roi_back=(1169,155,24,55), threshold=0.5, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_enter.png")
-	# 使用!来确定处于绘卷主界面 
-	I_MS_MAIN = RuleImage(roi_front=(689,3,40,50), roi_back=(689,3,40,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_main.png")
+	I_MS_ENTER = RuleImage(roi_front=(1169,155,24,55), roi_back=(1169,155,24,55), threshold=0.5, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_enter.png")
+	# 判断是否处于绘卷主界面 
+	I_MS_MAIN = RuleImage(roi_front=(689,3,40,50), roi_back=(689,3,40,50), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_main.png")
 	# 退出到召唤界面 
 	# 退出到召唤界面 
-	I_MS_BACK = RuleImage(roi_front=(32,31,43,45), roi_back=(32,31,43,45), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_back.png")
+	I_MS_BACK = RuleImage(roi_front=(32,31,43,45), roi_back=(32,31,43,45), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_back.png")
 	# 关闭分卷捐献界面 
 	# 关闭分卷捐献界面 
-	I_MS_CLOSE = RuleImage(roi_front=(1145,48,39,41), roi_back=(1145,48,39,41), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_close.png")
-	# 滑块(在捐献界面且未完成) 
-	I_MS_MATTER = RuleImage(roi_front=(834,338,47,53), roi_back=(834,338,47,53), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_matter.png")
+	I_MS_CLOSE = RuleImage(roi_front=(1145,48,39,41), roi_back=(1145,48,39,41), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_close.png")
 	# 贡献碎片 
 	# 贡献碎片 
-	I_MS_CONTRIBUTE = RuleImage(roi_front=(1013,583,125,35), roi_back=(1013,583,125,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_contribute.png")
+	I_MS_CONTRIBUTE = RuleImage(roi_front=(1013,583,125,35), roi_back=(1013,583,125,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contribute.png")
 	# 贡献碎片完成 
 	# 贡献碎片完成 
-	I_MS_CONTRIBUTED = RuleImage(roi_front=(493,232,63,40), roi_back=(493,232,63,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_contributed.png")
+	I_MS_CONTRIBUTED = RuleImage(roi_front=(493,232,63,40), roi_back=(493,232,63,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_contributed.png")
 	# 绘卷100% 
 	# 绘卷100% 
-	I_MS_COMPLETE = RuleImage(roi_front=(397,593,100,21), roi_back=(397,593,100,21), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_complete.png")
+	I_MS_COMPLETE = RuleImage(roi_front=(397,593,100,21), roi_back=(397,593,100,21), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete.png")
 	# 小绘卷不足 
 	# 小绘卷不足 
-	I_MS_ZERO_S = RuleImage(roi_front=(968,160,51,27), roi_back=(968,160,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_zero_s.png")
+	I_MS_ZERO_S = RuleImage(roi_front=(968,160,51,27), roi_back=(968,160,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_s.png")
 	# 中绘卷不足 
 	# 中绘卷不足 
-	I_MS_ZERO_M = RuleImage(roi_front=(967,312,54,26), roi_back=(967,312,54,26), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_zero_m.png")
+	I_MS_ZERO_M = RuleImage(roi_front=(967,312,54,26), roi_back=(967,312,54,26), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_m.png")
 	# 大绘卷不足 
 	# 大绘卷不足 
-	I_MS_ZERO_L = RuleImage(roi_front=(968,464,51,27), roi_back=(968,464,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_zero_l.png")
+	I_MS_ZERO_L = RuleImage(roi_front=(968,464,51,27), roi_back=(968,464,51,27), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_zero_l.png")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 7 - 7
tasks/MemoryScrolls/config.py

@@ -10,15 +10,15 @@ from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.config_base import ConfigBase, Time
 
 
 class ScrollNumber(str, Enum):
 class ScrollNumber(str, Enum):
-    SCROLL_1 = "卷一"
-    SCROLL_2 = "卷二"
-    SCROLL_3 = "卷三"
-    SCROLL_4 = "卷四"
-    SCROLL_5 = "卷五"
-    SCROLL_6 = "卷六"
+    ONE = "卷一"
+    TWO = "卷二"
+    THREE = "卷三"
+    FOUR = "卷四"
+    FIVE = "卷五"
+    SIX = "卷六"
 
 
 class MemoryScrollsConfig(ConfigBase):
 class MemoryScrollsConfig(ConfigBase):
-    scroll_number: ScrollNumber = Field(default=ScrollNumber.SCROLL_1, description='scroll_number_help')
+    scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
 
 
 class MemoryScrolls(ConfigBase):
 class MemoryScrolls(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 0 - 24
tasks/MemoryScrolls/ms/click.json

@@ -1,10 +1,4 @@
 [
 [
-  {
-    "itemName": "ms_enter",
-    "roiFront": "1166,148,29,78",
-    "roiBack": "1166,148,29,78",
-    "description": "进入绘卷主界面"
-  },
   {
   {
     "itemName": "ms_scroll_1",
     "itemName": "ms_scroll_1",
     "roiFront": "170,157,279,192",
     "roiFront": "170,157,279,192",
@@ -41,24 +35,6 @@
     "roiBack": "835,389,303,204",
     "roiBack": "835,389,303,204",
     "description": "进入卷六"
     "description": "进入卷六"
   },
   },
-  {
-    "itemName": "ms_back",
-    "roiFront": "26,32,49,42",
-    "roiBack": "26,32,49,42",
-    "description": "退出绘卷主界面"
-  },
-  {
-    "itemName": "ms_close",
-    "roiFront": "1142,48,45,36",
-    "roiBack": "1142,48,45,36",
-    "description": "退出捐献界面"
-  },
-  {
-    "itemName": "ms_contribute",
-    "roiFront": "991,572,168,53",
-    "roiBack": "991,572,168,53",
-    "description": "贡献碎片"
-  },
   {
   {
     "itemName": "ms_contributed",
     "itemName": "ms_contributed",
     "roiFront": "108,509,993,190",
     "roiFront": "108,509,993,190",

+ 9 - 18
tasks/MemoryScrolls/ms/image.json

@@ -1,7 +1,7 @@
 [
 [
   {
   {
     "itemName": "ms_enter",
     "itemName": "ms_enter",
-    "imageName": "ms_enter.png",
+    "imageName": "ms_ms_enter.png",
     "roiFront": "1169,155,24,55",
     "roiFront": "1169,155,24,55",
     "roiBack": "1169,155,24,55",
     "roiBack": "1169,155,24,55",
     "method": "Template matching",
     "method": "Template matching",
@@ -19,7 +19,7 @@
   },
   },
   {
   {
     "itemName": "ms_back",
     "itemName": "ms_back",
-    "imageName": "ms_back.png",
+    "imageName": "ms_ms_back.png",
     "roiFront": "32,31,43,45",
     "roiFront": "32,31,43,45",
     "roiBack": "32,31,43,45",
     "roiBack": "32,31,43,45",
     "method": "Template matching",
     "method": "Template matching",
@@ -28,25 +28,16 @@
   },
   },
   {
   {
     "itemName": "ms_close",
     "itemName": "ms_close",
-    "imageName": "ms_close.png",
+    "imageName": "ms_ms_close.png",
     "roiFront": "1145,48,39,41",
     "roiFront": "1145,48,39,41",
     "roiBack": "1145,48,39,41",
     "roiBack": "1145,48,39,41",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "关闭分卷捐献界面"
     "description": "关闭分卷捐献界面"
   },
   },
-  {
-    "itemName": "ms_matter",
-    "imageName": "ms_matter.png",
-    "roiFront": "834,338,47,53",
-    "roiBack": "834,338,47,53",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "滑块(在捐献界面且未完成)"
-  },
   {
   {
     "itemName": "ms_contribute",
     "itemName": "ms_contribute",
-    "imageName": "ms_contribute.png",
+    "imageName": "ms_ms_contribute.png",
     "roiFront": "1013,583,125,35",
     "roiFront": "1013,583,125,35",
     "roiBack": "1013,583,125,35",
     "roiBack": "1013,583,125,35",
     "method": "Template matching",
     "method": "Template matching",
@@ -55,7 +46,7 @@
   },
   },
   {
   {
     "itemName": "ms_contributed",
     "itemName": "ms_contributed",
-    "imageName": "ms_contributed.png",
+    "imageName": "ms_ms_contributed.png",
     "roiFront": "493,232,63,40",
     "roiFront": "493,232,63,40",
     "roiBack": "493,232,63,40",
     "roiBack": "493,232,63,40",
     "method": "Template matching",
     "method": "Template matching",
@@ -64,7 +55,7 @@
   },
   },
   {
   {
     "itemName": "ms_complete",
     "itemName": "ms_complete",
-    "imageName": "ms_complete.png",
+    "imageName": "ms_ms_complete.png",
     "roiFront": "397,593,100,21",
     "roiFront": "397,593,100,21",
     "roiBack": "397,593,100,21",
     "roiBack": "397,593,100,21",
     "method": "Template matching",
     "method": "Template matching",
@@ -73,7 +64,7 @@
   },
   },
   {
   {
     "itemName": "ms_zero_s",
     "itemName": "ms_zero_s",
-    "imageName": "ms_zero_s.png",
+    "imageName": "ms_ms_zero_s.png",
     "roiFront": "968,160,51,27",
     "roiFront": "968,160,51,27",
     "roiBack": "968,160,51,27",
     "roiBack": "968,160,51,27",
     "method": "Template matching",
     "method": "Template matching",
@@ -82,7 +73,7 @@
   },
   },
   {
   {
     "itemName": "ms_zero_m",
     "itemName": "ms_zero_m",
-    "imageName": "ms_zero_m.png",
+    "imageName": "ms_ms_zero_m.png",
     "roiFront": "967,312,54,26",
     "roiFront": "967,312,54,26",
     "roiBack": "967,312,54,26",
     "roiBack": "967,312,54,26",
     "method": "Template matching",
     "method": "Template matching",
@@ -91,7 +82,7 @@
   },
   },
   {
   {
     "itemName": "ms_zero_l",
     "itemName": "ms_zero_l",
-    "imageName": "ms_zero_l.png",
+    "imageName": "ms_ms_zero_l.png",
     "roiFront": "968,464,51,27",
     "roiFront": "968,464,51,27",
     "roiBack": "968,464,51,27",
     "roiBack": "968,464,51,27",
     "method": "Template matching",
     "method": "Template matching",

BIN
tasks/MemoryScrolls/ms/ms_ms_back.png


BIN
tasks/MemoryScrolls/ms/ms_ms_close.png


BIN
tasks/MemoryScrolls/ms/ms_ms_complete.png


BIN
tasks/MemoryScrolls/ms/ms_ms_contribute.png


BIN
tasks/MemoryScrolls/ms/ms_ms_contributed.png


BIN
tasks/MemoryScrolls/ms/ms_ms_enter.png


BIN
tasks/MemoryScrolls/ms/ms_ms_main.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_l.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_m.png


BIN
tasks/MemoryScrolls/ms/ms_ms_zero_s.png


+ 73 - 26
tasks/MemoryScrolls/script_task.py

@@ -14,42 +14,89 @@ from tasks.MemoryScrolls.config import ScrollNumber
 
 
 class ScriptTask(GameUi, MemoryScrollsAssets):
 class ScriptTask(GameUi, MemoryScrollsAssets):
 
 
-    # 进入绘卷主界面
-    def run(self):
+    def run(self):        
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_summon)
         self.ui_goto(page_summon)
-
+        # 进入绘卷主界面
+        self.goto_memoryscrolls_main()        
+        raise TaskEnd
+    
+    def goto_memoryscrolls_main(self):
         # 循环寻找&点击绘卷入口
         # 循环寻找&点击绘卷入口
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear_then_click(self.I_MS_ENTER, interval=1):
-                continue
             if self.appear(self.I_MS_MAIN):
             if self.appear(self.I_MS_MAIN):
+                logger.info('Entered Memory Scrolls main page')
                 break
                 break
-
-                sleep(3)
-            # (根据config进入指定分卷,不会写所以暂定卷一)
-            if self.appear_then_click(self.I_MS_MAIN, self.C_MS_SCROLL_1, interval=3):
+            if self.appear_then_click(self.I_MS_ENTER, interval=1):
                 continue
                 continue
-            # 检测到100% 任务完成 退出循环
-            if self.appear(self.I_MS_COMPLETE):
-                logger.info('Scroll already completed')
+        # 进入指定分卷
+        con = self.config.memory_scrolls.memory_scrolls_config
+        self.goto_scroll(con.scroll_number)
+        # 返回召唤界面,目前只发现此种返回按键
+        self.ui_click_until_disappear(self.I_MS_BACK, interval=1)
+        logger.info('Return to Summon page')
+    
+    def goto_scroll(self, scroll_number: ScrollNumber):
+        """
+        进入指定分卷
+        :param scroll_number: 分卷编号
+        """
+        while 1:
+            self.screenshot()
+            # 暂时用手动截取叉号,后续替换为通用图片
+            if self.appear(self.I_MS_CLOSE):
+                logger.info('Entered Memory Scrolls contribution page')
                 break
                 break
-
-
-        # 捐献小碎片直至不足
+            if scroll_number == ScrollNumber.ONE:
+                self.click(self.C_MS_SCROLL_1, interval=1)
+            elif scroll_number == ScrollNumber.TWO:
+                self.click(self.C_MS_SCROLL_2, interval=1)
+            elif scroll_number == ScrollNumber.THREE:
+                self.click(self.C_MS_SCROLL_3, interval=1)
+            elif scroll_number == ScrollNumber.FOUR:
+                self.click(self.C_MS_SCROLL_4, interval=1)
+            elif scroll_number == ScrollNumber.FIVE:
+                self.click(self.C_MS_SCROLL_5, interval=1)
+            elif scroll_number == ScrollNumber.SIX:
+                self.click(self.C_MS_SCROLL_6, interval=1)
+        
+        # 判断是否需要捐献碎片
+        if self.appear(self.I_MS_CONTRIBUTE) or not self.appear(self.I_MS_COMPLETE):
+            logger.info(f'Contributing Memory Scrolls for scroll {scroll_number.name}')
+            self.contribute_memoryscrolls()
+            # 设置下一次运行时间
+            self.set_next_run(task='MemoryScrolls', success=True)
+        else:
+            logger.info(f'Scroll {scroll_number.name} is already completed')
+            self.set_next_run(task='MemoryScrolls', success=False)
+        # 返回绘卷主界面
+        self.ui_click_until_disappear(self.I_MS_CLOSE, interval=1)
+        logger.info('Closed Memory Scrolls contribution page')
+    
+    def contribute_memoryscrolls(self):
+        """
+        捐献碎片
+        :return: None
+        """
         while 1:
         while 1:
-             self.screenshot()
-             if self.appear(self.I_MS_ZERO_S):
-                 break
-             if self.appear(self.I_MS_CONTRIBUTE):
-                 self.swipe(self.S_MS_SWIPE_S,interval=1)
-                 continue
-             if self.appear_then_click(self.I_MS_CONTRIBUTE, interval=1):
-                 continue
-             if self.appear_then_click(self.I_MS_CONTRIBUTED,self.C_MS_CONTRIBUTED,interval=3):
-                 continue
-             continue
+            self.screenshot()
+            if self.appear(self.I_MS_ZERO_S) and self.appear(self.I_MS_ZERO_M) and self.appear(self.I_MS_ZERO_L):
+                logger.info('Memory Scrolls contribution is already completed')
+                return
+            self.swipe(self.S_MS_SWIPE_S, interval=1)
+            self.swipe(self.S_MS_SWIPE_M, interval=1)
+            self.swipe(self.S_MS_SWIPE_L, interval=1)
+            if self.appear_then_click(self.I_MS_CONTRIBUTE, interval=3):
+                logger.info('Contributed Memory Scrolls')
+                # 等待捐献动画结束
+                while 1:
+                    self.screenshot()
+                    if self.wait_until_appear(self.I_MS_CONTRIBUTED, wait_time=5):
+                        self.click(self.C_MS_CONTRIBUTED, interval=1)
+                    else:
+                        break
+