sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-01 12:44:54 +08:00
Code Activity

Fix: Switch campaign mode in other functions except main chapter

Browse Source
This commit is contained in:
LmeSzinc
2020-09-04 01:42:06 +08:00
parent c584f1417d
commit 3d50a3a418
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/campaign/run.py
View File

@@ -153,7 +153,10 @@ class CampaignRun(CampaignUI, Reward):
if self.campaign.is_in_map(): if self.campaign.is_in_map():
logger.info('Already in map, skip ensure_campaign_ui.') logger.info('Already in map, skip ensure_campaign_ui.')
else: else:
self.handle_campaign_ui() self.ensure_campaign_ui(
name=self.stage,
mode=self.config.CAMPAIGN_MODE if self.config.COMMAND.lower() == 'main' else 'normal'
)
if self.commission_notice_show_at_campaign(): if self.commission_notice_show_at_campaign():
if self.reward(): if self.reward():
self.campaign.fleet_checked_reset() self.campaign.fleet_checked_reset()
@@ -179,11 +182,11 @@ class CampaignRun(CampaignUI, Reward):
self.config.config.set('Setting', 'if_count_greater_than', str(count)) self.config.config.set('Setting', 'if_count_greater_than', str(count))
self.config.save() self.config.save()
def handle_campaign_ui(self): def ensure_campaign_ui(self, name, mode='normal'):
for n in range(20): for n in range(20):
try: try:
self.ensure_campaign_ui(name=self.stage, mode=self.config.CAMPAIGN_MODE) super().ensure_campaign_ui(name, mode)
self.campaign.ENTRANCE = self.campaign_get_entrance(name=self.stage) self.campaign.ENTRANCE = self.campaign_get_entrance(name=name)
return True return True
except CampaignNameError: except CampaignNameError:
continue continue