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

Fix: Catch ScriptEnd raised from emotion control

Browse Source
This commit is contained in:
LmeSzinc
2023-03-24 13:40:39 +08:00
parent b1fe0e32e2
commit 9a1e76c366
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/coalition/coalition.py
View File

@@ -3,7 +3,7 @@ import re
from module.campaign.campaign_event import CampaignEvent from module.campaign.campaign_event import CampaignEvent
from module.coalition.assets import * from module.coalition.assets import *
from module.coalition.combat import CoalitionCombat from module.coalition.combat import CoalitionCombat
from module.exception import ScriptError from module.exception import ScriptError, ScriptEnd
from module.logger import logger from module.logger import logger
from module.ocr.ocr import Digit from module.ocr.ocr import Digit
@@ -118,7 +118,12 @@ class Coalition(CoalitionCombat, CampaignEvent):
break break
# Run # Run
self.coalition_execute_once(event=name, stage=stage, fleet=fleet) try:
self.coalition_execute_once(event=name, stage=stage, fleet=fleet)
except ScriptEnd as e:
logger.hr('Script end')
logger.info(str(e))
break
# After run # After run
self.run_count += 1 self.run_count += 1