Merge pull request #2060 from SaiCateDoan/maa

Fix: Unable to stop MAA when error occurred

submodule/AlasMaaBridge/maa.py

@@ -85,7 +85,7 @@ class ArknightsAutoScript(AzurLaneAutoScript):
             if self.config.MaaEmulator_TouchMethod == 'maatouch':
                 asst.set_instance_option(AssistantHandler.InstanceOptionType.deployment_with_pause, '1')
             else:
-                logger.critical('使用了不支持自动下干员的触控方案')
+                logger.critical('使用了不支持暂停下干员的触控方案')
                 raise RequestHumanTakeover
 
         return asst

submodule/AlasMaaBridge/module/handler/handler.py

@@ -61,8 +61,13 @@ class AssistantHandler:
         return [f.strip(' \t\r\n') for f in string.split(sep)]
 
     def maa_stop(self):
+        self.callback_list.append(self.task_end_callback)
         self.asst.stop()
         while 1:
+            if self.callback_timer.reached():
+                logger.critical('MAA no respond, probably stuck')
+                raise RequestHumanTakeover
+
             if self.signal in [
                 self.Message.AllTasksCompleted,
                 self.Message.TaskChainCompleted,
@@ -111,6 +116,7 @@ class AssistantHandler:
             self.Message.TaskChainStopped
         ]:
             self.signal = m
+            self.callback_list.remove(self.task_end_callback)
 
     def penguin_id_callback(self, m, d):
         if not self.config.MaaRecord_PenguinID \