1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-27 02:38:22 +08:00

Fix: auto search in event daily AB

- Add auto call submarine in auto search
This commit is contained in:
LmeSzinc
2021-01-28 14:11:06 +08:00
parent 8e84099073
commit 26c484bd87
2 changed files with 15 additions and 2 deletions

View File

@@ -236,4 +236,6 @@ class CampaignRun(Reward):
if self.campaign.config.MAP_IS_ONE_TIME_STAGE: if self.campaign.config.MAP_IS_ONE_TIME_STAGE:
if self.run_count >= 1: if self.run_count >= 1:
logger.hr('Triggered one-time stage limit') logger.hr('Triggered one-time stage limit')
return True break
self.campaign.ensure_auto_search_exit()

View File

@@ -74,14 +74,25 @@ class AutoSearchCombat(Combat):
in: is_combat_loading() in: is_combat_loading()
out: combat status out: combat status
""" """
logger.info('Auto Search combat execute') logger.info('Auto search combat loading')
self.device.screenshot_interval_set(self.config.COMBAT_SCREENSHOT_INTERVAL) self.device.screenshot_interval_set(self.config.COMBAT_SCREENSHOT_INTERVAL)
while 1:
self.device.screenshot()
if self.is_combat_executing():
break
logger.info('Auto Search combat execute')
self.submarine_call_reset()
if emotion_reduce: if emotion_reduce:
self.emotion.reduce(fleet_index) self.emotion.reduce(fleet_index)
while 1: while 1:
self.device.screenshot() self.device.screenshot()
if self.handle_submarine_call():
continue
# End # End
if self.appear(BATTLE_STATUS_S) or self.appear(BATTLE_STATUS_A) or self.appear(BATTLE_STATUS_B) \ if self.appear(BATTLE_STATUS_S) or self.appear(BATTLE_STATUS_A) or self.appear(BATTLE_STATUS_B) \
or self.appear(EXP_INFO_S) or self.appear(EXP_INFO_A) or self.appear(EXP_INFO_B) \ or self.appear(EXP_INFO_S) or self.appear(EXP_INFO_A) or self.appear(EXP_INFO_B) \