Explorar el Código

fix(Restart): Optimize courtyard affairs handling logic
- 在harvest_courtyard_affairs方法中添加了对无任务状态的检测
- 当检测到无任务时,记录日志并返回成功
- 完善了庭院事务的处理流程,包括六星御魂领取、奖励领取等操作
- 提高了脚本的稳定性和可靠性

Neptine hace 9 meses
padre
commit
e6938b8d50
Se han modificado 1 ficheros con 18 adiciones y 5 borrados
  1. 18 5
      tasks/Restart/login.py

+ 18 - 5
tasks/Restart/login.py

@@ -328,15 +328,28 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
             if self.appear(self.I_NO_TASKS):
                 logger.info('courtyard affairs completed!')
                 return True
-            if self.appear_then_click(self.I_COMPLETE_TASKS, 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):
                 continue
-            if self.appear_then_click(self.I_DAILY, interval=1):
+            # 点击'获得奖励'
+            if self.ui_reward_appear_click():
+                continue
+            # 获得奖励
+            if self.appear_then_click(self.I_UI_AWARD, interval=0.2):
                 continue
-            if self.appear_then_click(self.I_CONFIRM): #式神满级,是否提取物经验?确定
+            # 式神满级,是否提取物经验?确定
+            if self.appear_then_click(self.I_CONFIRM, interval=1):
                 continue
-            if self.appear_then_click(self.I_SUCCESS_CLAIMED):
+
+            if self.appear_then_click(self.I_DAILY, interval=1):
+                continue
+            if self.appear_then_click(self.I_SUCCESS_CLAIMED, interval=1):
                 continue
             if self.appear_then_click(self.I_SKIP):# 万花牌跳过
                 continue
-            if self.appear_then_click(self.I_LOGIN_RED_CLOSE):# 万花牌X
+            if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=1):# 万花牌X
+                continue
+            # 一键完成
+            if self.appear_then_click(self.I_COMPLETE_TASKS, interval=2.3):
                 continue