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

add(Hyakkiyakou): switch onmyoji

Azure 1 год назад
Родитель
Сommit
e1b0cca142
2 измененных файлов с 8 добавлено и 7 удалено
  1. 2 0
      tasks/Hyakkiyakou/config.py
  2. 6 7
      tasks/Hyakkiyakou/script_task.py

+ 2 - 0
tasks/Hyakkiyakou/config.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, Field, field_validator
 from enum import Enum
+from tasks.Component.SwitchOnmyoji.config import Onmyoji
 
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time, dynamic_hide
@@ -26,6 +27,7 @@ class HyakkiyakouConfig(ConfigBase):
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
     hya_limit_count: int = Field(default=10, description='hya_limit_count_help')
     hya_invite_friend: bool = Field(default=False, description='hya_invite_friend_help')
+    hya_onmyoji: Onmyoji = Field(default=Onmyoji.KAGURA, description='切换阴阳师')
     # 自动调整豆子数量
     hya_auto_bean: bool = Field(default=False, description='hya_auto_bean_help')
     hya_priorities: str = Field(default='', description='hya_priorities_help')

+ 6 - 7
tasks/Hyakkiyakou/script_task.py

@@ -19,11 +19,10 @@ from oashya.utils import draw_tracks
 from module.exception import TaskEnd
 from module.logger import logger
 from module.exception import RequestHumanTakeover
+from tasks.Component.SwitchOnmyoji.switch_onmyoji import SwitchOnmyoji
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_hyakkiyakou
-from tasks.Hyakkiyakou.config import Hyakkiyakou as HyakkiyakouConfig
+from tasks.GameUi.page import page_hyakkiyakou, page_main, page_onmyodo
 from tasks.Hyakkiyakou.config import InferenceEngine, ModelPrecision
-from tasks.Hyakkiyakou.assets import HyakkiyakouAssets
 from tasks.Hyakkiyakou.agent.agent import Agent
 from tasks.Hyakkiyakou.slave.hya_slave import HyaSlave
 from tasks.Hyakkiyakou.debugger import Debugger
@@ -47,7 +46,7 @@ def plot_save(image, boxes):
     cv2.imwrite(save_file, image)
 
 
-class ScriptTask(GameUi, HyaSlave):
+class ScriptTask(GameUi, HyaSlave, SwitchOnmyoji):
 
     @property
     def _config(self):
@@ -124,9 +123,9 @@ class ScriptTask(GameUi, HyaSlave):
         limit_time = self._config.hyakkiyakou_config.hya_limit_time
         self.limit_time: timedelta = timedelta(hours=limit_time.hour, minutes=limit_time.minute,
                                                seconds=limit_time.second)
-        self.ui_get_current_page()
-        self.ui_goto(page_hyakkiyakou)
-
+        self.ui_goto_page(page_onmyodo)
+        self.switch_onmyoji(self._config.hyakkiyakou_config.hya_onmyoji)
+        self.ui_goto_page(page_hyakkiyakou)
 
         while 1:
             if hya_count >= self.limit_count: