Browse Source

perf(Restart): Optimize courtyard affairs handling logic
- 太傻逼了收取结界奖励游戏里面居然没有加上限制,可以一直领

Neptine 9 months ago
parent
commit
b7a8d9b7da
1 changed files with 8 additions and 2 deletions
  1. 8 2
      tasks/Restart/login.py

+ 8 - 2
tasks/Restart/login.py

@@ -323,11 +323,12 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
         if not self.ui_click_multi_scale(self.I_NOTE, self.I_PAGE, timeout=3, scale_range=(0.8, 1.2)):
         if not self.ui_click_multi_scale(self.I_NOTE, self.I_PAGE, timeout=3, scale_range=(0.8, 1.2)):
             logger.warning('courtyard affairs timeout!')
             logger.warning('courtyard affairs timeout!')
             return False
             return False
+        count_success = 0
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_NO_TASKS):
             if self.appear(self.I_NO_TASKS):
                 logger.info('courtyard affairs completed!')
                 logger.info('courtyard affairs completed!')
-                return True
+                break
             # 每日六星御魂
             # 每日六星御魂
             if self.appear_then_click(self.I_HARVEST_SOUL_2, interval=1) \
             if self.appear_then_click(self.I_HARVEST_SOUL_2, interval=1) \
                     or self.appear_then_click(self.I_HARVEST_SOUL_3, interval=1):
                     or self.appear_then_click(self.I_HARVEST_SOUL_3, interval=1):
@@ -344,6 +345,7 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
 
 
             if self.appear_then_click(self.I_DAILY, interval=1):
             if self.appear_then_click(self.I_DAILY, interval=1):
                 continue
                 continue
+            # 领取成功: 太傻逼了收取结界奖励游戏里面居然没有加上限制
             if self.appear_then_click(self.I_SUCCESS_CLAIMED, interval=1):
             if self.appear_then_click(self.I_SUCCESS_CLAIMED, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_SKIP):# 万花牌跳过
             if self.appear_then_click(self.I_SKIP):# 万花牌跳过
@@ -351,5 +353,9 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=1):# 万花牌X
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=1):# 万花牌X
                 continue
                 continue
             # 一键完成
             # 一键完成
+            if count_success >= 6:
+                logger.info(f'Click complete tasks {count_success} times')
             if self.appear_then_click(self.I_COMPLETE_TASKS, interval=2.3):
             if self.appear_then_click(self.I_COMPLETE_TASKS, interval=2.3):
-                continue
+                count_success += 1
+                continue
+        return True