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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
LmeSzinc
2022-12-28 18:24:53 +08:00
parent bcad66edcd dac275901b
commit a820633129
27 changed files with 283 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/campaign/campaign_base.py
View File

@@ -110,8 +110,8 @@ class CampaignBase(CampaignUI, Map, AutoSearchCombat):
logger.warning('ScriptError, No combat executed.')
if self.config.Error_HandleError:
logger.warning('ScriptError, No combat executed, Withdrawing')
else:
self.withdraw()
else:
raise ScriptError('No combat executed.')
return result
@@ -149,7 +149,10 @@ class CampaignBase(CampaignUI, Map, AutoSearchCombat):
logger.warning('Battle function exhausted.')
if self.config.Error_HandleError:
logger.warning('ScriptError, Battle function exhausted, Withdrawing')
self.withdraw()
try:
self.withdraw()
except CampaignEnd:
pass
else:
raise ScriptError('Battle function exhausted.')