From 576fe59bbc798f013e54d61c6871b6f7534b5a67 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Thu, 6 Mar 2025 23:37:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(models):=20=E4=BF=AE=E5=A4=8D=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=A2=AB=E6=89=8B=E5=8A=A8=E4=B8=AD=E6=AD=A2=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=97=A0=E6=B3=95=E8=A2=AB=E6=AD=A3=E5=B8=B8=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 2f2f62a..28938d7 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -556,7 +556,7 @@ class MaaManager(QObject): if len(self.log_monitor.files()) != 0: self.interrupt.emit() - self.maa_result = "您中止了本次任务" + self.maa_result = "任务被手动中止" self.isInterruptionRequested = True def push_question(self, title: str, message: str) -> bool: @@ -636,6 +636,8 @@ class MaaManager(QObject): minutes=self.set["RunSet"][time_book[mode]] ): self.maa_result = "检测到MAA进程超时" + elif self.isInterruptionRequested: + self.maa_result = "任务被手动中止" else: self.maa_result = "Wait" @@ -649,6 +651,8 @@ class MaaManager(QObject): or ("MaaAssistantArknights GUI exited" in log) ): self.maa_result = "检测到MAA进程异常" + elif self.isInterruptionRequested: + self.maa_result = "任务被手动中止" else: self.maa_result = "Wait"