Преглед на файлове

refactor(MetaDemon): Migrate battle_boss to battle_wait strategy hooks

blylana преди 6 дни
родител
ревизия
5a752388e2

+ 3 - 1
assets/i18n/zh-CN.json

@@ -70,6 +70,8 @@
   "limit_daily_training_help": "",
   "limit_cultivation_drills": "修行合训挑战鬼王数量",
   "limit_cultivation_drills_help": "搜寻到一只后会一直打,直到打完算一次",
+  "auto_shared_boss": "自动挑战共享鬼王",
+  "auto_shared_boss_help": "是否自动挑战其他玩家共享的鬼王",
   "enable_switch_daily_training": "日常训练开启切换御魂",
   "enable_switch_cultivation_drills": "修行合训开启切换御魂",
   "demon_battle_config": "逢魔战斗内切换阵容",
@@ -167,4 +169,4 @@
   "green_mark_type_help": "按坐标点击指定绿标,或按式神名OCR 匹配后点击",
   "green_mark_name": "绿标式神名称",
   "green_mark_name_help": "仅当绿标按式神名匹配时生效,填写目标式神名"
-}
+}

+ 9 - 0
tasks/Component/GeneralBattle/battle_wait.py

@@ -341,6 +341,15 @@ class PerTaskPreset:
     # 一次任务类型触发一次,想要再次触发把done设置False
     done: bool = False
 
+    @classmethod
+    def reset_preset_state(cls, owner: 'BattleWait') -> None:
+        if runtime.task_owner is not owner:
+            # runtime 还没绑定到本任务,per_task 会在首个钩子调用时整体重建,这里无需处理
+            return
+        for hook_name, ctx in runtime.pri_ctx.items():
+            if runtime.hook2event(hook_name) == 'preset':
+                ctx.per_task = cls()
+
 
 @dataclass
 class PerTaskGreen:

+ 2 - 15
tasks/MetaDemon/assets.py

@@ -13,26 +13,13 @@ class MetaDemonAssets:
 	# Image Rule Assets
 	# 失败 
 	I_MD_BATTLE_FAILURE = RuleImage(roi_front=(412,105,100,100), roi_back=(412,105,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_battle_failure.png")
+	#  
 	I_MD_WIN = RuleImage(roi_front=(691,55,236,170), roi_back=(668,32,282,216), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_win.png")
-	# 进入鬼王界面 
-	I_A2 = RuleImage(roi_front=(751,137,41,149), roi_back=(751,137,41,149), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/Screenshots_a2.png")
-	# 召唤鬼王 
-	I_A3 = RuleImage(roi_front=(1137,581,100,100), roi_back=(1137,581,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/Screenshots_a3.png")
-	# 挑战 
-	I_A4 = RuleImage(roi_front=(1137,581,100,100), roi_back=(1137,581,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/Screenshots_a4.png")
-	# 准备 
-	I_A5 = RuleImage(roi_front=(1129,536,100,100), roi_back=(1129,536,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/Screenshots_a5.png")
-	# description 
-	I_A6 = RuleImage(roi_front=(435,147,100,100), roi_back=(435,147,100,100), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/Screenshots_a6.png")
-	# 超鬼王打完了 
-	I_BACK_CHECK = RuleImage(roi_front=(378,257,68,32), roi_back=(378,257,68,32), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_back_check.png")
-	# 红色的叉叉 
-	I_RED_BACK = RuleImage(roi_front=(925,181,47,48), roi_back=(925,181,47,48), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_red_back.png")
 
 
 	# Image Rule Assets
 	# 右侧进去 
-	I_RIGHT_ENTER = RuleImage(roi_front=(1182,226,46,34), roi_back=(1150,131,100,360), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
+	I_RIGHT_ENTER = RuleImage(roi_front=(1188,220,37,26), roi_back=(1150,131,100,360), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
 	# description 
 	I_ENTER2 = RuleImage(roi_front=(933,150,73,125), roi_back=(893,47,116,244), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
 	# 寻找鬼王 

+ 1 - 1
tasks/MetaDemon/config.py

@@ -76,7 +76,7 @@ class Strategy(ConfigBase):
 class MetaDemonConfig(ConfigBase):
     meta_crafting_card: bool = Field(default=True, description='craft_essence_help')
     auto_tea: bool = Field(default=False, description='auto_tea_help')
-    auto_shared_boss: bool = Field(default=True, description='是否自动打共享鬼王')
+    auto_shared_boss: bool = Field(default=True, description='auto_shared_boss_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')

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

@@ -7,5 +7,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "失败"
+  },
+  {
+    "itemName": "md_win",
+    "imageName": "md_md_win.png",
+    "roiFront": "691,55,236,170",
+    "roiBack": "668,32,282,216",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": ""
   }
 ]

+ 4 - 4
tasks/MetaDemon/md/image_2025.json

@@ -2,7 +2,7 @@
   {
     "itemName": "right_enter",
     "imageName": "md_right_enter.png",
-    "roiFront": "1183,314,46,34",
+    "roiFront": "1188,220,37,26",
     "roiBack": "1150,131,100,360",
     "method": "Template matching",
     "threshold": 0.75,
@@ -11,8 +11,8 @@
   {
     "itemName": "enter2",
     "imageName": "md_enter2.png",
-    "roiFront": "925,102,44,156",
-    "roiBack": "852,20,195,413",
+    "roiFront": "933,150,73,125",
+    "roiBack": "893,47,116,244",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -161,4 +161,4 @@
     "threshold": 0.8,
     "description": "已公开"
   }
-]
+]

+ 69 - 34
tasks/MetaDemon/script_task.py

@@ -13,6 +13,11 @@ from module.exception import TaskEnd
 
 from tasks.Component.RightActivity.right_activity import RightActivity
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
+from tasks.Component.GeneralBattle.battle import Battle
+from tasks.Component.GeneralBattle.battle_wait import (
+    BattleResult, HookSignal, PerTaskPreset, PrivateContext, PublicContext,
+    battle_wait_strategy, battle_wait_options, runtime,
+)
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.GameUi.game_ui import GameUi
@@ -69,7 +74,7 @@ class Star56(GameUi, MetaDemonAssets):
         return tmp if tmp else self.cached_default_group_team
 
 
-class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
+class ScriptTask(RightActivity, Battle, GeneralBattle, SwitchSoul, Star56):
 
     def run(self):
         if self.config.meta_demon.switch_soul.enable:
@@ -249,56 +254,86 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
         return True
 
     def battle_boss(self, group: int = None, team: int = None) -> bool:
+        """
+        战斗流程不再自己写 while 循环,全部交给 battle_wait 的策略化钩子:
+          prepare/preset  准备阶段与预设队伍(5/6 星按推荐阵容切队)
+          success/failure 超鬼王自带的结算界面(I_MD_WIN / I_MD_BATTLE_FAILURE)
+          idle            战斗中给鬼王上标记
+        @param group: 预设组,与 team 同时为 None 时不切预设队伍
+        @param team:  预设队伍,与 group 同时为 None 时不切预设队伍
+        @return: True 战斗胜利,False 战斗失败
+        """
         logger.info('Battle boss')
         self.ui_click_until_disappear(self.I_BATTLE_DEMON, interval=1.8)
+        # 任务级战斗计数:本场是第几场(和旧日志 Current count 对齐)
+        count = runtime.pub_ctx.per_task.count if runtime.pub_ctx else 0
+        logger.info(f'Current count: {count + 1}')
+
         battle_config = GeneralBattleConfig()
         battle_config.lock_team_enable = 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:
+        if group is not None and team is not None:
             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:
-        # 重写
-        self.device.stuck_record_add("BATTLE_STATUS_S")
-        self.device.click_record_clear()
-        logger.info("Start battle process")
+            # 每只5/6星鬼王的推荐阵容不同,而预设队伍默认是按任务只切一次的,
+            # 这里只复位 preset 的任务级状态,per_task.count 保持累加
+            PerTaskPreset.reset_preset_state(self)
+
+        strategies, options = self.loadout_from_config(battle_config)
+        strategies['success'] = 'metademon'
+        strategies['failure'] = 'metademon'
+        strategies['idle'] = 'metademon'
+        options['completion'].check_imgs = [self.I_CRAFTING_1, self.I_FIND_DEMON, self.I_BATTLE_DEMON]
+
+        self.loadout_show((strategies, options))
         self.boss_mark_reset()
+        with battle_wait_strategy(**strategies), battle_wait_options(**options):
+            win = self.battle_wait()
+        logger.info(f'Battle boss win: {win}, current count: {runtime.pub_ctx.per_task.count}')
+        return win
+
+    # ------------------------------------------------------------------------------------------------------------------
+    # battle_wait 钩子:超鬼王自己的结算界面与战中行为
+    # ------------------------------------------------------------------------------------------------------------------
+    def _bw_success_metademon(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
+        if not self.appear(self.I_MD_WIN):
+            return HookSignal.CONTINUE
+        logger.info('Win battle')
         while 1:
             self.screenshot()
-            if self.appear(self.I_MD_WIN):
-                logger.info("Win battle")
-                while 1:
-                    self.screenshot()
-                    if not self.appear(self.I_MD_WIN):
-                        break
-                    self.click(self.I_MD_WIN)
-                    sleep(0.5)
-                return True
-
-            if self.appear(self.I_MD_BATTLE_FAILURE):
-                logger.warning("False battle")
-                self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
-                return False
-            if self.boss_mark():
-                continue
+            if not self.appear(self.I_MD_WIN):
+                break
+            self.click(self.I_MD_WIN)
+            sleep(0.5)
+        pub.per_battle.success = BattleResult.SUCCESS
+        return runtime.hook_enabled_update(
+            enable=('completion',),
+            disable=('success', 'failure'),
+        )
+
+    def _bw_failure_metademon(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
+        if not self.appear(self.I_MD_BATTLE_FAILURE):
+            return HookSignal.CONTINUE
+        logger.warning('False battle')
+        self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
+        pub.per_battle.success = BattleResult.FAILURE
+        return runtime.hook_enabled_update(
+            enable=('completion',),
+            disable=('success', 'failure'),
+        )
+
+    def _bw_idle_metademon(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
+        if self.is_in_real_battle(False):
+            self.boss_mark()
+        return HookSignal.CONTINUE
 
 
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('体服')
+    c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)