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

fix(MetaDemon): update UI assets and add auto_shared_boss config

- Update md_right_enter.png and md_enter2.png for new game UI
- Add md_md_win.png for MetaDemon-specific victory screen detection
- Use I_MD_WIN instead of I_WIN in battle_wait for victory detection
- Add auto_shared_boss config option to toggle battling shared bosses
- All changes verified with local testing

Fixes #1881
微凉徒眸 6 дней назад
Родитель
Сommit
ec8ef406c6

+ 3 - 2
tasks/MetaDemon/assets.py

@@ -31,6 +31,7 @@ class MetaDemonAssets:
 	I_MD_FIRE_POWER = RuleImage(roi_front=(1159,498,100,37), roi_back=(1159,498,100,37), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_md_fire_power.png")
 	# 失败 
 	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")
 	# 召唤鬼王 
@@ -49,9 +50,9 @@ class MetaDemonAssets:
 
 	# Image Rule Assets
 	# 右侧进去 
-	I_RIGHT_ENTER = RuleImage(roi_front=(1183,314,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=(1182,226,46,34), 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=(461,265,44,156), roi_back=(428,220,100,258), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
+	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")
 	# 寻找鬼王 
 	I_FIND_DEMON = RuleImage(roi_front=(1140,582,86,81), roi_back=(1102,546,132,133), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_find_demon.png")
 	# 点击战斗 

+ 1 - 0
tasks/MetaDemon/config.py

@@ -76,6 +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='是否自动打共享鬼王')
     # 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')

BIN
tasks/MetaDemon/md/md_enter2.png


BIN
tasks/MetaDemon/md/md_md_win.png


BIN
tasks/MetaDemon/md/md_right_enter.png


+ 4 - 4
tasks/MetaDemon/script_task.py

@@ -116,7 +116,7 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
                 if self.is_star56():
                     is_hard_boss = True
             # 看别人的是否给我共享鬼王
-            if not battle_processing:
+            if not battle_processing and self.config.meta_demon.meta_demon_config.auto_shared_boss:
                 if not self.appear(self.I_BOSS_EMPTY_1) and self.ocr_appear(self.O_BOSS_EMPTY_1):
                     logger.info('Try to battle boss 1 from others')
                     self.click(self.I_BOSS_EMPTY_1, interval=1.5)
@@ -275,11 +275,11 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
         self.boss_mark_reset()
         while 1:
             self.screenshot()
-            # if self.appear_then_click(self.I_WIN, interval=1):
+            # if self.appear_then_click(self.I_MD_WIN, interval=1):
             #     continue
-            if self.appear(self.I_WIN):
+            if self.appear(self.I_MD_WIN):
                 logger.info('Win battle')
-                self.ui_click_until_disappear(self.I_WIN)
+                self.ui_click_until_disappear(self.I_MD_WIN)
                 return True
 
             if self.appear(self.I_MD_BATTLE_FAILURE):