Merge pull request #250 from IsolateOB/fix-issue-248

fix: 修复部分任务中重置角色位置失败导致超时的问题 (#248)

Author: BnanZ0

src/tasks/AutoDefence.py

@@ -137,6 +137,11 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始，执行外部移动逻辑")
             self.external_movement(delay=2)
+            # 复位失败时 walk_to_aim 会调用 give_up_mission() 退出副本后直接 return，
+            # 此时已不在队伍中，应立即返回让主循环重新识别界面并重开任务
+            if not self.in_team():
+                self.log_info("外部移动后未在队伍中（可能复位失败已退出副本），等待重开任务")
+                return
             time_out = self.action_timeout + 10
             self.log_info(f"外部移动执行完毕，等待战斗开始，{time_out}秒后超时")
             if not self.wait_until(lambda: self.current_wave != -1 or self.find_esc_menu(), post_action=self.get_wave_info,

src/tasks/CommissionsTask.py

@@ -505,11 +505,12 @@ def reset_and_transport(self):
             post_action=lambda: self.click_box_random(setting_other),
             time_out=10,
         )
+        self.sleep(0.5)
         confirm_box = self.box_of_screen_scaled(2560, 1440, 1298, 776, 1368, 843, name="confirm_btn", hcenter=True)
         safe_box = self.box_of_screen_scaled(2560, 1440, 125, 207, 1811, 1234, name="safe_box", hcenter=True)
         self.wait_until(
             condition=lambda: self.find_start_btn(box=confirm_box),
-            post_action=lambda: self.click_relative_random(0.5016, 0.4074, 0.6906, 0.4380, use_safe_move=True, safe_move_box=safe_box),
+            post_action=lambda: self.click_relative_random(0.5078, 0.4028, 0.6836, 0.4306, after_sleep=0.5, use_safe_move=True, safe_move_box=safe_box),
             time_out=10,
         )
         self.sleep(0.5)

src/tasks/fullauto/Auto65ArtifactTask_Fast.py

@@ -214,7 +214,9 @@ def walk_to_aim(self, delay=0):
             self.send_key_up("lalt")
             # 19.97s: 复位并传送到目标位置
             if not self.reset_and_transport():
-                raise Exception("复位失败")
+                logger.info("复位失败，重开任务...")
+                self.give_up_mission()
+                return
 
             # ===== 路径编写结束 =====