automas_admin/AUTO-MAS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(maa): 适配 MAA 无Default配置情况

Browse Source
This commit is contained in:
DLmaster361
2025-06-16 14:26:29 +08:00
parent 4841dc09b3
commit 3fd4778a48
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/MAA.py
View File

@@ -1281,10 +1281,15 @@ class MaaManager(QObject):
else: else:
self.agree_bilibili(False) self.agree_bilibili(False)
# 切换配置
if data["Current"] != "Default":
data["Configurations"]["Default"] = data["Configurations"][data["Current"]]
data["Current"] = "Default"
# 自动代理配置 # 自动代理配置
if "自动代理" in mode: if "自动代理" in mode:
data["Current"] = "Default" # 切换配置
for i in range(1, 9): for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
@@ -1590,7 +1595,6 @@ class MaaManager(QObject):
# 人工排查配置 # 人工排查配置
elif "人工排查" in mode: elif "人工排查" in mode:
data["Current"] = "Default" # 切换配置
for i in range(1, 9): for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][
@@ -1663,7 +1667,6 @@ class MaaManager(QObject):
# 设置MAA配置 # 设置MAA配置
elif "设置MAA" in mode: elif "设置MAA" in mode:
data["Current"] = "Default" # 切换配置
for i in range(1, 9): for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][
@@ -1719,7 +1722,6 @@ class MaaManager(QObject):
elif mode == "更新MAA": elif mode == "更新MAA":
data["Current"] = "Default" # 切换配置
for i in range(1, 9): for i in range(1, 9):
data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置
data["Configurations"]["Default"][ data["Configurations"]["Default"][

4
resources/version.json
View File

@@ -2,6 +2,10 @@
"main_version": "4.3.10.0", "main_version": "4.3.10.0",
"version_info": { "version_info": {
"4.3.10.0": { "4.3.10.0": {
"新增功能": [
"更换全新默认主页图",
"适配 MAA 无`Default`配置情况 #52"
],
"程序优化": [ "程序优化": [
"静默模式控制时段延长至模拟器完成启动的10s后" "静默模式控制时段延长至模拟器完成启动的10s后"
] ]