🐛 fix(commissions): 修正自动处理密函异常报错

BnanZ0 · BnanZ0 · commit 1470b1dc9796 · 2025-12-31T17:06:36.000+08:00
diff --git a/src/tasks/AutoDefence.py b/src/tasks/AutoDefence.py
@@ -8,8 +8,6 @@
 
 logger = Logger.get_logger(__name__)
 
-DEFAULT_ACTION_TIMEOUT = 10
-
 
 class AutoDefence(DNAOneTimeTask, CommissionsTask, BaseCombatTask):
 
@@ -27,7 +25,6 @@ def __init__(self, *args, **kwargs):
             "超时时间": "波次超时后将发出提示",
         })
 
-        self.action_timeout = DEFAULT_ACTION_TIMEOUT
         self.quick_assist_task = QuickAssistTask(self)
         self.external_movement = _default_movement
         self._external_config = None
@@ -87,7 +84,7 @@ def do_run(self):
             elif _status == Mission.CONTINUE:
                 self.log_info("任务继续")
                 self.init_for_next_round()
-                self.wait_until(self.in_team, time_out=DEFAULT_ACTION_TIMEOUT)
+                self.wait_until(self.in_team, time_out=self.action_timeout)
 
             self.sleep(0.1)
 
@@ -139,7 +136,7 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始，执行外部移动逻辑")
             self.external_movement(delay=2)
-            time_out = DEFAULT_ACTION_TIMEOUT + 10
+            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,
                                    time_out=time_out):
diff --git a/src/tasks/AutoExcavation.py b/src/tasks/AutoExcavation.py
@@ -8,9 +8,6 @@
 
 logger = Logger.get_logger(__name__)
 
-DEFAULT_ACTION_TIMEOUT = 10
-
-
 class AutoExcavation(DNAOneTimeTask, CommissionsTask, BaseCombatTask):
 
     def __init__(self, *args, **kwargs):
@@ -26,7 +23,6 @@ def __init__(self, *args, **kwargs):
         for key in keys_to_remove:
             self.default_config.pop(key, None)
 
-        self.action_timeout = DEFAULT_ACTION_TIMEOUT
         self.quick_assist_task = QuickAssistTask(self)
         self.skill_tick = self.create_skill_ticker()
 
@@ -52,7 +48,7 @@ def do_run(self):
 
             _status = self.handle_mission_interface(stop_func=self.stop_func)
             if _status == Mission.START:
-                self.wait_until(self.in_team, time_out=DEFAULT_ACTION_TIMEOUT)
+                self.wait_until(self.in_team, time_out=self.action_timeout)
                 self.sleep(2)
                 self.init_all()
                 self.handle_mission_start()
@@ -62,7 +58,7 @@ def do_run(self):
             elif _status == Mission.CONTINUE:
                 self.log_info("任务继续")
                 self.init_for_next_round()
-                self.wait_until(self.in_team, time_out=DEFAULT_ACTION_TIMEOUT)
+                self.wait_until(self.in_team, time_out=self.action_timeout)
 
                 self.sleep(2)
                 if not self.find_target_health_bar():
diff --git a/src/tasks/AutoExploration.py b/src/tasks/AutoExploration.py
@@ -8,8 +8,6 @@
 
 logger = Logger.get_logger(__name__)
 
-DEFAULT_ACTION_TIMEOUT = 10
-
 
 class AutoExploration(DNAOneTimeTask, CommissionsTask, BaseCombatTask):
 
@@ -27,7 +25,6 @@ def __init__(self, *args, **kwargs):
             '超时时间': '超时后将发出提示',
         })
 
-        self.action_timeout = DEFAULT_ACTION_TIMEOUT
         self.quick_assist_task = QuickAssistTask(self)
         self.external_movement = _default_movement
         self._external_config = None
@@ -87,7 +84,7 @@ def do_run(self):
             elif _status == Mission.CONTINUE:
                 self.log_info("任务继续")
                 self.init_for_next_round()
-                self.wait_until(self.in_team, time_out=DEFAULT_ACTION_TIMEOUT)
+                self.wait_until(self.in_team, time_out=self.action_timeout)
 
             self.sleep(0.1)
 
@@ -129,7 +126,7 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始")
             self.external_movement(delay=2)
-            time_out = DEFAULT_ACTION_TIMEOUT + 10
+            time_out = self.action_timeout + 10
             self.log_info(f"外部移动执行完毕，等待战斗开始，{time_out}秒后超时")
             if not self.wait_until(lambda: self.find_serum() or self.find_esc_menu(), time_out=time_out):
                 self.log_info("超时重开")
diff --git a/src/tasks/AutoHedge.py b/src/tasks/AutoHedge.py
@@ -12,8 +12,6 @@
 
 logger = Logger.get_logger(__name__)
 
-DEFAULT_ACTION_TIMEOUT = 10
-
 
 class AutoHedge(DNAOneTimeTask, CommissionsTask, BaseCombatTask):
 
@@ -34,7 +32,6 @@ def __init__(self, *args, **kwargs):
             '超时时间': '超时后将发出提示',
         })
 
-        self.action_timeout = DEFAULT_ACTION_TIMEOUT
         self.quick_assist_task = QuickAssistTask(self)
         self.external_movement = _default_movement
         self.external_movement_evac = _default_movement
@@ -98,7 +95,7 @@ def do_run(self):
 
             _status = self.handle_mission_interface(stop_func=self.stop_func)
             if _status == Mission.START:
-                self.wait_until(self.in_team, time_out=DEFAULT_ACTION_TIMEOUT)
+                self.wait_until(self.in_team, time_out=self.action_timeout)
                 self.init_all()
                 self.handle_mission_start()
             elif _status == Mission.STOP:
@@ -161,7 +158,7 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始")
             self.external_movement(delay=2)
-            time_out = DEFAULT_ACTION_TIMEOUT + 10
+            time_out = self.action_timeout + 10
             self.log_info(f"外部移动执行完毕，等待战斗开始，{time_out}秒后超时")
             if not self.wait_until(lambda: self.runtime_state["in_progress"] or self.find_esc_menu(), post_action=self.update_mission_status,
                                    time_out=time_out):
diff --git a/src/tasks/BaseDNATask.py b/src/tasks/BaseDNATask.py
@@ -363,6 +363,21 @@ def _perform_random_click(self, x_abs, y_abs, use_safe_move=False, safe_move_box
             self.pydirect_interaction.click(down_time=_down_time)
 
         self.sleep(_after_sleep)
+
+    def click_btn_random(self, box: Box, down_time=0.0, post_sleep=0.0, after_sleep=0.0):
+        safe_move_box = box.copy(x_offset=-box.width*0.20, width_offset=box.width * 8.1,
+                                 y_offset=-box.height*0.30, height_offset=box.height * 0.7, name='safe_move_box')
+        random_x = random.uniform(box.x + box.width, box.x + self.width * 0.12)
+        random_y = random.uniform(box.y, box.y + box.height)
+
+        self._perform_random_click(
+            random_x, random_y, 
+            use_safe_move=True,
+            safe_move_box=safe_move_box, 
+            down_time=down_time,
+            post_sleep=post_sleep,
+            after_sleep=after_sleep
+        )
     
     def click_box_random(self, box: Box, down_time=0.0, post_sleep=0.0, after_sleep=0.0, use_safe_move=False, safe_move_box=None, left_extend=0.0, right_extend=0.0, up_extend=0.0, down_extend=0.0):
         le_px = left_extend * self.width
@@ -432,6 +447,8 @@ def rel_move_if_in_win(self, x=0.5, y=0.5, box=None):
             x (float): 相对 x 坐标 (0.0 到 1.0)。
             y (float): 相对 y 坐标 (0.0 到 1.0)。
         """
+        if box is not None:
+            self.draw_boxes(box.name, box, "blue")
         if not self.is_mouse_in_window() or not self.is_mouse_in_box(box=box):
             return False
         abs_pos = self.executor.device_manager.hwnd_window.get_abs_cords(self.width_of_screen(x),
diff --git a/src/tasks/CommissionsTask.py b/src/tasks/CommissionsTask.py
@@ -209,7 +209,7 @@ def choose_letter(self, timeout=0):
             return
         action_timeout = self.action_timeout if timeout == 0 else timeout
         if self.commission_config.get("自动处理密函", False):
-            if (letter_btn:=self.find_letter_interface()):
+            if self.find_letter_interface():
                 box = self.box_of_screen_scaled(2560, 1440, 1190, 610, 2450, 820, name="letter_drag_area", hcenter=True)
                 letter_roi = self.box_of_screen_scaled(2560, 1440, 565, 651, 732, 805, name="letter_roi", hcenter=True)
                 letter_snapshot = letter_roi.crop_frame(self.frame)
@@ -223,13 +223,24 @@ def choose_letter(self, timeout=0):
                     self.log_info_notify("密函已耗尽")
                     self.soundBeep()
                     raise TaskDisabledException
+                
+                deadline = time.time() + action_timeout
+                while time.time() < deadline:
+                    letter_btn = self.find_letter_btn()
+                    if letter_btn:
+                        self.move_back_from_safe_position()
+                        break
+                    else:
+                        self.move_mouse_to_safe_position()
+                        self.next_frame()
+                else:
+                    self.log_info_notify("未找到密函确认按钮")
+                    self.soundBeep()
+                    raise TaskDisabledException
 
                 self.wait_until(
                     condition=lambda: not self.find_letter_interface(),
-                    post_action=lambda: (
-                        self.click_box_random(letter_btn, use_safe_move=True, safe_move_box=box, right_extend=0.1),
-                        self.sleep(1),
-                    ),
+                    post_action=lambda: self.click_btn_random(letter_btn, after_sleep=1),
                     time_out=action_timeout,
                     raise_if_not_found=True,
                 )
