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

Merge pull request #323 from ljxun/something

feat[Restart]: add Accept mail?
huangrunheng 2 лет назад
Родитель
Сommit
17d22fef03
1 измененных файлов с 26 добавлено и 23 удалено
  1. 26 23
      tasks/Restart/login.py

+ 26 - 23
tasks/Restart/login.py

@@ -152,29 +152,32 @@ class LoginHandler(BaseTask, RestartAssets):
                 timer_harvest.reset()
                 timer_harvest.reset()
                 continue
                 continue
             # 邮件
             # 邮件
-            if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.2):
-                timer_harvest.reset()
-                continue
-            if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):
-                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_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
-                        timer_harvest.reset()
-                        continue
+            # 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
+            if self.config.restart.harvest_config.enable_mail:
+
+                if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.2):
+                    timer_harvest.reset()
+                    continue
+                if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):
+                    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_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
+                            timer_harvest.reset()
+                            continue
             # 体力
             # 体力
             if self.appear_then_click(self.I_HARVEST_AP, interval=1, threshold=0.7):
             if self.appear_then_click(self.I_HARVEST_AP, interval=1, threshold=0.7):
                 timer_harvest.reset()
                 timer_harvest.reset()