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

Merge pull request #876 from yEs1do/feat(Memory_Scrolls)

绘卷结束后自动关闭探索任务
huangrunheng 1 год назад
Родитель
Сommit
5cec0bda3d
2 измененных файлов с 8 добавлено и 6 удалено
  1. 1 1
      tasks/MemoryScrolls/config.py
  2. 7 5
      tasks/MemoryScrolls/script_task.py

+ 1 - 1
tasks/MemoryScrolls/config.py

@@ -19,7 +19,7 @@ class ScrollNumber(str, Enum):
 
 
 class MemoryScrollsConfig(ConfigBase):
 class MemoryScrollsConfig(ConfigBase):
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
     scroll_number: ScrollNumber = Field(default=ScrollNumber.ONE, description='scroll_number_help')
-    auto_delay_exploration: bool = Field(default=True, description='指定绘卷结束后,自动延迟探索任务,避免长时间无意义执行')
+    auto_close_exploration: bool = Field(default=False, description='指定绘卷结束后,自动关闭探索任务,避免长时间无意义执行')
 
 
 class MemoryScrolls(ConfigBase):
 class MemoryScrolls(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 7 - 5
tasks/MemoryScrolls/script_task.py

@@ -82,11 +82,13 @@ class ScriptTask(GameUi, MemoryScrollsAssets):
         else:
         else:
             logger.info(f'Scroll {con.scroll_number.name} is already completed')
             logger.info(f'Scroll {con.scroll_number.name} is already completed')
             self.set_next_run(task='MemoryScrolls', success=False)
             self.set_next_run(task='MemoryScrolls', success=False)
-            if con.auto_delay_exploration:
-                # 自动延迟探索任务
-                logger.info('Auto delay exploration task after Memory Scrolls completion')
-                next_run=datetime.now() + timedelta(days=1)
-                self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
+            if con.auto_close_exploration:
+                # 自动关闭探索任务
+                logger.info('Auto close exploration task after Memory Scrolls completion')
+                self.config.exploration.scheduler.enable = False
+                self.config.save()
+                # next_run=datetime.now() + timedelta(days=1)
+                # self.set_next_run(task='Exploration', success=False, finish=False, target=next_run)
         # 返回绘卷主界面
         # 返回绘卷主界面
         self.ui_click_until_disappear(self.I_MS_CLOSE, interval=1)
         self.ui_click_until_disappear(self.I_MS_CLOSE, interval=1)
         logger.info('Closed Memory Scrolls contribution page')
         logger.info('Closed Memory Scrolls contribution page')