ソースを参照

feat(MetaDemon): Add mark boss function

ryland 1 年間 前
親
コミット
226566aadb

+ 2 - 0
tasks/Component/GeneralBattle/assets.py

@@ -151,6 +151,8 @@ class GeneralBattleAssets:
 	O_PRESET = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预", name="preset")
 	O_PRESET = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预", name="preset")
 	# 预设 
 	# 预设 
 	O_PRESET_FULL = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预设", name="preset_full")
 	O_PRESET_FULL = RuleOcr(roi=(20,620,60,80), area=(20,620,60,80), mode="Single", method="Default", keyword="预设", name="preset_full")
+	# 已标记 
+	O_BOSS_MARK = RuleOcr(roi=(379,44,50,21), area=(379,44,50,21), mode="Single", method="Default", keyword="已标记", name="boss_mark")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 11 - 2
tasks/Component/GeneralBattle/gb/ocr.json

@@ -11,7 +11,7 @@
   {
   {
     "itemName": "preset",
     "itemName": "preset",
     "roiFront": "20,620,60,80",
     "roiFront": "20,620,60,80",
-    "roiBack":  "20,620,60,80",
+    "roiBack": "20,620,60,80",
     "mode": "Single",
     "mode": "Single",
     "method": "Default",
     "method": "Default",
     "keyword": "预",
     "keyword": "预",
@@ -20,10 +20,19 @@
   {
   {
     "itemName": "preset_full",
     "itemName": "preset_full",
     "roiFront": "20,620,60,80",
     "roiFront": "20,620,60,80",
-    "roiBack":  "20,620,60,80",
+    "roiBack": "20,620,60,80",
     "mode": "Single",
     "mode": "Single",
     "method": "Default",
     "method": "Default",
     "keyword": "预设",
     "keyword": "预设",
     "description": "预设"
     "description": "预设"
+  },
+  {
+    "itemName": "boss_mark",
+    "roiFront": "379,44,50,21",
+    "roiBack": "379,44,50,21",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "已标记",
+    "description": "已标记"
   }
   }
 ]
 ]

+ 22 - 0
tasks/Component/GeneralBattle/general_battle.py

@@ -539,6 +539,28 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
             if self.appear_then_click(self.I_BUFF, interval=1):
             if self.appear_then_click(self.I_BUFF, interval=1):
                 continue
                 continue
 
 
+    def boss_mark(self, enable=True) -> bool:
+        if not enable or self._boss_mark_flag:
+            return False
+        if self.ocr_appear(self.O_BOSS_MARK):
+            self.screenshot()
+            if self.ocr_appear(self.O_BOSS_MARK):
+                self._boss_mark_flag = True
+                logger.info('Boss marked')
+                self.device.stuck_record_add('BATTLE_STATUS_S')
+                return True
+        if self.device.click_record.count(str(self.O_BOSS_MARK)) >= 3:
+            self._boss_mark_flag = True
+            logger.info('Boss mark skipped due to maybe no boss')
+            self.device.stuck_record_add('BATTLE_STATUS_S')
+            return False
+        if self.click(self.O_BOSS_MARK, interval=1.8):
+            return False
+        return False
+
+    def boss_mark_reset(self):
+        self._boss_mark_flag = False
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config

+ 3 - 0
tasks/MetaDemon/script_task.py

@@ -274,6 +274,7 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.click_record_clear()
         self.device.click_record_clear()
         logger.info("Start battle process")
         logger.info("Start battle process")
+        self.boss_mark_reset()
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             # if self.appear_then_click(self.I_WIN, interval=1):
             # if self.appear_then_click(self.I_WIN, interval=1):
@@ -287,6 +288,8 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
                 logger.warning('False battle')
                 logger.warning('False battle')
                 self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
                 self.ui_click_until_disappear(self.I_MD_BATTLE_FAILURE)
                 return False
                 return False
+            if self.boss_mark():
+                continue
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 1 - 0
tasks/base_task.py

@@ -59,6 +59,7 @@ class BaseTask(GlobalGameAssets, CostumeBase):
 
 
         # 战斗次数相关
         # 战斗次数相关
         self.current_count = 0  # 战斗次数
         self.current_count = 0  # 战斗次数
+        self._boss_mark_flag = False
 
 
     def _burst(self) -> bool:
     def _burst(self) -> bool:
         """
         """