sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-02 08:24:07 +08:00
Code Activity

Fix: Auto event convert should before stage covert

Browse Source
This commit is contained in:
LmeSzinc
2023-05-27 21:27:42 +08:00
parent 84e8099829
commit e43116d3db
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
campaign/event_20230525_cn/campaign_base.py
View File

@@ -8,6 +8,7 @@ from module.logger import logger
# Here manually type coordinates, because the ball appears in this event only.
BALL = Button(area=(589, 279, 685, 374), color=(), button=(589, 279, 685, 374))
class CampaignBase(CampaignBase_):
STAGE_INCREASE = [
'T1 > T2 > TS1 > T3',

24
module/campaign/run.py
View File

@@ -166,6 +166,18 @@ class CampaignRun(CampaignEvent):
"""
name = re.sub('[ \t\n]', '', str(name)).lower()
name = to_map_file_name(name)
# For GemsFarming, auto choose events or main chapters
if self.config.task.command == 'GemsFarming':
if self.stage_is_main(name):
logger.info(f'Stage name {name} is from campaign_main')
folder = 'campaign_main'
else:
folder = self.config.cross_get('Event.Campaign.Event')
if folder is not None:
logger.info(f'Stage name {name} is from event {folder}')
else:
logger.warning(f'Cannot get the latest event, fallback to campaign_main')
folder = 'campaign_main'
# Handle special names SP maps
if folder == 'event_20201126_cn' and name == 'vsp':
name = 'sp'
@@ -229,18 +241,6 @@ class CampaignRun(CampaignEvent):
f'run ordered stage: {stage}')
name = stage.lower()
self.is_stage_loop = True
# For GemsFarming, auto choose events or main chapters
if self.config.task.command == 'GemsFarming':
if self.stage_is_main(name):
logger.info(f'Stage name {name} is from campaign_main')
folder = 'campaign_main'
else:
folder = self.config.cross_get('Event.Campaign.Event')
if folder is not None:
logger.info(f'Stage name {name} is from event {folder}')
else:
logger.warning(f'Cannot get the latest event, fallback to campaign_main')
folder = 'campaign_main'
return name, folder