소스 검색

Merge commit '484337f5' into dev

blylana 6 일 전
부모
커밋
b066ad8c9c

+ 17 - 2
tasks/MetaDemon/assets.py

@@ -13,13 +13,28 @@ 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=(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=(925,102,44,156), roi_back=(852,20,195,413), 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


+ 11 - 8
tasks/MetaDemon/script_task.py

@@ -117,7 +117,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)
@@ -270,21 +270,24 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
 
     def battle_wait(self, random_click_swipt_enable: bool) -> bool:
         # 重写
-        self.device.stuck_record_add('BATTLE_STATUS_S')
+        self.device.stuck_record_add("BATTLE_STATUS_S")
         self.device.click_record_clear()
         logger.info("Start battle process")
         self.boss_mark_reset()
         while 1:
             self.screenshot()
-            # if self.appear_then_click(self.I_WIN, interval=1):
-            #     continue
-            if self.appear(self.I_WIN):
-                logger.info('Win battle')
-                self.ui_click_until_disappear(self.I_WIN)
+            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')
+                logger.warning("False battle")
                 self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
                 return False
             if self.boss_mark():