sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 09:48:20 +08:00
Code Activity

Merge branch 'master' into app

Browse Source 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
This commit is contained in:
LmeSzinc
2021-09-17 23:53:15 +08:00
parent 61cbe75527 ae6809c9aa
commit 5ed75c8de5
37 changed files with 1379 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/campaign/campaign_base.py
View File

@@ -55,7 +55,10 @@ class CampaignBase(CampaignUI, Map, AutoSearchCombat):
if self.battle_count >= 3:
self.pick_up_ammo()
remain = self.map.select(is_enemy=True, is_boss=False)
remain = self.map.select(is_enemy=True) \
.add(self.map.select(is_siren=True)) \
.add(self.map.select(is_fortress=True)) \
.delete(self.map.select(is_boss=True))
logger.info(f'Enemy remain: {remain}')
if remain.count > 0:
if self.clear_siren():