1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-31 01:54:11 +08:00

Fix: resolve merge conflicts

This commit is contained in:
nEEtdo0d
2020-11-19 11:19:41 -05:00
13 changed files with 2518 additions and 2295 deletions

View File

@@ -59,6 +59,9 @@ class CampaignBase(Map, CampaignUI):
if remain.count > 0:
if self.clear_siren():
return True
self.clear_mechanism()
return self.battle_default()
else:
backup = self.config.FLEET_BOSS