1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 08:07:23 +08:00

Fix: merge LmeSzinc/dev into branch, resolve conflicts

This commit is contained in:
nEEtdo0d
2022-12-01 10:52:40 -05:00
29 changed files with 992 additions and 94 deletions

View File

@@ -287,13 +287,9 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
"Reward",
]
)
limit_next_run(
["Commission", "Reward"], limit=now + timedelta(hours=12, seconds=-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", "OpsiVoucher"], limit=now + timedelta(days=31, seconds=-1)
)
limit_next_run(["OpsiExplore", "OpsiCrossMonth", "OpsiVoucher"], limit=now + timedelta(days=31, seconds=-1))
limit_next_run(self.args.keys(), limit=now + timedelta(hours=24, seconds=-1))
def override(self, **kwargs):