Explorar el Código

Merge pull request #1194 from BluettDream/dev_fix_mail

fix(Restart): harvest mail
huangrunheng hace 1 año
padre
commit
5481d71871

+ 11 - 1
tasks/Restart/assets.py

@@ -22,7 +22,7 @@ class RestartAssets:
 	# 邮件小图标 
 	I_HARVEST_MAIL = RuleImage(roi_front=(337,505,37,25), roi_back=(38,465,880,89), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail.png")
 	# 全部收取 
-	I_HARVEST_MAIL_ALL = RuleImage(roi_front=(80,622,75,64), roi_back=(80,622,75,64), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_all.png")
+	I_HARVEST_MAIL_ALL = RuleImage(roi_front=(69,589,64,57), roi_back=(28,572,115,123), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_all.png")
 	# 有些邮件需要点击一次 
 	I_HARVEST_MAIL_OPEN = RuleImage(roi_front=(163,367,45,48), roi_back=(139,86,100,487), threshold=0.9, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_open.png")
 	# 确认收取邮件 
@@ -55,6 +55,16 @@ class RestartAssets:
 	I_HARVEST_MAIL_COPY = RuleImage(roi_front=(257,509,29,21), roi_back=(192,472,790,100), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_copy.png")
 	# description 
 	I_HARVEST_MAIL_2 = RuleImage(roi_front=(156,125,65,60), roi_back=(120,94,290,536), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_2.png")
+	# 系统邮件打开状态 
+	I_SYSTEM_MAIL_OPEN = RuleImage(roi_front=(1201,223,51,112), roi_back=(1197,219,59,118), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_system_mail_open.png")
+	# 特殊邮件关闭状态 
+	I_SPECIAL_MAIL_CLOSE = RuleImage(roi_front=(1200,379,53,108), roi_back=(1185,342,80,178), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_special_mail_close.png")
+	# 系统邮件关闭状态 
+	I_SYSTEM_MAIL_CLOSE = RuleImage(roi_front=(1200,222,53,112), roi_back=(1186,193,81,156), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_system_mail_close.png")
+	# 特殊邮件打开状态 
+	I_SPECIAL_MAIL_OPEN = RuleImage(roi_front=(1201,380,55,110), roi_back=(1190,348,79,162), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_special_mail_open.png")
+	# 一键已读所有邮件 
+	I_READ_ALL_MAIL = RuleImage(roi_front=(155,603,166,44), roi_back=(149,588,182,72), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_read_all_mail.png")
 
 
 	# Click Rule Assets

BIN
tasks/Restart/harvest/harvest_harvest_mail_all.png


BIN
tasks/Restart/harvest/harvest_read_all_mail.png


BIN
tasks/Restart/harvest/harvest_special_mail_close.png


BIN
tasks/Restart/harvest/harvest_special_mail_open.png


BIN
tasks/Restart/harvest/harvest_system_mail_close.png


BIN
tasks/Restart/harvest/harvest_system_mail_open.png


+ 47 - 2
tasks/Restart/harvest/image.json

@@ -47,8 +47,8 @@
   {
     "itemName": "harvest_mail_all",
     "imageName": "harvest_harvest_mail_all.png",
-    "roiFront": "80,622,75,64",
-    "roiBack": "80,622,75,64",
+    "roiFront": "69,589,64,57",
+    "roiBack": "28,572,115,123",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "全部收取"
@@ -196,5 +196,50 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "system_mail_open",
+    "imageName": "harvest_system_mail_open.png",
+    "roiFront": "1201,223,51,112",
+    "roiBack": "1197,219,59,118",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "系统邮件打开状态"
+  },
+  {
+    "itemName": "special_mail_close",
+    "imageName": "harvest_special_mail_close.png",
+    "roiFront": "1200,379,53,108",
+    "roiBack": "1185,342,80,178",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "特殊邮件关闭状态"
+  },
+  {
+    "itemName": "system_mail_close",
+    "imageName": "harvest_system_mail_close.png",
+    "roiFront": "1200,222,53,112",
+    "roiBack": "1186,193,81,156",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "系统邮件关闭状态"
+  },
+  {
+    "itemName": "special_mail_open",
+    "imageName": "harvest_special_mail_open.png",
+    "roiFront": "1201,380,55,110",
+    "roiBack": "1190,348,79,162",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "特殊邮件打开状态"
+  },
+  {
+    "itemName": "read_all_mail",
+    "imageName": "harvest_read_all_mail.png",
+    "roiFront": "155,603,166,44",
+    "roiBack": "149,588,182,72",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "一键已读所有邮件"
   }
 ]

+ 39 - 27
tasks/Restart/login.py

@@ -1,7 +1,7 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-
+import random
 from module.base.timer import Timer
 from module.exception import RequestHumanTakeover, GameTooManyClickError, GameStuckError
 from module.logger import logger
@@ -230,32 +230,9 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 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()
-                    continue
-                if self.appear(self.I_HARVEST_MAIL_ALL, threshold=0.9):
-                    self.click(self.I_HARVEST_MAIL_ALL, interval=2)
-                    self.wait_until_appear(self.I_HARVEST_MAIL_CONFIRM, wait_time=1)
-                    timer_harvest.reset()
-                    continue
-                # threshold如果是0.9,可能会导致有邮件但无法识别永久卡住
-                if self.appear(self.I_HARVEST_MAIL_OPEN, threshold=0.8):
-                    self.click(self.I_HARVEST_MAIL_OPEN, interval=0.8)
-                    timer_harvest.reset()
-                    continue
-                if self.appear(self.I_HARVEST_MAIL_2):
-                    self.click(self.I_HARVEST_MAIL_2, interval=0.8)
-                    timer_harvest.reset()
-                    continue
-                if ((self.appear(self.I_HARVEST_MAIL) or self.appear(self.I_HARVEST_MAIL_COPY))
-                        and not self.appear(self.I_LOGIN_RED_CLOSE)):
-                    self.click(self.I_HARVEST_MAIL, interval=2)
-                    self.wait_until_appear(self.I_HARVEST_MAIL_ALL, wait_time=2)
-                    timer_harvest.reset()
-                    continue
-
+            if not skip_default and self.config.restart.harvest_config.enable_mail and self.harvest_mail():
+                timer_harvest.reset()
+                continue
             if self.appear_then_click(self.I_HARVEST_AP, interval=1, threshold=0.7):
                 timer_harvest.reset()
                 continue
@@ -292,3 +269,38 @@ class LoginHandler(BaseTask, RestartAssets):
     def set_specific_usr(self, character: str):
         self.character = character
         self.O_LOGIN_SPECIFIC_SERVE.keyword = character
+
+    def harvest_mail(self, skip_first_screenshot: bool = True) -> bool:
+        self.screenshot(skip_first_screenshot)
+        if ((self.appear(self.I_HARVEST_MAIL) or self.appear(self.I_HARVEST_MAIL_COPY))
+                and not self.appear(self.I_LOGIN_RED_CLOSE)):
+            self.click(self.I_HARVEST_MAIL, interval=2)
+            self.wait_until_appear(self.I_READ_ALL_MAIL, wait_time=2)
+        else:
+            return False
+        logger.info('Harvest system mail')
+        self.click(self.I_SYSTEM_MAIL_CLOSE)
+        self.wait_until_appear(self.I_SYSTEM_MAIL_OPEN, wait_time=2)
+        self.exec_harvest_mail()
+        logger.info('Harvest special mail')
+        self.click(self.I_SPECIAL_MAIL_CLOSE)
+        self.wait_until_appear(self.I_SPECIAL_MAIL_OPEN, wait_time=2)
+        self.exec_harvest_mail()
+        return True
+
+    def exec_harvest_mail(self):
+        timeout_timer = Timer(3).start()
+        while not timeout_timer.reached():
+            self.screenshot()
+            if self.appear_then_click(self.I_READ_ALL_MAIL, interval=1.5):
+                continue
+            if self.appear(self.I_HARVEST_MAIL_CONFIRM):
+                self.click(self.I_HARVEST_MAIL_CONFIRM, interval=2)
+                self.wait_until_disappear(self.I_HARVEST_MAIL_CONFIRM)
+                break
+            if self.appear(self.I_HARVEST_MAIL_ALL, threshold=0.9):
+                time.sleep(random.uniform(0.3, 0.5))
+                self.click(self.I_HARVEST_MAIL_ALL, interval=2)
+                self.wait_until_appear(self.I_HARVEST_MAIL_CONFIRM, wait_time=1)
+                timeout_timer.reset()
+                continue