bug fix

Author: BnanZ0

.github/workflows/build.yml

@@ -74,9 +74,9 @@ jobs:
       - name: Build with PyAppify Action
         id: build-app
         uses: ok-oldking/pyappify-action@master #使用pyappify打包exe
-        # with:
-        #   # 使用上一个稳定版本的 Release 来获取已打包的启动器，从而跳过耗时的打包过程
-        #   use_release: https://api.github.com/repos/BnanZ0/ok-duet-night-abyss/releases/tags/v1.0.12
+        with:
+          # 使用上一个稳定版本的 Release 来获取已打包的启动器，从而跳过耗时的打包过程
+          use_release: https://api.github.com/repos/BnanZ0/ok-duet-night-abyss/releases/tags/v1.0.18
 
       - name: Release
         uses: softprops/action-gh-release@v2

src/tasks/AutoDefence.py

@@ -91,11 +91,13 @@ def do_run(self):
             if _status == Mission.START:
                 self.wait_until(self.in_team, time_out=30)
                 self.sleep(2)
-                if self.external_movement() == False:
+                if self.external_movement is not _default_movement:
+                    self.log_info("任务开始")
+                    if not self.external_movement():
+                        self.open_in_mission_menu()
+                else:
                     self.log_info_notify("任务开始")
                     self.soundBeep()
-                else:
-                    self.log_info("任务开始")
                 self.init_param()
             elif _status == Mission.STOP:
                 self.quit_mission()

src/tasks/AutoExploration.py

@@ -87,11 +87,13 @@ def do_run(self):
             if _status == Mission.START:
                 self.wait_until(self.in_team, time_out=30)
                 self.sleep(2)
-                if self.external_movement() == False:
+                if self.external_movement is not _default_movement:
+                    self.log_info("任务开始")
+                    if not self.external_movement():
+                        self.open_in_mission_menu()
+                else:
                     self.log_info_notify("任务开始")
                     self.soundBeep()
-                else:
-                    self.log_info("任务开始")
                 _start_time = 0
             elif _status == Mission.STOP:
                 self.quit_mission()

src/tasks/BaseDNATask.py

@@ -104,7 +104,10 @@ def move_back_from_safe_position(self):
 
     def check_for_monthly_card(self):
         if self.should_check_monthly_card():
-            self.handle_monthly_card()
+            start = time.time()
+            ret = self.handle_monthly_card()
+            cost = time.time() - start
+            return ret, cost
             # start = time.time()
             # logger.info(f'check_for_monthly_card start check')
             # if self.in_combat():
@@ -116,7 +119,7 @@ def check_for_monthly_card(self):
             #     logger.info(f'wait monthly card end {monthly_card}')
             #     cost = time.time() - start
             #     return cost
-        return 0
+        return False, 0
 
     def should_check_monthly_card(self):
         if self.next_monthly_card_start > 0:

src/tasks/ImportTask.py

@@ -22,6 +22,9 @@
 
 logger = Logger.get_logger(__name__)
 
+class MacroFailedException(Exception):
+    """外部脚本失败异常。"""
+    pass
 
 class ImportTask(DNAOneTimeTask, CommissionsTask, BaseCombatTask):
 
@@ -74,6 +77,7 @@ def run(self):
         self.img = self.load_png_files(f'{path}\mod\{self.config.get('外部文件夹')}\map')
         DNAOneTimeTask.run(self)
         self.move_mouse_to_safe_position()
+        self.set_check_monthly_card()
         _to_do_task = self
         try:
             if self.config.get('副本类型') == '扼守无尽':
@@ -131,7 +135,8 @@ def do_run(self):
                     self.log_info('任务完成')
                 self.wait_until(self.in_team, time_out=30)                  
                 self.sleep(2)
-                self.walk_to_aim()
+                if not self.walk_to_aim():
+                    self.open_in_mission_menu()
                 _wave_start = time.time()
                 _delay_task_start = _wave_start + 1
                 self.current_wave = -1 
@@ -198,7 +203,13 @@ def walk_to_aim(self, former_index = None):
                     return True
             if map_index is not None:            
                 self.log_info(f'执行{map_index}')
-                self.play_macro_actions(map_index)
+                try:
+                    self.play_macro_actions(map_index)
+                except MacroFailedException:
+                    return False
+                except Exception as e:
+                    logger.error("ImportTask error", e)
+                    raise
                 former_index = map_index
             else:
                 return True
@@ -249,6 +260,8 @@ def play_macro_actions(self, map_index):
         start = time.time()
         for i, action in enumerate(actions): 
             while time.time()-start < action['time']:
+                if self.check_for_monthly_card()[0]:
+                    raise MacroFailedException
                 self.next_frame()   
             if action['type'] == "delay":
                 self.delay_index = map_index