فهرست منبع

Merge pull request #710 from yEs1do/fix(AreaBoss_num)

地鬼挑战人数二次确认
huangrunheng 1 سال پیش
والد
کامیت
53531a34ac
4فایلهای تغییر یافته به همراه16 افزوده شده و 5 حذف شده
  1. 2 0
      tasks/AreaBoss/assets.py
  2. BIN
      tasks/AreaBoss/res/ab_num_challenge_rail.png
  3. 9 0
      tasks/AreaBoss/res/image.json
  4. 5 5
      tasks/AreaBoss/script_task.py

+ 2 - 0
tasks/AreaBoss/assets.py

@@ -101,6 +101,8 @@ class AreaBossAssets:
 	I_AB_JI_FLOOR_TEN = RuleImage(roi_front=(390,370,60,40), roi_back=(390,370,60,40), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_ten.png")
 	# 小组内未取得名次 
 	I_AB_GROUP_RANK_NONE = RuleImage(roi_front=(890,415,95,85), roi_back=(890,415,95,85), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_rank_none.png")
+	# 挑战数进度条
+	I_AB_NUM_CHALLENGE_RAIL = RuleImage(roi_front=(895,639,14,27), roi_back=(895,639,14,27), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_num_challenge_rail.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/AreaBoss/res/ab_num_challenge_rail.png


+ 9 - 0
tasks/AreaBoss/res/image.json

@@ -196,5 +196,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小组内未取得名次"
+  },
+  {
+    "itemName": "ab_num_challenge_rail",
+    "imageName": "ab_num_challenge_rail.png",
+    "roiFront": "895,639,14,27",
+    "roiBack": "895,639,14,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "挑战数进度条"
   }
 ]

+ 5 - 5
tasks/AreaBoss/script_task.py

@@ -302,7 +302,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
         #如果num为0则不再进行nameOcr
         if num:
-            if num >= 20000:
+            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
                 logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
@@ -315,7 +315,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
         if num:
-            if num >= 20000:
+            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
                 logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
@@ -328,7 +328,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
         if num:
-            if num >= 20000:
+            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
                 logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
@@ -344,7 +344,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
         if num:
-            if num >= 20000:
+            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
                 logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
@@ -360,7 +360,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
         if num:
-            if num >= 20000:
+            if num >= 20000 and not self.appear(self.I_AB_NUM_CHALLENGE_RAIL):
                 logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)