sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code

Merge pull request #2060 from SaiCateDoan/maa

Browse Source 
Fix: Unable to stop MAA when error occurred
This commit is contained in:
LmeSzinc 2023-01-01 14:16:55 +08:00 committed by GitHub
commit 076b30137d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodule/AlasMaaBridge/maa.py
View File

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

6
submodule/AlasMaaBridge/module/handler/handler.py
View File

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