From 3f20ae62bee844570804009cfbf1900c9fd2b5fb Mon Sep 17 00:00:00 2001 From: DLmaster Date: Sat, 15 Mar 2025 13:21:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(models):=20=E4=BF=AE=E5=A4=8D`=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=88=B0MAA=E6=9C=AA=E8=83=BD=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1`=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E8=A2=AB=E5=BC=82=E5=B8=B8=E5=B1=8F=E8=94=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 2 +- resources/version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 1c504aa..18f3e1a 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -651,7 +651,7 @@ class MaaManager(QObject): if mode == "自动代理_日常" and "任务出错: Fight" in log: self.maa_result = "检测到MAA未能实际执行任务" - if "任务出错: StartUp" in log: + elif "任务出错: StartUp" in log: self.maa_result = "检测到MAA未能正确登录PRTS" elif "任务已全部完成！" in log: self.maa_result = "Success!" diff --git a/resources/version.json b/resources/version.json index add8a64..774295c 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.5.4", "updater_version": "1.2.0.0", - "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作", + "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n- 修复`检测到MAA未能实际执行任务`报错被异常屏蔽\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作", "proxy_list": [ "", "https://gitproxy.click/",