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

feat(SwitchOnmyoji): 添加藤原道长支持并优化角色切换逻辑

- 新增藤原道长战标志图像识别资源
- 在配置文件中添加MICHINAGA枚举选项
- 更新JSON配置文件中的图像识别参数
- 实现通用角色切换方法替代原有重复逻辑
- 添加英杰模式下的角色映射字典
Azur 9 месяцев назад
Родитель
Сommit
13c9ab8108

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

@@ -25,5 +25,9 @@ class SwitchOnmyojiAssets:
 	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")
+	# 源赖光战标志 
+	I_YORIMITSU_BATTLE = RuleImage(roi_front=(511,424,100,100), roi_back=(448,401,181,142), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_yorimitsu_battle.png")
+	# 藤原道长战标志 
+	I_MICHINAGA_BATTLE = RuleImage(roi_front=(741,421,100,100), roi_back=(689,399,171,133), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchOnmyoji/so/so_michinaga_battle.png")
 
 

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

@@ -3,6 +3,7 @@ from enum import Enum
 
 class Onmyoji(str, Enum):
     YORIMITSU = '源赖光'
+    MICHINAGA = '藤原道长'
     SEIMI = '晴明'
     KAGURA = '神乐'
     HIROMASA = '源博雅'

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

@@ -61,5 +61,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "阴阳术英杰页面标志"
+  },
+  {
+    "itemName": "yorimitsu_battle",
+    "imageName": "so_yorimitsu_battle.png",
+    "roiFront": "511,424,100,100",
+    "roiBack": "448,401,181,142",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "源赖光战标志"
+  },
+  {
+    "itemName": "michinaga_battle",
+    "imageName": "so_michinaga_battle.png",
+    "roiFront": "741,421,100,100",
+    "roiBack": "689,399,171,133",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "藤原道长战标志"
   }
 ]

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


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


+ 41 - 30
tasks/Component/SwitchOnmyoji/switch_onmyoji.py

@@ -1,3 +1,4 @@
+from module.atom.image import RuleImage
 from tasks.Component.SwitchOnmyoji.assets import SwitchOnmyojiAssets
 from tasks.Component.SwitchOnmyoji.config import Onmyoji
 from tasks.base_task import BaseTask
@@ -12,52 +13,62 @@ class SwitchOnmyoji(BaseTask, SwitchOnmyojiAssets):
         :param onmyoji: 阴阳师
         """
         logger.hr('Switch onmyoji', 2)
-        hero = [Onmyoji.YORIMITSU]
+        hero = [Onmyoji.YORIMITSU, Onmyoji.MICHINAGA]
         if onmyoji in hero:
-            self._switch_hero(onmyoji)
+            self.ui_click(self.I_ONMYOJI_CHECK, self.I_HERO_CHECK, interval=0.8)
+            self.switch_role(onmyoji, self._get_hero_battle_dict(), self.I_HERO_CHECK)
         else:
-            self._switch_onmyoji(onmyoji)
+            self.ui_click(self.I_HERO_CHECK, self.I_ONMYOJI_CHECK, interval=0.8)
+            self.switch_role(onmyoji, self._get_onmyoji_battle_dict(), self.I_ONMYOJI_CHECK)
         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)
+    def switch_role(self, role: Onmyoji, battle_dict: dict, check_img: RuleImage):
+        """
+        通用切换角色方法
+        :param role: 角色类型 (阴阳师或英杰)
+        :param battle_dict: 角色与战斗图标的映射
+        :param check_img: 检查是否回到主界面的图标
+        """
+        while True:
             self.screenshot()
-        onmyoji_battle = onmyoji_battle_dict.get(onmyoji, None)
-        if not onmyoji_battle:
-            raise ValueError('Incorrect onmyoji type')
+            if any(self.appear(battle_icon) for battle_icon in battle_dict.values()):
+                break
+            self.appear_then_click(self.I_ONMYOJI_SWITCH, interval=0.8)
+        battle_img = battle_dict.get(role, None)
+        if not battle_img:
+            raise ValueError('Incorrect role type')
         while True:
             self.screenshot()
-            # 回到阴阳术页面则退出
-            if self.appear(self.I_ONMYOJI_CHECK, interval=0.8):
+            if self.appear(check_img, 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)
+            if self.appear(battle_img, interval=0.8):
+                self.ui_click(self.I_UI_BACK_BLUE, check_img, interval=1.2)
                 break
-            # 出战对应阴阳师
-            self.click(onmyoji_battle, interval=1.2)
+            self.click(battle_img, interval=1.2)
 
-    def _switch_hero(self, onmyoji: Onmyoji):
-        """切换英杰"""
-        self.ui_click(self.I_ONMYOJI_CHECK, self.I_HERO_CHECK, interval=0.8)
+    def _get_onmyoji_battle_dict(self):
+        """获取阴阳师出战图标映射"""
+        return {
+            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,
+        }
+
+    def _get_hero_battle_dict(self):
+        """获取英杰出战图标映射"""
+        return {
+            Onmyoji.YORIMITSU: self.I_YORIMITSU_BATTLE,
+            Onmyoji.MICHINAGA: self.I_MICHINAGA_BATTLE,
+        }
 
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas3')
+    c = Config('oas1')
     d = Device(c)
     t = SwitchOnmyoji(c, d)
 
-    t.switch_onmyoji(Onmyoji.YORIMITSU)
+    t.switch_onmyoji(Onmyoji.MICHINAGA)