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

feat(Restart): Skip the claim email when the Soul overflow

ryland 1 год назад
Родитель
Сommit
d83c5f326a

+ 2 - 2
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\Neptine\Desktop\495446880-0f88defd-4d78-45c4-b745-6a7118b40f29.png"
+IMAGE_FILE = r"C:\Users\Ryland\Desktop\QQ20251014-103056.png"
 if __name__ == '__main__':
     from tasks.KekkaiActivation.script_task import ScriptTask
-    targe = ScriptTask.I_RS_RECORDS_SHIKI
+    targe = ScriptTask.I_UI_CONFIRM_SAMLL
     print(detect_image(IMAGE_FILE, targe))
 
     # ocr demo

+ 1 - 1
tasks/GlobalGame/assets.py

@@ -54,7 +54,7 @@ class GlobalGameAssets:
 	# description 
 	I_UI_AWARD = RuleImage(roi_front=(577,499,100,100), roi_back=(530,408,199,220), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_award.png")
 	# 短一点的确认 
-	I_UI_CONFIRM_SAMLL = RuleImage(roi_front=(677,390,130,62), roi_back=(677,390,130,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm_samll.png")
+	I_UI_CONFIRM_SAMLL = RuleImage(roi_front=(681,392,130,62), roi_back=(558,380,265,99), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_confirm_samll.png")
 	# 短一点的取消 
 	I_UI_CANCEL_SAMLL = RuleImage(roi_front=(472,389,128,62), roi_back=(472,389,128,62), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/ui/ui_ui_cancel_samll.png")
 	# description 

+ 2 - 2
tasks/GlobalGame/ui/image.json

@@ -65,8 +65,8 @@
   {
     "itemName": "ui_confirm_samll",
     "imageName": "ui_ui_confirm_samll.png",
-    "roiFront": "677,390,130,62",
-    "roiBack": "677,390,130,62",
+    "roiFront": "681,392,130,62",
+    "roiBack": "558,380,265,99",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "短一点的确认"

+ 11 - 34
tasks/Restart/login.py

@@ -160,6 +160,7 @@ class LoginHandler(BaseTask, RestartAssets):
         """
         logger.hr('Harvest')
         timer_harvest = Timer(5)  # 如果连续5秒没有发现任何奖励,退出
+        skip_default = False
         while 1:
             self.screenshot()
 
@@ -181,12 +182,18 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 logger.info('Close yellow close')
                 continue
-                # 关闭宠物小屋
+            # 关闭宠物小屋
             if self.appear_then_click(self.I_HARVEST_BACK_PET_HOUSE, interval=0.6):
                 timer_harvest.reset()
                 logger.info('Close yellow close')
                 continue
-                # 关闭姿度出现的蒙版
+            # 御魂溢确认
+            if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=2.5):
+                timer_harvest.reset()
+                skip_default = True
+                logger.info('Soul overflow')
+                continue
+            # 关闭姿度出现的蒙版
             if self.appear(self.I_HARVEST_ZIDU, interval=1):
                 timer_harvest.reset()
                 self.I_HARVEST_ZIDU.roi_front[0] -= 200
@@ -219,38 +226,8 @@ class LoginHandler(BaseTask, RestartAssets):
             if self.appear_then_click(self.I_HARVEST_SIGN_999, interval=1.5):
                 timer_harvest.reset()
                 continue
-            # 邮件
             # 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
-            if self.config.restart.harvest_config.enable_mail:
-                # if self.appear_then_click(self.I_HARVEST_MAIL, interval=3) or\
-                #         self.appear_then_click(self.I_HARVEST_MAIL_COPY, interval=3):
-                #     timer_harvest.reset()
-                #     self.wait_until_appear(self.I_HARVEST_MAIL_TITLE, wait_time=2)
-                #     if self.appear(self.I_HARVEST_MAIL_TITLE, interval=2.5):
-                #         while 1:
-                #             self.screenshot()
-                #             if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
-                #                 timer_harvest.reset()
-                #                 pass
-                #             if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
-                #                 continue
-                #
-                #             # 如果一直出现收取全部,那就说明还在进行中
-                #             if self.appear(self.I_HARVEST_MAIL_ALL):
-                #                 pass
-                #             # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
-                #             if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
-                #                 logger.info('Mail has been harvested')
-                #                 logger.info('Exit mail')
-                #                 break
-                #             if self.appear(self.I_LOGIN_RED_CLOSE, interval=2):
-                #                 self.click(self.I_LOGIN_RED_CLOSE)
-                #                 break
-                #             if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
-                #                 timer_harvest.reset()
-                #                 continue
-                #         continue
-                # 体力
+            if not skip_default and self.config.restart.harvest_config.enable_mail:
                 if self.appear(self.I_HARVEST_MAIL_CONFIRM):
                     self.click(self.I_HARVEST_MAIL_CONFIRM, interval=2)
                     timer_harvest.reset()
@@ -288,7 +265,7 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 continue
             # 自选御魂
-            if self.appear(self.I_HARVEST_SOUL_1):
+            if not skip_default and self.appear(self.I_HARVEST_SOUL_1):
                 logger.info('Select soul 2')
                 self.ui_click(self.I_HARVEST_SOUL_1, stop=self.I_HARVEST_SOUL_2)
                 self.ui_click(self.I_HARVEST_SOUL_2, stop=self.I_HARVEST_SOUL_3, interval=3)

+ 4 - 4
tasks/Restart/script_task.py

@@ -80,10 +80,10 @@ if __name__ == '__main__':
     config = Config('oas1')
     device = Device(config)
     task = ScriptTask(config, device)
-    task.config.update_scheduler()
-    task.delay_pending_tasks()
-    # task.screenshot()
-    # print(task.appear_then_click(task.I_LOGIN_SCROOLL_CLOSE, threshold=0.9))
+    task.app_restart()
+    # task.config.update_scheduler()
+    # task.delay_pending_tasks()
+