|
|
@@ -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)
|