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

Merge remote-tracking branch 'origin/dev' into dev

ryland 1 год назад
Родитель
Сommit
923b37a292

+ 29 - 0
tasks/Component/SwitchOnmyoji/assets.py

@@ -0,0 +1,29 @@
+from module.atom.image import RuleImage
+from module.atom.click import RuleClick
+from module.atom.long_click import RuleLongClick
+from module.atom.swipe import RuleSwipe
+from module.atom.ocr import RuleOcr
+from module.atom.list import RuleList
+
+# This file was automatically generated by ./dev_tools/assets_extract.py.
+# Don't modify it manually.
+class SwitchOnmyojiAssets: 
+
+
+	# Image Rule Assets
+	# 晴明战标志 
+	I_SEIMI_BATTLE = RuleImage(roi_front=(253,429,79,78), roi_back=(147,388,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_seimi_battle.png")
+	# 神乐战标志 
+	I_KAGURA_BATTLE = RuleImage(roi_front=(509,428,79,78), roi_back=(401,394,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_kagura_battle.png")
+	# 源博雅战标志 
+	I_HIROMASA_BATTLE = RuleImage(roi_front=(761,427,79,78), roi_back=(657,396,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_hiromasa_battle.png")
+	# 八百比丘尼战标志 
+	I_YAO_BIKUNI_BATTLE = RuleImage(roi_front=(1017,428,79,78), roi_back=(910,387,222,153), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_yao_bikuni_battle.png")
+	# 阴阳师交替按钮 
+	I_ONMYOJI_SWITCH = RuleImage(roi_front=(39,385,40,33), roi_back=(19,362,80,91), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_onmyoji_switch.png")
+	# 阴阳术阴阳师页面标志 
+	I_ONMYOJI_CHECK = RuleImage(roi_front=(67,622,82,58), roi_back=(58,608,100,88), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_onmyoji_check.png")
+	# 阴阳术英杰页面标志 
+	I_HERO_CHECK = RuleImage(roi_front=(70,624,75,55), roi_back=(60,602,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_hero_check.png")
+
+

+ 9 - 0
tasks/Component/SwitchOnmyoji/config.py

@@ -0,0 +1,9 @@
+from enum import Enum
+
+
+class Onmyoji(str, Enum):
+    YORIMITSU = '源赖光'
+    SEIMI = '晴明'
+    KAGURA = '神乐'
+    HIROMASA = '源博雅'
+    YAO_BIKUNI = '八百比丘尼'

+ 65 - 0
tasks/Component/SwitchOnmyoji/so/image.json

@@ -0,0 +1,65 @@
+[
+  {
+    "itemName": "seimi_battle",
+    "imageName": "so_seimi_battle.png",
+    "roiFront": "253,429,79,78",
+    "roiBack": "147,388,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "晴明战标志"
+  },
+  {
+    "itemName": "kagura_battle",
+    "imageName": "so_kagura_battle.png",
+    "roiFront": "509,428,79,78",
+    "roiBack": "401,394,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "神乐战标志"
+  },
+  {
+    "itemName": "hiromasa_battle",
+    "imageName": "so_hiromasa_battle.png",
+    "roiFront": "761,427,79,78",
+    "roiBack": "657,396,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "源博雅战标志"
+  },
+  {
+    "itemName": "yao_bikuni_battle",
+    "imageName": "so_yao_bikuni_battle.png",
+    "roiFront": "1017,428,79,78",
+    "roiBack": "910,387,222,153",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "八百比丘尼战标志"
+  },
+  {
+    "itemName": "onmyoji_switch",
+    "imageName": "so_onmyoji_switch.png",
+    "roiFront": "39,385,40,33",
+    "roiBack": "19,362,80,91",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳师交替按钮"
+  },
+  {
+    "itemName": "onmyoji_check",
+    "imageName": "so_onmyoji_check.png",
+    "roiFront": "67,622,82,58",
+    "roiBack": "58,608,100,88",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳术阴阳师页面标志"
+  },
+  {
+    "itemName": "hero_check",
+    "imageName": "so_hero_check.png",
+    "roiFront": "70,624,75,55",
+    "roiBack": "60,602,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "阴阳术英杰页面标志"
+  }
+]

BIN
tasks/Component/SwitchOnmyoji/so/so_hero_check.png


BIN
tasks/Component/SwitchOnmyoji/so/so_hiromasa_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_kagura_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_onmyoji_check.png


BIN
tasks/Component/SwitchOnmyoji/so/so_onmyoji_switch.png


BIN
tasks/Component/SwitchOnmyoji/so/so_seimi_battle.png


BIN
tasks/Component/SwitchOnmyoji/so/so_yao_bikuni_battle.png


+ 63 - 0
tasks/Component/SwitchOnmyoji/switch_onmyoji.py

@@ -0,0 +1,63 @@
+from tasks.Component.SwitchOnmyoji.assets import SwitchOnmyojiAssets
+from tasks.Component.SwitchOnmyoji.config import Onmyoji
+from tasks.base_task import BaseTask
+from module.logger import logger
+
+
+class SwitchOnmyoji(BaseTask, SwitchOnmyojiAssets):
+
+    def switch_onmyoji(self, onmyoji: Onmyoji):
+        """
+        切换阴阳师, 要求已经进入阴阳术界面, 最后会留在阴阳术界面
+        :param onmyoji: 阴阳师
+        """
+        logger.hr('Switch onmyoji', 2)
+        hero = [Onmyoji.YORIMITSU]
+        if onmyoji in hero:
+            self._switch_hero(onmyoji)
+        else:
+            self._switch_onmyoji(onmyoji)
+        logger.info(f'Switch onmyoji: {onmyoji.name}[{onmyoji.value}]')
+
+    def _switch_onmyoji(self, onmyoji: Onmyoji):
+        """切换阴阳师"""
+        onmyoji_battle_dict = {
+            Onmyoji.SEIMI: self.I_SEIMI_BATTLE,
+            Onmyoji.KAGURA: self.I_KAGURA_BATTLE,
+            Onmyoji.HIROMASA: self.I_HIROMASA_BATTLE,
+            Onmyoji.YAO_BIKUNI: self.I_YAO_BIKUNI_BATTLE,
+        }
+        self.ui_click(self.I_HERO_CHECK, self.I_ONMYOJI_CHECK, interval=0.8)
+        # 进入阴阳师替换页面
+        while not (self.appear(self.I_SEIMI_BATTLE) or self.appear(self.I_KAGURA_BATTLE)
+                   or self.appear(self.I_HIROMASA_BATTLE) or self.appear(self.I_YAO_BIKUNI_BATTLE)):
+            self.appear_then_click(self.I_ONMYOJI_SWITCH, interval=0.8)
+            self.screenshot()
+        onmyoji_battle = onmyoji_battle_dict.get(onmyoji, None)
+        if not onmyoji_battle:
+            raise ValueError('Incorrect onmyoji type')
+        while True:
+            self.screenshot()
+            # 回到阴阳术页面则退出
+            if self.appear(self.I_ONMYOJI_CHECK, interval=0.8):
+                break
+            if self.appear(onmyoji_battle, interval=0.8):
+                self.ui_click(self.I_UI_BACK_BLUE, self.I_ONMYOJI_CHECK, interval=1.2)
+                break
+            # 出战对应阴阳师
+            self.click(onmyoji_battle, interval=1.2)
+
+    def _switch_hero(self, onmyoji: Onmyoji):
+        """切换英杰"""
+        self.ui_click(self.I_ONMYOJI_CHECK, self.I_HERO_CHECK, interval=0.8)
+
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+
+    c = Config('oas3')
+    d = Device(c)
+    t = SwitchOnmyoji(c, d)
+
+    t.switch_onmyoji(Onmyoji.YORIMITSU)

+ 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')

+ 8 - 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:
@@ -138,6 +137,8 @@ class ScriptTask(GameUi, HyaSlave):
 
             self.one()
             hya_count += 1
+            logger.info(f'count: {hya_count}/{self.limit_count}')
+            logger.info(f'time: {(datetime.now() - self.start_time).total_seconds():.1f}s/{self.limit_time.total_seconds()}s')
 
         while 1:
             self.screenshot()