ソースを参照

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

绘卷增加多项功能
huangrunheng 1 年間 前
親
コミット
5d32b3ff85

+ 8 - 0
tasks/MemoryScrolls/assets.py

@@ -48,6 +48,14 @@ class MemoryScrollsAssets:
 	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_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_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")
+	# 绘卷到达95%进度 
+	I_MS_COMPLETE_95 = RuleImage(roi_front=(655,594,4,18), roi_back=(655,594,4,18), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_complete_100.png")
+	# 小碎片 
+	I_MS_FRAGMENT_S = RuleImage(roi_front=(290,677,40,35), roi_back=(290,677,40,35), threshold=0.8, method="Template matching", file="./tasks/MemoryScrolls/ms/ms_ms_fragment_s.png")
+	# 小碎片满50 
+	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")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 8 - 0
tasks/MemoryScrolls/config.py

@@ -18,10 +18,18 @@ class ScrollNumber(str, Enum):
     SIX = "卷六"
     SIX = "卷六"
 
 
 class MemoryScrollsConfig(ConfigBase):
 class MemoryScrollsConfig(ConfigBase):
+    auto_contribute_memoryscrolls: bool = Field(default=True, description='自动贡献绘卷碎片')
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
     auto_close_exploration: bool = Field(default=False, description='指定绘卷结束后,自动关闭探索任务,避免长时间无意义执行')
     auto_close_exploration: bool = Field(default=False, description='指定绘卷结束后,自动关闭探索任务,避免长时间无意义执行')
+    notification_95: bool = Field(default=False, description='到达95%进度时发送通知')
+
+class MemoryScrollsFinish(ConfigBase):
+    auto_finish_exploration: bool = Field(default=False, description='小绘卷满50后自动结束当日探索任务')
+    # 当日小绘卷满50后指定下次运行时间
+    next_exploration_time: Time = Field(default=Time(hour=7, minute=0, second=0))
 
 
 class MemoryScrolls(ConfigBase):
 class MemoryScrolls(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)
     memory_scrolls_config: MemoryScrollsConfig = Field(default_factory=MemoryScrollsConfig)
     memory_scrolls_config: MemoryScrollsConfig = Field(default_factory=MemoryScrollsConfig)
+    memory_scrolls_finish: MemoryScrollsFinish = Field(default_factory=MemoryScrollsFinish)
 
 

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

@@ -88,5 +88,41 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "大绘卷不足"
     "description": "大绘卷不足"
+  },
+  {
+    "itemName": "ms_complete_95",
+    "imageName": "ms_ms_complete_100.png",
+    "roiFront": "655,594,4,18",
+    "roiBack": "655,594,4,18",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "绘卷到达95%进度"
+  },
+  {
+    "itemName": "ms_fragment_s",
+    "imageName": "ms_ms_fragment_s.png",
+    "roiFront": "290,677,40,35",
+    "roiBack": "290,677,40,35",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "小碎片"
+  },
+  {
+    "itemName": "ms_fragment_s_50",
+    "imageName": "ms_ms_fragment_s_50.png",
+    "roiFront": "473,517,60,25",
+    "roiBack": "473,517,60,25",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "小碎片满50"
+  },
+  {
+    "itemName": "ms_fragment_s_verification",
+    "imageName": "ms_ms_fragment_s_verification.png",
+    "roiFront": "522,318,100,100",
+    "roiBack": "522,318,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
   }
 ]
 ]

BIN
tasks/MemoryScrolls/ms/ms_ms_complete_100.png


BIN
tasks/MemoryScrolls/ms/ms_ms_fragment_s.png


BIN
tasks/MemoryScrolls/ms/ms_ms_fragment_s_50.png


BIN
tasks/MemoryScrolls/ms/ms_ms_fragment_s_verification.png


+ 22 - 1
tasks/MemoryScrolls/script_task.py

@@ -38,6 +38,19 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
             logger.error('Failed to enter Memory Scrolls main page')
             logger.error('Failed to enter Memory Scrolls main page')
             self.set_next_run(task='MemoryScrolls', success=False)
             self.set_next_run(task='MemoryScrolls', success=False)
             raise TaskEnd
             raise TaskEnd
+        # 如果每天只刷小绘卷50,则先检测小绘卷数量
+        if self.config.memory_scrolls.memory_scrolls_finish.auto_finish_exploration:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_MS_FRAGMENT_S_VERIFICATION):
+                    break
+                if self.appear_then_click(self.I_MS_FRAGMENT_S, interval=1.5):
+                    continue
+            if self.appear(self.I_MS_FRAGMENT_S_50):
+                logger.info('Small Memory Scrolls fragments reached 50, planning tomorrow exploration')
+                # 安排下次探索
+                self.custom_next_run(task='Exploration', custom_time=self.config.memory_scrolls.memory_scrolls_finish.next_exploration_time, time_delta=1)
+            self.ui_click_until_smt_disappear(self.I_MS_MAIN, stop=self.I_MS_FRAGMENT_S_VERIFICATION, interval=1.5)
         # 进入指定分卷
         # 进入指定分卷
         self.goto_scroll(con)
         self.goto_scroll(con)
         # 返回召唤界面,目前只发现此种返回按键
         # 返回召唤界面,目前只发现此种返回按键
@@ -73,10 +86,18 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
                     self.set_next_run(task='MemoryScrolls', success=False)
                     self.set_next_run(task='MemoryScrolls', success=False)
                     raise TaskEnd
                     raise TaskEnd
         
         
+        # 到达指定进度时进行通知提示
+        if con.notification_95 and not self.appear(self.I_MS_COMPLETE_95):
+            logger.info('Memory Scrolls progress reached 95%, sending notification')
+            self.config.notifier.push(title='追忆绘卷进度95%', content='绘卷进度已达95%,请立即空降')
+
         # 判断是否需要捐献碎片
         # 判断是否需要捐献碎片
         if self.appear(self.I_MS_CONTRIBUTE) or not self.appear(self.I_MS_COMPLETE):
         if self.appear(self.I_MS_CONTRIBUTE) or not self.appear(self.I_MS_COMPLETE):
             logger.info(f'Contributing Memory Scrolls for scroll {con.scroll_number.name}')
             logger.info(f'Contributing Memory Scrolls for scroll {con.scroll_number.name}')
-            self.contribute_memoryscrolls()
+            if con.auto_contribute_memoryscrolls:
+                # 自动捐献碎片
+                logger.info('Auto contributing Memory Scrolls')
+                self.contribute_memoryscrolls()
             # 设置下一次运行时间
             # 设置下一次运行时间
             self.set_next_run(task='MemoryScrolls', success=True)
             self.set_next_run(task='MemoryScrolls', success=True)
         else:
         else: