From b40fa35622a0a9670d3e53a35da1f3e488ace356 Mon Sep 17 00:00:00 2001 From: heziziziscool Date: Wed, 22 Jan 2025 17:22:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=B9=E4=BA=8EMAAv5.12.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=90=8E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5`Start.Ru?= =?UTF-8?q?nDirectly`=E4=B8=8E`Start.OpenEmulatorAfterLaunch`=E7=9A=84?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index e268645..6894414 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -33,7 +33,6 @@ import subprocess import shutil import time from pathlib import Path - from app import AppConfig @@ -658,13 +657,23 @@ class MaaManager(QtCore.QThread): data["Current"] = "Default" # 切换配置 for i in range(1, 9): data["Global"][f"Timer.Timer{i}"] = "False" # 时间设置 + # 完成后退出MAA和模拟器 data["Configurations"]["Default"][ "MainFunction.PostActions" - ] = "12" # 完成后退出MAA和模拟器 - data["Global"]["Start.RunDirectly"] = "True" # 启动MAA后直接运行 + ] = "12" + # v5.1.11版本对于以下字段处理 + # 启动MAA后直接运行 + data["Global"]["Start.RunDirectly"] = "True" + # 启动MAA后自动开启模拟器 data["Global"][ "Start.OpenEmulatorAfterLaunch" - ] = "True" # 启动MAA后自动开启模拟器 + ] = "True" + # v5.1.12版本对以下字段处理 + # 启动MAA后直接运行 + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True" + # 启动MAA后自动开启模拟器 + data["Configurations"]["Default"]["Start.RunDirectly"] = "True" + if self.if_silence: data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 From 449d8a032edc76cfcce34254d3cc7bc94840f37a Mon Sep 17 00:00:00 2001 From: heziziziscool Date: Wed, 22 Jan 2025 17:24:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=B9=E4=BA=8EMAAv5.12.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=90=8E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5`Start.Ru?= =?UTF-8?q?nDirectly`=E4=B8=8E`Start.OpenEmulatorAfterLaunch`=E7=9A=84?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/MAA.py b/app/models/MAA.py index 6894414..4cdd00a 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -675,6 +675,7 @@ class MaaManager(QtCore.QThread): data["Configurations"]["Default"]["Start.RunDirectly"] = "True" + if self.if_silence: data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 From f3e1b4580a673650fd3f04d7845224d853b26e36 Mon Sep 17 00:00:00 2001 From: heziziziscool Date: Wed, 22 Jan 2025 17:24:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AF=B9=E4=BA=8EMAAv5.12.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=90=8E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5`Start.Ru?= =?UTF-8?q?nDirectly`=E4=B8=8E`Start.OpenEmulatorAfterLaunch`=E7=9A=84?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index 4cdd00a..6894414 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -675,7 +675,6 @@ class MaaManager(QtCore.QThread): data["Configurations"]["Default"]["Start.RunDirectly"] = "True" - if self.if_silence: data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 From 3bd6611cd572995f2fc829bf5c09c47db45dbd54 Mon Sep 17 00:00:00 2001 From: heziziziscool Date: Wed, 22 Jan 2025 18:28:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AF=B9=E4=BA=8EMAAv5.12.1=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=90=8E=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5`Start.Ru?= =?UTF-8?q?nDirectly`=E4=B8=8E`Start.OpenEmulatorAfterLaunch`=E7=9A=84?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/MAA.py | 31 ++++++++++++++++++++++++++++-- resources/docs/MAA_config_info.txt | 4 ++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/app/models/MAA.py b/app/models/MAA.py index e268645..791e866 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -661,10 +661,20 @@ class MaaManager(QtCore.QThread): data["Configurations"]["Default"][ "MainFunction.PostActions" ] = "12" # 完成后退出MAA和模拟器 - data["Global"]["Start.RunDirectly"] = "True" # 启动MAA后直接运行 + + # v5.1.11版本对于以下字段处理 + # 启动MAA后直接运行 + data["Global"]["Start.RunDirectly"] = "True" + # 启动MAA后自动开启模拟器 data["Global"][ "Start.OpenEmulatorAfterLaunch" - ] = "True" # 启动MAA后自动开启模拟器 + ] = "True" + + # v5.1.12版本对以下字段处理 + # 启动MAA后直接运行 + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True" + # 启动MAA后自动开启模拟器 + data["Configurations"]["Default"]["Start.RunDirectly"] = "True" if self.if_silence: data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 @@ -868,8 +878,17 @@ class MaaManager(QtCore.QThread): data["Configurations"]["Default"][ "MainFunction.PostActions" ] = "8" # 完成后退出MAA + + # v5.1.11版本对于以下字段处理 data["Global"]["Start.RunDirectly"] = "True" # 启动MAA后直接运行 data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化 + # v5.1.12版本对以下字段处理 + # 启动MAA后直接运行 + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "True" + # 启动MAA后自动开启模拟器 + data["Configurations"]["Default"]["Start.RunDirectly"] = "True" + + data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标 data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘 # 启动MAA后自动开启模拟器 @@ -938,11 +957,19 @@ class MaaManager(QtCore.QThread): data["Configurations"]["Default"][ "MainFunction.PostActions" ] = "0" # 完成后无动作 + + # v5.11.1及以下版本的字段处理 data["Global"]["Start.RunDirectly"] = "False" # 启动MAA后直接运行 data["Global"][ "Start.OpenEmulatorAfterLaunch" ] = "False" # 启动MAA后自动开启模拟器 + # v5.1.12版本对以下字段处理 + # 启动MAA后直接运行 + data["Configurations"]["Default"]["Start.OpenEmulatorAfterLaunch"] = "False" + # 启动MAA后自动开启模拟器 + data["Configurations"]["Default"]["Start.RunDirectly"] = "False" + if self.if_silence: data["Global"][ "Start.MinimizeDirectly" diff --git a/resources/docs/MAA_config_info.txt b/resources/docs/MAA_config_info.txt index 316a146..b0a40fb 100644 --- a/resources/docs/MAA_config_info.txt +++ b/resources/docs/MAA_config_info.txt @@ -8,6 +8,8 @@ "TaskQueue.Mall.IsChecked": "True" #获取信用及购物 "TaskQueue.AutoRoguelike.IsChecked": "False" #自动肉鸽 "TaskQueue.Reclamation.IsChecked": "False" #生息演算 +"Start.RunDirectly": "True" #启动MAA后直接运行 +"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 #刷理智 "MainFunction.Stage1": "" #主关卡 "MainFunction.Stage2": "" #备选关卡1 @@ -37,9 +39,7 @@ G"Timer.Timer1": "False" #时间设置1 G"VersionUpdate.ScheduledUpdateCheck": "True" #定时检查更新 G"VersionUpdate.AutoDownloadUpdatePackage": "True" #自动下载更新包 G"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 -G"Start.RunDirectly": "True" #启动MAA后直接运行 G"Start.MinimizeDirectly": "True" #启动MAA后直接最小化 -G"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 G"GUI.UseTray": "True" #显示托盘图标 G"GUI.MinimizeToTray": "False" #最小化时隐藏至托盘 "Start.EmulatorPath" #模拟器路径 \ No newline at end of file