From 3fd4778a4871579dbc713009910d0a3897467be6 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Mon, 16 Jun 2025 14:26:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(maa):=20=E9=80=82=E9=85=8D=20MAA=20?= =?UTF-8?q?=E6=97=A0`Default`=E9=85=8D=E7=BD=AE=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 10 ++++++---- resources/version.json | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 6f9a736..ded0b51 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -1281,10 +1281,15 @@ class MaaManager(QObject): else: self.agree_bilibili(False) + # 切换配置 + if data["Current"] != "Default": + + data["Configurations"]["Default"] = data["Configurations"][data["Current"]] + data["Current"] = "Default" + # 自动代理配置 if "自动代理" in mode: - data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 @@ -1590,7 +1595,6 @@ class MaaManager(QObject): # 人工排查配置 elif "人工排查" in mode: - data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Configurations"]["Default"][ @@ -1663,7 +1667,6 @@ class MaaManager(QObject): # 设置MAA配置 elif "设置MAA" in mode: - data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Configurations"]["Default"][ @@ -1719,7 +1722,6 @@ class MaaManager(QObject): elif mode == "更新MAA": - data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Configurations"]["Default"][ diff --git a/resources/version.json b/resources/version.json index 6554661..d4e489d 100644 --- a/resources/version.json +++ b/resources/version.json @@ -2,6 +2,10 @@ "main_version": "4.3.10.0", "version_info": { "4.3.10.0": { + "新增功能": [ + "更换全新默认主页图", + "适配 MAA 无`Default`配置情况 #52" + ], "程序优化": [ "静默模式控制时段延长至模拟器完成启动的10s后" ]