Przeglądaj źródła

修复通关兵藏秘境后弹窗导致的报错
修复无法正确识别机密贴数量的bug

qiyonghan 2 lat temu
rodzic
commit
fcd61088b7

BIN
tasks/HeroTest/as/as_bcmj_reset_close.png


BIN
tasks/HeroTest/as/as_bcmj_reset_confirm.png


+ 18 - 0
tasks/HeroTest/as/image.json

@@ -169,5 +169,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "兵藏秘境的阵容未锁"
+  },
+  {
+    "itemName": "bcmj_reset_confirm",
+    "imageName": "as_bcmj_reset_confirm.png",
+    "roiFront": "668,399,180,70",
+    "roiBack": "668,399,180,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "通过兵藏秘境确认重置按钮"
+  },
+  {
+    "itemName": "bcmj_reset_close",
+    "imageName": "as_bcmj_reset_close.png",
+    "roiFront": "429,397,186,71",
+    "roiBack": "429,397,186,71",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "通过兵藏秘境取消重置按钮"
   }
 ]

+ 5 - 5
tasks/HeroTest/as/ocr.json

@@ -10,8 +10,8 @@
   },
   {
     "itemName": "art_war_card",
-    "roiFront": "735,25,77,31",
-    "roiBack": "735,25,77,31",
+    "roiFront": "712,21,98,36",
+    "roiBack": "712,21,98,36",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -19,9 +19,9 @@
   },
   {
     "itemName": "art_war_card_plus",
-    "roiFront": "914,24,100,35",
-    "roiBack": "914,24,100,35",
-    "mode": "Single",
+    "roiFront": "916,25,90,29",
+    "roiBack": "916,25,90,29",
+    "mode": "SINGLE",
     "method": "Default",
     "keyword": "",
     "description": "兵道帖机密"

+ 6 - 2
tasks/HeroTest/assets.py

@@ -49,14 +49,18 @@ class HeroTestAssets:
 	I_BCMJ__DEFALUT_ATTRIBUTE = RuleImage(roi_front=(1168,159,21,22), roi_back=(255,155,944,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj__defalut_attribute.png")
 	# 兵藏秘境的阵容未锁 
 	I_BCMJ_UNLOCK = RuleImage(roi_front=(906,652,22,30), roi_back=(906,652,22,30), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_unlock.png")
+	# 通过兵藏秘境确认重置按钮 
+	I_BCMJ_RESET_CONFIRM = RuleImage(roi_front=(668,399,180,70), roi_back=(668,399,180,70), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_reset_confirm.png")
+	# 通过兵藏秘境取消重置按钮 
+	I_BCMJ_RESET_CLOSE = RuleImage(roi_front=(429,397,186,71), roi_back=(429,397,186,71), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_reset_close.png")
 
 
 	# Ocr Rule Assets
 	# 投喂的体力 
 	O_REMAIN_AP = RuleOcr(roi=(1095,24,123,33), area=(1095,24,123,33), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 兵藏秘境兵道帖 
-	O_ART_WAR_CARD = RuleOcr(roi=(735,25,77,31), area=(735,25,77,31), mode="DigitCounter", method="Default", keyword="", name="art_war_card")
+	O_ART_WAR_CARD = RuleOcr(roi=(712,21,98,36), area=(712,21,98,36), mode="DigitCounter", method="Default", keyword="", name="art_war_card")
 	# 兵道帖机密 
-	O_ART_WAR_CARD_PLUS = RuleOcr(roi=(914,24,100,35), area=(914,24,100,35), mode="Single", method="Default", keyword="", name="art_war_card_plus")
+	O_ART_WAR_CARD_PLUS = RuleOcr(roi=(916,25,90,29), area=(916,25,90,29), mode="SINGLE", method="Default", keyword="", name="art_war_card_plus")
 
 

+ 11 - 4
tasks/HeroTest/script_task.py

@@ -111,6 +111,8 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
                     if not self.appear(self.I_BATTLE):
                         break
                 elif is_skill:
+                    if self.appear_then_click(self.I_BCMJ_RESET_CONFIRM, interval=1):
+                        continue
                     if self.appear_then_click(self.I_BCMJ_BATTLE, interval=2):
                         self.device.stuck_record_clear()
                         continue
@@ -177,7 +179,7 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
                 if not self.appear(self.I_FALSE, threshold=0.6):
                     return False
         # 最后保证能点击 获得奖励
-        if not self.wait_until_appear(self.I_REWARD, wait_time=2) and not is_skill:
+        if not is_skill and not self.wait_until_appear(self.I_REWARD, wait_time=2):
             # 有些的战斗没有下面的奖励,所以直接返回
             logger.info("There is no reward, Exit battle")
             return win
@@ -227,11 +229,16 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
 
     def check_art_war_card(self):
         self.screenshot()
-        cu, res, total = self.O_ART_WAR_CARD.ocr(image=self.device.image)
-        if cu >= 1:
+        cu = self.O_ART_WAR_CARD.ocr(image=self.device.image)
+        if cu[0] >= 1:
             logger.info("Art war card is enough")
             return True
-        cu, res, total = self.O_ART_WAR_CARD_PLUS.ocr(image=self.device.image)
+        cu = self.O_ART_WAR_CARD_PLUS.ocr(image=self.device.image)
+        # 转换为int
+        if cu != "":
+            cu = int(cu)
+        else:
+            cu = 0
         if cu >= 1:
             logger.info("Art war card is not enough, but plus card is enough")
             return True