Просмотр исходного кода

Merge remote-tracking branch 'origin/dev' into dev

yuyuyuyuyu 8 месяцев назад
Родитель
Сommit
e2bce6c9d4
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      tasks/GuildActivityMonitor/script_task.py

+ 2 - 2
tasks/GuildActivityMonitor/script_task.py

@@ -16,6 +16,7 @@ class ScriptTask(GameUi):
         :return:
         :return:
         """
         """
         # 构建关键字映射
         # 构建关键字映射
+        self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
         guild_config = self.config.guild_activity_monitor.guild_activity
         guild_config = self.config.guild_activity_monitor.guild_activity
@@ -48,7 +49,6 @@ class ScriptTask(GameUi):
         while True:
         while True:
             if check_timer.reached():
             if check_timer.reached():
                 logger.info("监控时间到,任务结束")
                 logger.info("监控时间到,任务结束")
-                self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
                 raise TaskEnd('GuildActivityMonitor')
                 raise TaskEnd('GuildActivityMonitor')
 
 
             if log_timer.reached():
             if log_timer.reached():
@@ -131,4 +131,4 @@ if __name__ == '__main__':
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
-    t.run()
+    t.run()