Просмотр исходного кода

Merge pull request #1035 from yEs1do/feat(Memory_Scrolls)

兼容双绘卷模式
huangrunheng 1 год назад
Родитель
Сommit
30ba942665

+ 4 - 0
tasks/MemoryScrolls/assets.py

@@ -25,6 +25,8 @@ class MemoryScrollsAssets:
 	C_MS_SCROLL_6 = RuleClick(roi_front=(835,389,303,204), roi_back=(835,389,303,204), name="ms_scroll_6")
 	# 贡献完成跳结算 
 	C_MS_CONTRIBUTED = RuleClick(roi_front=(108,509,993,190), roi_back=(108,509,993,190), name="ms_contributed")
+	# 双绘卷之二 
+	C_MS_DOUBLE_SCROLLS_2 = RuleClick(roi_front=(714,128,464,397), roi_back=(714,128,464,397), name="ms_double_scrolls_2")
 
 
 	# Image Rule Assets
@@ -56,6 +58,8 @@ class MemoryScrollsAssets:
 	I_MS_FRAGMENT_S_50 = RuleImage(roi_front=(473,517,60,25), roi_back=(473,517,60,25), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_50.png")
 	# description 
 	I_MS_FRAGMENT_S_VERIFICATION = RuleImage(roi_front=(522,318,100,100), roi_back=(522,318,100,100), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png")
+	# 双绘卷进入按钮 
+	I_MS_DOUBLE_SCROLLS_ENTER = RuleImage(roi_front=(565,586,154,40), roi_back=(565,586,154,40), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_double_scrolls_enter.png")
 
 
 	# Swipe Rule Assets

+ 5 - 0
tasks/MemoryScrolls/config.py

@@ -9,6 +9,10 @@ from enum import Enum
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 
+class DoubleScrolls(str, Enum):
+    ONE = "默认绘卷一"
+    TWO = "双绘卷之二"
+
 class ScrollNumber(str, Enum):
     ONE = "卷一"
     TWO = "卷二"
@@ -19,6 +23,7 @@ class ScrollNumber(str, Enum):
 
 class MemoryScrollsConfig(ConfigBase):
     auto_contribute_memoryscrolls: bool = Field(default=True, description='自动贡献绘卷碎片')
+    double_scrolls: DoubleScrolls = Field(default=DoubleScrolls.ONE, description='double_scrolls_help')
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
     auto_close_exploration: bool = Field(default=False, description='指定绘卷结束后,自动关闭探索任务,避免长时间无意义执行')
     notification_95: bool = Field(default=False, description='到达95%进度时发送通知')

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

@@ -40,5 +40,11 @@
     "roiFront": "108,509,993,190",
     "roiBack": "108,509,993,190",
     "description": "贡献完成跳结算"
+  },
+  {
+    "itemName": "ms_double_scrolls_2",
+    "roiFront": "714,128,464,397",
+    "roiBack": "714,128,464,397",
+    "description": "双绘卷之二"
   }
 ]

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

@@ -124,5 +124,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "ms_double_scrolls_enter",
+    "imageName": "ms_ms_double_scrolls_enter.png",
+    "roiFront": "565,586,154,40",
+    "roiBack": "565,586,154,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "双绘卷进入按钮"
   }
 ]

BIN
tasks/MemoryScrolls/ms/ms_ms_double_scrolls_enter.png


+ 12 - 1
tasks/MemoryScrolls/script_task.py

@@ -29,9 +29,20 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
         if self.wait_until_appear(self.I_MS_ENTER, wait_time=30):
             while 1:
                 self.screenshot()
-                if self.appear(self.I_MS_MAIN):
+                if self.appear(self.I_MS_FRAGMENT_S):
                     logger.info('Entered Memory Scrolls main page')
                     break
+                # 周年庆等时期会使用双绘卷
+                if self.appear(self.I_MS_DOUBLE_SCROLLS_ENTER):
+                    logger.info('Using Double Memory Scrolls')
+                    if con.double_scrolls == con.double_scrolls.ONE:
+                        logger.info('Choose Double Memory Scrolls One')
+                    else:
+                        logger.info('Choose Double Memory Scrolls Two')
+                        self.click(self.C_MS_DOUBLE_SCROLLS_2, interval=1)
+                    if self.appear_then_click(self.I_MS_DOUBLE_SCROLLS_ENTER, interval=1):
+                        continue
+                # 右上角绘卷铃铛
                 if self.appear_then_click(self.I_MS_ENTER, interval=1):
                     continue
         else: