From f47e7b046e42c84e946871378fa153103e977569 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 2 May 2022 16:36:11 +0800 Subject: [PATCH] Fix: Duplicate restart at server reset --- module/campaign/os_run.py | 2 +- module/config/config.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/campaign/os_run.py b/module/campaign/os_run.py index 4be01bdaa..7c84607fa 100644 --- a/module/campaign/os_run.py +++ b/module/campaign/os_run.py @@ -48,7 +48,7 @@ class OSCampaignRun(OSMapOperation): self.campaign.os_meowfficer_farming() except ActionPointLimit: if get_os_reset_remain() > 0: - self.campaign.config.task_delay(server_update=True) + self.config.task_delay(server_update=True) self.config.task_call('MetaReward', force_call=False) else: logger.info('Just less than 1 day to OpSi reset, delay 2.5 hours') diff --git a/module/config/config.py b/module/config/config.py index 6ce9bae30..4385650b4 100644 --- a/module/config/config.py +++ b/module/config/config.py @@ -260,10 +260,10 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig): self.modified[f'{task}.Scheduler.Enable'] = True force_enable(['Commission', 'Research', 'Reward']) - limit_next_run(['Commission', 'Reward'], limit=now + timedelta(hours=12, minutes=-1)) - limit_next_run(['Research'], limit=now + timedelta(hours=24, minutes=-1)) - limit_next_run(['OpsiExplore'], limit=now + timedelta(days=31, minutes=-1)) - limit_next_run(self.args.keys(), limit=now + timedelta(hours=24, minutes=-1)) + limit_next_run(['Commission', 'Reward'], limit=now + timedelta(hours=12, seconds=-1)) + limit_next_run(['Research'], limit=now + timedelta(hours=24, seconds=-1)) + limit_next_run(['OpsiExplore'], limit=now + timedelta(days=31, seconds=-1)) + limit_next_run(self.args.keys(), limit=now + timedelta(hours=24, seconds=-1)) def override(self, **kwargs): """