Răsfoiți Sursa

feat(tasks): Update MetaDemon

ryland 1 an în urmă
părinte
comite
611dc92efa

+ 2 - 2
dev_tools/assets_test.py

@@ -34,10 +34,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = r"C:\Users\Ryland\Desktop\ScreenShot_2025-11-20_175902_458.png"
+IMAGE_FILE = r"C:\Users\Ryland\Desktop\ScreenShot_2025-11-20_211604_117.png"
 if __name__ == '__main__':
     from tasks.MetaDemon.script_task import ScriptTask
-    targe = ScriptTask.I_FIND_DEMON
+    targe = ScriptTask.I_STAR56_POS_1
     print(detect_image(IMAGE_FILE, targe))
 
     # ocr demo

+ 2 - 2
module/gui/qml/Component/ResizableRectangle.qml

@@ -3,8 +3,8 @@ import QtQuick.Window 2.15
 
 Item {
     id:rect
-    property int minimumWidth: 20
-    property int minimumHeight: 20
+    property int minimumWidth: 5
+    property int minimumHeight: 5
     property int mouseRegion: 5
     property var resizeTarget: rect
     anchors.fill: resizeTarget

+ 3 - 3
tasks/Hyakkiyakou/config.py

@@ -10,14 +10,17 @@ class ModelPrecision(str, Enum):
     FP32 = 'FP32'
     INT8 = 'INT8'
 
+
 class InferenceEngine(str, Enum):
     ONNXRUNTIME = 'Onnxruntime'
     TENSORRT = 'TensorRT'
 
+
 class ScreenshotMethod(str, Enum):
     WINDOW_BACKGROUND = 'window_background'
     NEMU_IPC = 'nemu_ipc'
 
+
 class ControlMethod(str, Enum):
     MINITOUCH = 'minitouch'
     WINDOW_MESSAGE = 'window_message'
@@ -71,7 +74,6 @@ class DebugConfig(ConfigBase):
 
     hide_fields = dynamic_hide('continuous_learning')
 
-
     @field_validator('continuous_learning', mode='after')
     @classmethod
     def false_continuous_learning(cls, v):
@@ -85,5 +87,3 @@ class Hyakkiyakou(ConfigBase):
     hyakkiyakou_config: HyakkiyakouConfig = Field(default_factory=HyakkiyakouConfig)
     hyakkiyakou_models: HyakkiyakouModels = Field(default_factory=HyakkiyakouModels)
     debug_config: DebugConfig = Field(default_factory=DebugConfig)
-
-

+ 10 - 0
tasks/MetaDemon/assets.py

@@ -72,6 +72,14 @@ class MetaDemonAssets:
 	I_CRAFTING_START = RuleImage(roi_front=(889,561,140,39), roi_back=(840,521,231,100), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_start.png")
 	# description 
 	I_CRAFTING_EMPTY_NEW = RuleImage(roi_front=(787,307,100,100), roi_back=(772,299,128,117), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_crafting_empty_new.png")
+	# description 
+	I_STAR56_POS_1 = RuleImage(roi_front=(100,205,8,11), roi_back=(100,205,8,11), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_star56_pos_1.png")
+	# 血量高于阈值 
+	I_STAR56_HP_THRESHOLD_T = RuleImage(roi_front=(630,518,58,18), roi_back=(630,518,58,18), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_star56_hp_threshold_t.png")
+	# 血量小于阈值 
+	I_STAR56_HP_THRESHOLD_F = RuleImage(roi_front=(659,517,26,19), roi_back=(659,517,26,19), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_star56_hp_threshold_f.png")
+	# description 
+	I_ENTER_ENSURE = RuleImage(roi_front=(541,578,186,48), roi_back=(443,555,370,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter_ensure.png")
 
 
 	# Ocr Rule Assets
@@ -83,5 +91,7 @@ class MetaDemonAssets:
 	O_MD_COUNT_INFO = RuleOcr(roi=(94,314,161,37), area=(94,314,161,37), mode="Single", method="Default", keyword="击败奖励结算中", name="md_count_info")
 	# 一星卡 
 	O_CRAFTING_CARD_1 = RuleOcr(roi=(303,158,161,33), area=(303,158,161,33), mode="Single", method="Default", keyword="一星梦告铃鼓", name="crafting_card_1")
+	# 式神全名 
+	O_MD_FULL_NAME = RuleOcr(roi=(479,116,100,217), area=(479,116,100,217), mode="Full", method="Default", keyword="", name="md_full_name")
 
 

+ 148 - 5
tasks/MetaDemon/config.py

@@ -1,26 +1,169 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
-from tasks.Component.config_base import ConfigBase, TimeDelta, DateTime, Time
-from pydantic import BaseModel, ValidationError, validator, Field
+
+from pydantic import BaseModel, ValidationError, validator, Field, field_validator
+from pydantic import Field, BaseModel, model_validator, model_serializer, ValidationError
 from enum import Enum
+from typing import Any, Dict
+
+from module.logger import logger
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
+from tasks.Component.config_base import ConfigBase, dynamic_hide
+
+
+class DefaultStrategy(ConfigBase):
+    # 1 是高于阈值选这个阵容 2是低于这个阈值选这个阵容
+    md_preset_group_team_default_1: str = Field(default='1,1', description='md_preset_group_team_default_1_help')
+    md_preset_group_team_default_2: str = Field(default='1,1', description='md_preset_group_team_default_2_help')
+
+    # fff = dynamic_hide('md_match_names')
+
+
+class Strategy(ConfigBase):
+    # 匹配的式神中文名字
+    md_match_names: str = Field(default='default')
+    # 选哪一个预设组
+    md_preset_group_team_1: str = Field(default='1,1')
+    md_preset_group_team_2: str = Field(default='1,1')
 
-# 鬼王的难度为: 易、中、高、难、极 五个 对应英文:easy、medium、hard、difficult、extreme
+    def is_valid(self):
+        return self.md_match_names != "" and self.md_match_names is not None
+
+    @classmethod
+    def parse_names(cls, names: str) -> list[str]:
+        names = names.replace(',', ',').replace(' ', '')
+        try:
+            return names.split(',')
+        except Exception as e:
+            logger.error(f'parse_names error: {e}')
+            raise e
+
+    @classmethod
+    def parse_group_team(cls, team: str) -> list[int]:
+        team = team.replace(',', ',').replace(' ', '')
+        team = ''.join([c for c in team if c.isdigit() or c == ','])
+        try:
+            result = [int(i) for i in team.split(',')]
+            if len(result) != 2:
+                raise Exception('group team length is not 2')
+            if result[0] < 0 and result[1] < 0:
+                raise Exception('group team is not valid')
+            # group 不能小于1 和大于 7
+            if result[0] < 1 or result[0] > 7:
+                raise Exception('group is not valid')
+            # team 不能小于1 和大于 5
+            if result[1] < 1 or result[1] > 5:
+                raise Exception('team is not valid')
+            return result
+        except Exception as e:
+            logger.error(f'group team string: {team}')
+            logger.error(f'parse_team error: {e}')
+            raise e
+
+    @classmethod
+    def parse_all(cls, data: list['Strategy']) -> dict[str, list[int]]:
+        result = {}
+        for item in data:
+            value = item.parse_group_team(item.md_preset_group_team_1)\
+                    + item.parse_group_team(item.md_preset_group_team_2)
+            for name in cls.parse_names(item.md_match_names):
+                result[name] = value
+        return result
 
 
 class MetaDemonConfig(ConfigBase):
     meta_crafting_card: bool = Field(default=True, description='craft_essence_help')
     auto_tea: bool = Field(default=False, description='auto_tea_help')
-    extreme_notify: bool = Field(default=False, description='extreme_notify_help')
+    # extreme_notify: bool = Field(default=False, description='extreme_notify_help')
+    md_strategy_count: int = Field(default=0, ge=0, description='md_strategy_count_help')
+    md_use_strategy: bool = Field(default=False, description='md_use_strategy_help')
+
+
+    @field_validator('auto_tea', mode='after')
+    @classmethod
+    def to_false(cls, v):
+        return False
+
+    @field_validator('md_strategy_count', mode='after')
+    @classmethod
+    def validator_strategy_count(cls, v):
+        if v < 0:
+            return 0
+        return v
+
 
 
 class MetaDemon(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    meta_demon_config: MetaDemonConfig = Field(default_factory=MetaDemonConfig)
     switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    meta_demon_config: MetaDemonConfig = Field(default_factory=MetaDemonConfig)
+    md_default_strategy: DefaultStrategy = Field(default_factory=DefaultStrategy)
+    md_strategies: list[Strategy] = None
+
+    @model_validator(mode='before')
+    @classmethod
+    def validator_all(cls, v: dict) -> Any:
+        strategy_count = v.get('meta_demon_config', {}).get('md_strategy_count', 1)
+
+        def validator_list(list_name, data, item_type=None, list_size=1):
+            if list_name not in data:
+                data[list_name] = []
+
+            remove_keys = []
+            for key, value in data.items():
+                if list_name == key or list_name not in key:
+                    continue
+                try:
+                    item = item_type(**value)
+                    if item.is_valid():
+                        data[list_name].append(item)
+                    remove_keys.append(key)
+                except ValidationError as e:
+                    pass
+                except TypeError as e:
+                    pass
+
+            for key in remove_keys:
+                del data[key]
+
+            if item_type is not None:
+                current_list = data[list_name]
+                current_length = len(current_list)
+                if current_length < list_size:
+                    num_to_add = list_size - current_length
+                    new_elements = [item_type() for _ in range(num_to_add)]
+                    data[list_name].extend(new_elements)
+                elif current_length > list_size:
+                    data[list_name] = data[list_name][:list_size]
+
+        validator_list('md_strategies', v, Strategy, strategy_count)
+
+        return v
+
+    @model_serializer()
+    def serializer_model(self, value: Any) -> Dict[str, Any]:
+        properties = self.__dict__
+        data = {}
+
+        def v_dump(v):
+            try:
+                return v.model_dump()
+            except AttributeError as e:
+                logger.error(e)
+                return v
 
+        for key, value in properties.items():
+            if isinstance(value, list):
+                for index, v in enumerate(value):
+                    data[f'{key}_{index + 1}'] = v_dump(v)
+            else:
+                data[key] = v_dump(value)
+        return data
 
 
+if __name__ == '__main__':
+    ff = MetaDemon()
+    ff.model_dump()
 

+ 36 - 0
tasks/MetaDemon/md/image_2025.json

@@ -106,5 +106,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "star56_pos_1",
+    "imageName": "md_star56_pos_1.png",
+    "roiFront": "100,205,8,11",
+    "roiBack": "100,205,8,11",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "star56_hp_threshold_t",
+    "imageName": "md_star56_hp_threshold_t.png",
+    "roiFront": "630,518,58,18",
+    "roiBack": "630,518,58,18",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "血量高于阈值"
+  },
+  {
+    "itemName": "star56_hp_threshold_f",
+    "imageName": "md_star56_hp_threshold_f.png",
+    "roiFront": "659,517,26,19",
+    "roiBack": "659,517,26,19",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "血量小于阈值"
+  },
+  {
+    "itemName": "enter_ensure",
+    "imageName": "md_enter_ensure.png",
+    "roiFront": "541,578,186,48",
+    "roiBack": "443,555,370,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

BIN
tasks/MetaDemon/md/md_enter_ensure.png


BIN
tasks/MetaDemon/md/md_star56_hp_threshold_f.png


BIN
tasks/MetaDemon/md/md_star56_hp_threshold_t.png


BIN
tasks/MetaDemon/md/md_star56_pos_1.png


+ 9 - 0
tasks/MetaDemon/md/ocr.json

@@ -34,5 +34,14 @@
     "method": "Default",
     "keyword": "一星梦告铃鼓",
     "description": "一星卡"
+  },
+  {
+    "itemName": "md_full_name",
+    "roiFront": "479,116,100,217",
+    "roiBack": "479,116,100,217",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "式神全名"
   }
 ]

+ 105 - 12
tasks/MetaDemon/script_task.py

@@ -17,13 +17,59 @@ from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleCon
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
 from tasks.GameUi.page import page_main, page_shikigami_records
-from tasks.MetaDemon.config import MetaDemon
+from tasks.MetaDemon.config import MetaDemon, DefaultStrategy, Strategy
 from tasks.MetaDemon.assets import MetaDemonAssets
 from tasks.Restart.assets import RestartAssets
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
 
 
-class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAssets):
+
+class Star56(GameUi, MetaDemonAssets):
+
+    @cached_property
+    def cached_strategies(self) -> dict[str, list[int]]:
+        return Strategy.parse_all(self.config.meta_demon.md_strategies)
+
+    @cached_property
+    def cached_default_group_team(self) -> list[int]:
+        return Strategy.parse_group_team(self.config.meta_demon.md_default_strategy.md_preset_group_team_default_1) \
+            + Strategy.parse_group_team(self.config.meta_demon.md_default_strategy.md_preset_group_team_default_2)
+
+    def is_star56(self):
+        if not self.appear(self.I_STAR56_POS_1):
+            return True
+        return False
+
+    def hp_threshold_low(self, image):
+        """
+        @param image:
+        @return: 血量小于阈值返回True
+        """
+        return self.appear(self.I_STAR56_HP_THRESHOLD_F) and not self.appear(self.I_STAR56_HP_THRESHOLD_T)
+
+    @classmethod
+    def strategy2group_team(cls, strategies: dict[str, list[int]], detect_name: str) -> list[int] | None:
+        """
+        先是默认的完全匹配,然后是1个字符不同,最后是2个字符不同
+        @param strategies:
+        @param detect_name:
+        @return:
+        """
+        for i in range(2):
+            for key_name in strategies:
+                if len(key_name) != len(detect_name):
+                    continue
+                diff_count = sum(1 for c1, c2 in zip(key_name, detect_name) if c1 != c2)
+                if diff_count <= i:
+                    return strategies[key_name]
+        return None
+
+    def get_group_team(self, detect_name: str) -> list[int]:
+        tmp = self.strategy2group_team(self.cached_strategies, detect_name)
+        return tmp if tmp else self.cached_default_group_team
+
+
+class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
 
     def run(self):
         if self.config.meta_demon.switch_soul.enable:
@@ -42,15 +88,23 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAsse
             self.screenshot()
             if self.appear(self.I_FIND_DEMON) or self.appear(self.I_BATTLE_DEMON):
                 break
+
+            if self.ui_reward_appear_click():
+                continue
+            if self.appear_then_click(self.I_UI_BACK_RED, interval=1.5):
+                continue
+            if self.appear_then_click(self.I_ENTER_ENSURE, interval=1):
+                continue
             if self.appear_then_click(self.I_ENTER2, interval=1):
                 continue
         if self.config.meta_demon.meta_demon_config.meta_crafting_card:
             self.crafting()
 
-        boss_timer = Timer(120)
+        boss_timer = Timer(180)
         boss_timer.start()
         while 1:
             battle_processing = False
+            is_hard_boss = False  # 五星或者六星
             self.screenshot()
             if not (self.appear(self.I_FIND_DEMON) or self.appear(self.I_BATTLE_DEMON)):
                 continue
@@ -59,12 +113,16 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAsse
             if not self.appear(self.I_BOSS_EMPTY):
                 self.click(self.I_BOSS_EMPTY, interval=1.5)
                 battle_processing = True
+                if self.is_star56():
+                    is_hard_boss = True
             # 看别人的是否给我共享鬼王
             if not battle_processing:
                 if not self.appear(self.I_BOSS_EMPTY_1):
+                    logger.info('Try to battle boss 1 from others')
                     self.click(self.I_BOSS_EMPTY_1, interval=1.5)
                     battle_processing = True
                 elif not self.appear(self.I_BOSS_EMPTY_2):
+                    logger.info('Try to battle boss 2 from others')
                     self.click(self.I_BOSS_EMPTY_2, interval=1.5)
                     battle_processing = True
             # 是否喝茶 疲劳满了就不打了
@@ -77,10 +135,31 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAsse
                 else:
                     logger.info('Exhaustion is full, exit')
                     break
+            # 超时结束
+            if boss_timer.reached():
+                logger.info('Time out, exit')
+                break
+            # 5/6星特殊处理 + 使用自定义策略组
+            target_group_team = [None, None]
+            if is_hard_boss:
+                logger.info('Hard boss')
+                if self.config.meta_demon.meta_demon_config.md_use_strategy:
+                    detect_full_name = self.O_MD_FULL_NAME.ocr_single(self.device.image)
+                    logger.info(f'detect_full_name: {detect_full_name}')
+                    if not detect_full_name:
+                        detect_full_name = ''
+                    group_team = self.get_group_team(detect_full_name)
+                    if self.hp_threshold_low(self.device.image):
+                        logger.info('Hp threshold low')
+                        target_group_team = group_team[2:4]
+                    else:
+                        logger.info('Hp threshold high')
+                        target_group_team = group_team[0:2]
             # 正式战斗
             if battle_processing and self.appear(self.I_BATTLE_DEMON):
+                logger.info(f'preset group team: {target_group_team}')
+                self.battle_boss(target_group_team[0], target_group_team[1])
                 boss_timer.reset()
-                self.battle_boss()
                 continue
 
             # 自己召唤鬼王
@@ -122,8 +201,7 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAsse
                 break
             if self.appear(self.I_CRAFTING_EMPTY) or self.appear(self.I_CRAFTING_EMPTY_NEW):
                 if self.appear_then_click(self.I_CRAFTING_CARD_STAR_1, interval=1):
-                    timer.reset()
-                continue
+                    continue
             else:
                 self.appear_then_click(self.I_CRAFTING_START, interval=3)
                 count += 1
@@ -145,16 +223,32 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, GameUi, MetaDemonAsse
             if self.appear_then_click(self.I_FIND_DEMON, interval=3.5):
                 continue
         self.screenshot()
+        if self.is_star56():
+            logger.info('Star 5 or 6 demon found')
+            detect_full_name = self.O_MD_FULL_NAME.ocr_single(self.device.image)
+            logger.info(f'召唤到高星鬼王: {detect_full_name}')
+            self.config.notifier.push(content=f'召唤到高星鬼王: {detect_full_name}', title='超鬼王')
         return True
 
-    def battle_boss(self) -> bool:
+    def battle_boss(self, group: int = None, team: int = None) -> bool:
         logger.info('Battle boss')
         self.ui_click_until_disappear(self.I_BATTLE_DEMON, interval=1.8)
         battle_config = GeneralBattleConfig()
         battle_config.lock_team_enable = False
-        if self.run_general_battle(battle_config):
-            return True
-        return False
+        if group is None and team is None:
+            battle_config.preset_enable = False
+            success = self.run_general_battle(battle_config)
+            return True if success else False
+        # 针对5/6星的挑战
+        else:
+            battle_config.preset_enable = True
+            battle_config.preset_group = group
+            battle_config.preset_team = team
+            tmp_battle_count = self.current_count
+            self.current_count = 0
+            success = self.run_general_battle(battle_config)
+            self.current_count = tmp_battle_count + 1
+            return True if success else False
 
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
         # 重写
@@ -185,5 +279,4 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
 
     t.run()
-    # t.screenshot()
-    # print(t.current_exhaustion())
+