From 2768faed53a121057c03eb6ba26470cff4686f51 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Tue, 18 Feb 2025 16:17:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BF=AE=E6=AD=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=99=A8=E6=96=B9=E6=B3=95=EF=BC=9B=E5=8F=96=E6=B6=88?= =?UTF-8?q?MAA=E8=BF=90=E8=A1=8C=E4=B8=AD=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=9B=E8=A1=A5=E5=85=85MAA=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 8 +++++--- app/ui/member_manager.py | 2 +- resources/version.json | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 0b65cae..0dc7b88 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -580,6 +580,7 @@ class MaaManager(QObject): self.maa_result = "Success!" elif ( ("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log) + or ("未检测到任何模拟器" in log) or ("已停止" in log) or ("MaaAssistantArknights GUI exited" in log) ): @@ -596,6 +597,7 @@ class MaaManager(QObject): self.maa_result = "Success!" elif ( ("请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log) + or ("未检测到任何模拟器" in log) or ("已停止" in log) or ("MaaAssistantArknights GUI exited" in log) ): @@ -734,13 +736,13 @@ class MaaManager(QObject): data["Global"][ "VersionUpdate.ScheduledUpdateCheck" - ] = "True" # 定时检查更新 + ] = "False" # 定时检查更新 data["Global"][ "VersionUpdate.AutoDownloadUpdatePackage" - ] = "True" # 自动下载更新包 + ] = "False" # 自动下载更新包 data["Global"][ "VersionUpdate.AutoInstallUpdatePackage" - ] = "True" # 自动安装更新包 + ] = "False" # 自动安装更新包 data["Configurations"]["Default"]["Start.ClientType"] = self.data[ index ][ diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index 057f52c..a3eab6c 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -330,7 +330,7 @@ class MemberManager(QWidget): for _ in range(3): try: response = requests.get( - "https://mirrorc.top/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=beta" + "https://mirrorc.top/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=stable" ) maa_info = response.json() break diff --git a/resources/version.json b/resources/version.json index 9cede48..459304c 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { - "main_version": "4.2.4.0", + "main_version": "4.2.4.1", "updater_version": "1.1.2.0", - "announcement": "\n## 新增功能\n- 添加`简洁用户列表下相邻两个任务间的切换方式`可选项\n- 恢复启动后直接运行主任务功能以及相关托盘菜单\n## 修复BUG\n- 修复静默代理标记移除异常情况\n- 适配深色模式 #18\n## 程序优化\n- 优化MAA关闭方法\n- 添加高级代理文件校验过程\n- 升级日志监看方法\n- 优化主调度台默认选项\n- 配置MAA前关闭可能未正常退出的MAA进程\n- 接入镜像源", + "announcement": "\n## 新增功能\n- 暂无\n## 修复BUG\n- 更新器修正`channel`\n## 程序优化\n- 添加MAA监测字段：`未检测到任何模拟器`\n- 取消MAA运行中自动更新", "proxy_list": [ "", "https://gitproxy.click/",