bug fix

Author: BnanZ0

requirements.txt

@@ -21,7 +21,7 @@ numpy==2.2.6
     #   opencv-python
     #   openvino
     #   shapely
-ok-script==1.0.13
+ok-script==1.0.14
     # via -r requirements.in
 onnxocr-ppocrv4==0.0.5
     # via -r requirements.in

src/tasks/AutoDefence.py

@@ -91,14 +91,20 @@ def do_run(self):
             if _status == Mission.START:
                 self.wait_until(self.in_team, time_out=30)
                 self.sleep(2)
+                self.init_param()
                 if self.external_movement is not _default_movement:
                     self.log_info("任务开始")
-                    if not self.external_movement():
+                    self.external_movement()
+                    time_out = 10
+                    self.log_info(f"外部移动执行完毕，等待战斗开始，{time_out}秒后超时")
+                    if not self.wait_until(lambda: self.current_wave != -1, post_action=self.get_wave_info, time_out=time_out):
+                        self.log_info(f"超时重开")
                         self.open_in_mission_menu()
+                    else:
+                        self.log_info(f"战斗开始")
                 else:
                     self.log_info_notify("任务开始")
                     self.soundBeep()
-                self.init_param()
             elif _status == Mission.STOP:
                 self.quit_mission()
                 self.init_param()
@@ -111,7 +117,6 @@ def do_run(self):
             self.sleep(0.2)
 
     def init_param(self):
-        self.stop_mission = False
         self.current_round = -1
         self.current_wave = -1
 

src/tasks/AutoExploration.py

@@ -87,10 +87,17 @@ def do_run(self):
             if _status == Mission.START:
                 self.wait_until(self.in_team, time_out=30)
                 self.sleep(2)
+                self.init_param()
                 if self.external_movement is not _default_movement:
                     self.log_info("任务开始")
-                    if not self.external_movement():
+                    self.external_movement()
+                    time_out = 10
+                    self.log_info(f"外部移动执行完毕，等待战斗开始，{time_out}秒后超时")
+                    if not self.wait_until(self.find_serum, time_out=time_out):
+                        self.log_info(f"超时重开")
                         self.open_in_mission_menu()
+                    else:
+                        self.log_info(f"战斗开始")
                 else:
                     self.log_info_notify("任务开始")
                     self.soundBeep()
@@ -106,7 +113,7 @@ def do_run(self):
             self.sleep(0.2)
 
     def init_param(self):
-        self.current_wave = -1
+        self.current_round = -1
 
     def stop_func(self):
         self.get_round_info()

src/tasks/ImportTask.py

@@ -135,8 +135,7 @@ def do_run(self):
                     self.log_info('任务完成')
                 self.wait_until(self.in_team, time_out=30)                  
                 self.sleep(2)
-                if not self.walk_to_aim():
-                    self.open_in_mission_menu()
+                self.walk_to_aim()
                 _wave_start = time.time()
                 _delay_task_start = _wave_start + 1
                 self.current_wave = -1