Преглед на файлове

fix(WantedQuests): It will skip this task if you have finished it

ryland преди 2 години
родител
ревизия
37fe43214f
променени са 4 файла, в които са добавени 18 реда и са изтрити 4 реда
  1. 2 1
      module/config/config.py
  2. 1 1
      module/ocr/sub_ocr.py
  3. 0 1
      script.py
  4. 15 1
      tasks/WantedQuests/script_task.py

+ 2 - 1
module/config/config.py

@@ -286,6 +286,7 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         :param finish: 是完成任务后的时间为基准还是开始任务的时间为基准
         :return:
         """
+        self.reload()
         # 任务预处理
         if not task:
             task = self.task.command
@@ -352,7 +353,7 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
         self.lock_config.acquire()
         try:
             scheduler.next_run = next_run
-            self.reload()
+
             self.save()
         finally:
             self.lock_config.release()

+ 1 - 1
module/ocr/sub_ocr.py

@@ -158,7 +158,7 @@ class Duration(Single):
     def after_process(self, result):
         result = super().after_process(result)
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
-        result = result.replace('B', '8')
+        result = result.replace('B', '8').replace(':', ':')
         return result
 
     @staticmethod

+ 0 - 1
script.py

@@ -459,7 +459,6 @@ class Script:
                 logger.critical('Request human takeover')
                 exit(1)
 
-            self.config.save()
             if success:
                 del_cached_property(self, 'config')
                 continue

+ 15 - 1
tasks/WantedQuests/script_task.py

@@ -24,7 +24,13 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
 
     def run(self):
         con = self.config
-        self.pre_work()
+        if not self.pre_work():
+            # 无法完成预处理 很有可能你已经完成了悬赏任务
+            logger.warning('Cannot pre-work')
+            logger.warning('You may have completed the reward task')
+            self.next_run()
+            raise TaskEnd('WantedQuests')
+
         self.screenshot()
         number_challenge = self.O_WQ_NUMBER.ocr(self.device.image)
         ocr_error_count = 0
@@ -100,6 +106,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
         """
         self.ui_get_current_page()
         self.ui_goto(page_main)
+        done_timer = Timer(5)
         while 1:
             self.screenshot()
             if self.appear(self.I_TARCE_DISENABLE):
@@ -110,11 +117,18 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
                 continue
             if self.appear_then_click(self.I_TRACE_ENABLE, interval=1):
                 continue
+            if self.appear(self.I_UI_BACK_RED):
+                if not done_timer.started():
+                    done_timer.start()
+            if done_timer.started() and done_timer.reached():
+                self.ui_click_until_disappear(self.I_UI_BACK_RED)
+                return False
         # 已追踪所有任务
         logger.info('All wanted quests are traced')
         self.invite_five()
         self.ui_click_until_disappear(self.I_UI_BACK_RED)
         self.ui_goto(page_exploration)
+        return True
 
     def execute_mission(self, ocr, num_want: int, num_challenge: int):
         """