ソースを参照

fix(Hyakkiyakou): Cannot open the same thread twice

ryland 2 年 前
親
コミット
2459d0c93a

+ 1 - 1
tasks/Hyakkiyakou/agent/focus.py

@@ -116,6 +116,6 @@ velocity: {self._v}"""
         upsilon = (vector[1] / 250 - vector[2] / 35)
         upsilon = 100 * (upsilon**2 if upsilon > 0 else - upsilon**2)
         result = _omega + tau + upsilon - 0.6
-        logger.info(f"total: {result:.4f} | {_omega:.4f} | {tau:.4f} | {upsilon:.4f}")
+        # print(f"total: {result:.4f} | {_omega:.4f} | {tau:.4f} | {upsilon:.4f}")
         return result
 

+ 10 - 1
tasks/Hyakkiyakou/debugger.py

@@ -54,6 +54,7 @@ def show_track(sync_image, sync_lock, stop_event):
     while True:
         if stop_event.is_set():
             logger.info('OAS Track Debugger stopped')
+            cv2.destroyAllWindows()
             break
         sync_lock.acquire()
         if Debugger.sync_image is None:
@@ -80,6 +81,7 @@ class Debugger:
                  info_enable: bool = False, 
                  continuous_learning: bool = False,
                  hya_save_result: bool = False):
+        self._reset_thread_env()
         Debugger.info_enable = info_enable
         self.images_cache: dict = {}
         self.continuous_learning = continuous_learning
@@ -106,6 +108,14 @@ class Debugger:
         g = [i for i in range(CLASSINDEX.MIN_G, CLASSINDEX.MAX_G + 1)]
         return sp + ssr + g
 
+    def _reset_thread_env(self):
+        logger.info('Reset Debugger Thread Environment')
+        Debugger.sync_image = None
+        self.sync_lock = Lock()
+        self.stop_event = Event()
+        self.sync_thread = Thread(target=show_track, daemon=True, name='OAS Track Debugger',
+                                  args=(Debugger.sync_image, self.sync_lock, self.stop_event))
+
     def show(self, results):
         image = draw_tracks(self.device.image, results)
         cv2.imshow('OAS Tracker', image)
@@ -152,7 +162,6 @@ class Debugger:
             cv2.imwrite(str(self.hya_save_folder / f'{image_name}.png'), image)
         self.images_cache.clear()
 
-
     def save_result(self, image):
         if not self.hya_save_result:
             return

+ 1 - 1
tasks/Hyakkiyakou/script_task.py

@@ -206,7 +206,7 @@ class ScriptTask(GameUi, HyaSlave):
             self.debugger.show_stop()
         if self._config.debug_config.hya_save_result:
             # 走个动画
-            time.sleep(0.9)
+            time.sleep(1.5)
             self.debugger.save_result(self.device.image)
         self.ui_click(self.I_HEND, self.I_HACCESS)
         self.debugger.save_images()