فهرست منبع

fix(MetaDemon): Recognize publicly shared demon bosses
- add an image rule for the public status
- include public bosses in self boss detection

blylana 1 هفته پیش
والد
کامیت
411ef6d3ff
4فایلهای تغییر یافته به همراه14 افزوده شده و 1 حذف شده
  1. 3 0
      tasks/MetaDemon/assets.py
  2. 9 0
      tasks/MetaDemon/md/image_2025.json
  3. BIN
      tasks/MetaDemon/md/md_boos_public.png
  4. 2 1
      tasks/MetaDemon/script_task.py

+ 3 - 0
tasks/MetaDemon/assets.py

@@ -14,6 +14,7 @@ class MetaDemonAssets:
 	# 失败 
 	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")
 
+
 	# 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")
@@ -49,6 +50,8 @@ class MetaDemonAssets:
 	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")
+	# 已公开 
+	I_BOOS_PUBLIC = RuleImage(roi_front=(251,155,47,52), roi_back=(228,127,88,90), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_boos_public.png")
 
 
 	# Ocr Rule Assets

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

@@ -151,5 +151,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "boos_public",
+    "imageName": "md_boos_public.png",
+    "roiFront": "251,155,47,52",
+    "roiBack": "228,127,88,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "已公开"
   }
 ]

BIN
tasks/MetaDemon/md/md_boos_public.png


+ 2 - 1
tasks/MetaDemon/script_task.py

@@ -109,7 +109,8 @@ class ScriptTask(RightActivity, GeneralBattle, SwitchSoul, Star56):
                 continue
 
             # 先看自己有没有鬼王要打
-            if not self.appear(self.I_BOSS_EMPTY) and self.appear(self.I_BOSS_CONVENE):
+            if (not self.appear(self.I_BOSS_EMPTY) and
+                    (self.appear(self.I_BOSS_CONVENE) or self.appear(self.I_BOOS_PUBLIC))):
                 logger.info('Try to battle boss from self')
                 self.click(self.I_BOSS_EMPTY, interval=1.5)
                 battle_processing = True