Просмотр исходного кода

feat(Hyakkiyakou): Save result each time

ryland 2 лет назад
Родитель
Сommit
411be70eff
3 измененных файлов с 37 добавлено и 9 удалено
  1. 2 0
      tasks/Hyakkiyakou/config.py
  2. 17 1
      tasks/Hyakkiyakou/debugger.py
  3. 18 8
      tasks/Hyakkiyakou/script_task.py

+ 2 - 0
tasks/Hyakkiyakou/config.py

@@ -48,6 +48,8 @@ class DebugConfig(ConfigBase):
     hya_info: bool = Field(default=False, description='hya_info_help')
     hya_info: bool = Field(default=False, description='hya_info_help')
     # 保存图片,拿去回喂给模型
     # 保存图片,拿去回喂给模型
     continuous_learning: bool = Field(default=False, description='continuous_learning_help')
     continuous_learning: bool = Field(default=False, description='continuous_learning_help')
+    # 保存每一张票的结果
+    hya_save_result: bool = Field(default=False, description='hya_save_result_help')
     # 单独的设定截屏间隔, 单位ms
     # 单独的设定截屏间隔, 单位ms
     hya_interval: float = Field(default=300, description='hya_interval_help')
     hya_interval: float = Field(default=300, description='hya_interval_help')
 
 

+ 17 - 1
tasks/Hyakkiyakou/debugger.py

@@ -76,15 +76,24 @@ class Debugger:
     # sync_event = Event()  # reserved for future use
     # sync_event = Event()  # reserved for future use
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
 
 
-    def __init__(self, info_enable: bool = False, continuous_learning: bool = False):
+    def __init__(self, 
+                 info_enable: bool = False, 
+                 continuous_learning: bool = False,
+                 hya_save_result: bool = False):
         Debugger.info_enable = info_enable
         Debugger.info_enable = info_enable
         self.images_cache: dict = {}
         self.images_cache: dict = {}
         self.continuous_learning = continuous_learning
         self.continuous_learning = continuous_learning
+        self.hya_save_result = hya_save_result
         if continuous_learning:
         if continuous_learning:
             logger.info('Continuous Learning Mode Enabled')
             logger.info('Continuous Learning Mode Enabled')
             save_time = datetime.now().strftime('%Y%m%dT%H')
             save_time = datetime.now().strftime('%Y%m%dT%H')
             self.hya_save_folder: Path = Path(f'./log/hya/{save_time}')
             self.hya_save_folder: Path = Path(f'./log/hya/{save_time}')
             self.hya_save_folder.mkdir(parents=True, exist_ok=True)
             self.hya_save_folder.mkdir(parents=True, exist_ok=True)
+        if hya_save_result:
+            logger.info('Hyakkiyakou Save Result Mode Enabled')
+            save_time = datetime.now().strftime('%Y%m%dT%H')
+            self.hya_save_result_folder: Path = Path(f'./log/hyakkiyakou/{save_time}')
+            self.hya_save_result_folder.mkdir(parents=True, exist_ok=True)
 
 
     @cached_property
     @cached_property
     def save_class(self) -> list[int]:
     def save_class(self) -> list[int]:
@@ -139,10 +148,17 @@ class Debugger:
             return
             return
         logger.info('OAS Track Debugger save images to train model')
         logger.info('OAS Track Debugger save images to train model')
         for image_name, image in self.images_cache.items():
         for image_name, image in self.images_cache.items():
+            image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
             cv2.imwrite(str(self.hya_save_folder / f'{image_name}.png'), image)
             cv2.imwrite(str(self.hya_save_folder / f'{image_name}.png'), image)
         self.images_cache.clear()
         self.images_cache.clear()
 
 
 
 
+    def save_result(self, image):
+        if not self.hya_save_result:
+            return
+        _now_name = f'hya_{int(time.time() * 1000)}.png'
+        image = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
+        cv2.imwrite(str(self.hya_save_result_folder / _now_name), image)
 
 
 
 
 def test_debugger():
 def test_debugger():

+ 18 - 8
tasks/Hyakkiyakou/script_task.py

@@ -85,13 +85,16 @@ class ScriptTask(GameUi, HyaSlave):
         g = hya_config.hya_g
         g = hya_config.hya_g
         weights: list = [sp, ssr, sr, r, n, g]
         weights: list = [sp, ssr, sr, r, n, g]
         str_priorities: str = hya_config.hya_priorities
         str_priorities: str = hya_config.hya_priorities
-        str_priorities = str_priorities.replace(' ', '').replace(',', ',')
-        try:
-            priorities = [label2id(s) for s in str_priorities.split(',')]
-        except Exception as e:
-            logger.error(f'Priority error: {str_priorities}')
-            logger.error(e)
-            raise RequestHumanTakeover
+        if str_priorities == '':
+            priorities = []
+        else:
+            str_priorities = str_priorities.replace(' ', '').replace(',', ',')
+            try:
+                priorities = [label2id(s) for s in str_priorities.split(',')]
+            except Exception as e:
+                logger.error(f'Priority error: {str_priorities}')
+                logger.error(e)
+                raise RequestHumanTakeover
         strategy: dict = {
         strategy: dict = {
             'weights': weights,
             'weights': weights,
             'priorities': priorities,
             'priorities': priorities,
@@ -104,10 +107,13 @@ class ScriptTask(GameUi, HyaSlave):
     def debugger(self) -> Debugger:
     def debugger(self) -> Debugger:
         debug_config = self._config.debug_config
         debug_config = self._config.debug_config
         hya_interval = debug_config.hya_interval
         hya_interval = debug_config.hya_interval
+        hya_save_result = debug_config.hya_save_result
         if hya_interval <= 100 or hya_interval >= 1000:
         if hya_interval <= 100 or hya_interval >= 1000:
             raise RequestHumanTakeover('screenshot_interval must be between 1000 and 10000')
             raise RequestHumanTakeover('screenshot_interval must be between 1000 and 10000')
         self.set_fast_screenshot_interval(hya_interval)
         self.set_fast_screenshot_interval(hya_interval)
-        return Debugger(info_enable=debug_config.hya_info, continuous_learning=debug_config.continuous_learning)
+        return Debugger(info_enable=debug_config.hya_info, 
+                        continuous_learning=debug_config.continuous_learning,
+                        hya_save_result=hya_save_result)
 
 
     def run(self):
     def run(self):
         hya_count: int = 0
         hya_count: int = 0
@@ -194,6 +200,10 @@ class ScriptTask(GameUi, HyaSlave):
         logger.info('Hyakkiyakou End')
         logger.info('Hyakkiyakou End')
         if self._config.debug_config.hya_show:
         if self._config.debug_config.hya_show:
             self.debugger.show_stop()
             self.debugger.show_stop()
+        if self._config.debug_config.hya_save_result:
+            # 走个动画
+            time.sleep(0.9)
+            self.debugger.save_result(self.device.image)
         self.ui_click(self.I_HEND, self.I_HACCESS)
         self.ui_click(self.I_HEND, self.I_HACCESS)
         self.debugger.save_images()
         self.debugger.save_images()
         del self.debugger
         del self.debugger