|
@@ -111,16 +111,16 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
|
|
|
time_delta = timedelta(hours=-before_end.hour, minutes=-before_end.minute, seconds=-before_end.second)
|
|
time_delta = timedelta(hours=-before_end.hour, minutes=-before_end.minute, seconds=-before_end.second)
|
|
|
now_datetime = datetime.now()
|
|
now_datetime = datetime.now()
|
|
|
now_time = now_datetime.time()
|
|
now_time = now_datetime.time()
|
|
|
- if time(hour=6) <= now_time < time(hour=18):
|
|
|
|
|
- # 如果是在6点到18点之间,那就设定下一次运行的时间为第二天的6点 + before_end
|
|
|
|
|
- next_run_datetime = datetime.combine(now_datetime.date() + timedelta(days=1), time(hour=6))
|
|
|
|
|
|
|
+ if time(hour=5) <= now_time < time(hour=18):
|
|
|
|
|
+ # 如果是在5点到18点之间,那就设定下一次运行的时间为第二天的5点 + before_end
|
|
|
|
|
+ next_run_datetime = datetime.combine(now_datetime.date() + timedelta(days=1), time(hour=5))
|
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
|
elif time(hour=18) <= now_time < time(hour=23, minute=59, second=59):
|
|
elif time(hour=18) <= now_time < time(hour=23, minute=59, second=59):
|
|
|
# 如果是在18点到23点59分59秒之间,那就设定下一次运行的时间为第二天的18点 + before_end
|
|
# 如果是在18点到23点59分59秒之间,那就设定下一次运行的时间为第二天的18点 + before_end
|
|
|
next_run_datetime = datetime.combine(now_datetime.date() + timedelta(days=1), time(hour=18))
|
|
next_run_datetime = datetime.combine(now_datetime.date() + timedelta(days=1), time(hour=18))
|
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
|
else:
|
|
else:
|
|
|
- # 如果是在0点到6点之间,那就设定下一次运行的时间为今天的18点 + before_end
|
|
|
|
|
|
|
+ # 如果是在0点到5点之间,那就设定下一次运行的时间为今天的18点 + before_end
|
|
|
next_run_datetime = datetime.combine(now_datetime.date(), time(hour=18))
|
|
next_run_datetime = datetime.combine(now_datetime.date(), time(hour=18))
|
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
next_run_datetime = next_run_datetime + time_delta
|
|
|
self.set_next_run(task='WantedQuests', target=next_run_datetime)
|
|
self.set_next_run(task='WantedQuests', target=next_run_datetime)
|