Procházet zdrojové kódy

Merge pull request #665 from yEs1do/fix_AreaBoss_20k

修改地鬼悬赏直接攻打的数量为至少20000
huangrunheng před 1 rokem
rodič
revize
2f9ade60ff
1 změnil soubory, kde provedl 11 přidání a 6 odebrání
  1. 11 6
      tasks/AreaBoss/script_task.py

+ 11 - 6
tasks/AreaBoss/script_task.py

@@ -300,9 +300,10 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         boosName = []
         boosName = []
         filter_open_flag = False
         filter_open_flag = False
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
-        #如果num为0则不在进行nameOcr
+        #如果num为0则不再进行nameOcr
         if num:
         if num:
-            if num > 12000:
+            if num >= 20000:
+                logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
         else:
         else:
@@ -314,7 +315,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
         if num:
         if num:
-            if num > 12000:
+            if num >= 20000:
+                logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
         else:
         else:
@@ -326,7 +328,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.open_filter()
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
         if num:
         if num:
-            if num > 12000:
+            if num >= 20000:
+                logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
         else:
         else:
@@ -341,7 +344,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, wait_time=1)
         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)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
         if num:
         if num:
-            if num > 12000:
+            if num >= 20000:
+                logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
         else:
         else:
@@ -356,7 +360,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, wait_time=1)
         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)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
         if num:
         if num:
-            if num > 12000:
+            if num >= 20000:
+                logger.info("The number of challenges is enough")
                 return filter_open_flag, str("direct_attack")
                 return filter_open_flag, str("direct_attack")
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
             name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
         else:
         else: