♻️ refactor(commissions): 改进ocr图像参数传递

  - ocr函数现在接收frame的副本作为参数

Author: BnanZ0

src/tasks/AutoDefence.py

@@ -145,9 +145,9 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始，执行外部移动逻辑")
             self.external_movement()
-            self.log_info(f"外部移动执行完毕，等待战斗开始，{DEFAULT_ACTION_TIMEOUT}秒后超时")
+            self.log_info(f"外部移动执行完毕，等待战斗开始，{DEFAULT_ACTION_TIMEOUT+10}秒后超时")
             if not self.wait_until(lambda: self.current_wave != -1, post_action=self.get_wave_info,
-                                   time_out=DEFAULT_ACTION_TIMEOUT):
+                                   time_out=DEFAULT_ACTION_TIMEOUT+10):
                 self.log_info("等待战斗开始超时，重开任务")
                 self.open_in_mission_menu()
             else:

src/tasks/AutoHedge.py

@@ -147,7 +147,7 @@ def handle_in_mission(self):
                 if self.external_movement_evac is not _default_movement:
                     self.log_info("任务结束")
                     self.external_movement_evac()
-                    self.log_info(f"外部移动执行完毕。")
+                    self.log_info("外部移动执行完毕。")
                     self.wait_until(lambda: not self.in_team(), time_out=30)
                     return
                 else:
@@ -159,9 +159,9 @@ def handle_mission_start(self):
         if self.external_movement is not _default_movement:
             self.log_info("任务开始")
             self.external_movement()
-            self.log_info(f"外部移动执行完毕，等待战斗开始，{DEFAULT_ACTION_TIMEOUT}秒后超时")
+            self.log_info(f"外部移动执行完毕，等待战斗开始，{DEFAULT_ACTION_TIMEOUT+10}秒后超时")
             if not self.wait_until(self.runtime_state["in_progress"], post_action=self.update_mission_status,
-                                   time_out=DEFAULT_ACTION_TIMEOUT):
+                                   time_out=DEFAULT_ACTION_TIMEOUT+10):
                 self.log_info("超时重开")
                 self.open_in_mission_menu()
                 return
@@ -204,9 +204,11 @@ def get_serum_process_info(self):
                     if pct > self.last_ocr_result and pct <= 100:
                         self.last_ocr_result = pct
                         # self.info_set("进度", f"{pct}%")
+            return self.last_ocr_result
         if self.ocr_future is None:
             box = self.box_of_screen_scaled(2560, 1440, 115, 399, 217, 461, name="process_info", hcenter=True)
-            self.ocr_future = self.thread_pool_executor.submit(self.ocr, box=box, match=re.compile(r"\d+%"))
+            frame = self.frame.copy()
+            self.ocr_future = self.thread_pool_executor.submit(self.ocr, frame=frame, box=box, match=re.compile(r"\d+%"))
         return self.last_ocr_result
 
     def find_top_right_track_pos(self):

src/tasks/CommissionsTask.py

@@ -350,7 +350,9 @@ def get_wave_info(self):
         if self.wave_future is None:
             mission_info_box = self.box_of_screen_scaled(2560, 1440, 275, 372, 445, 470, name="mission_info",
                                                          hcenter=True)
-            self.wave_future = self.thread_pool_executor.submit(self.ocr, box=mission_info_box,
+            frame = self.frame.copy()
+            self.wave_future = self.thread_pool_executor.submit(self.ocr, frame=frame,
+                                                                box=mission_info_box,
                                                                 frame_processor=isolate_white_text_to_black,
                                                                 match=re.compile(r"\d/\d"))