From f4f99c25db1c16bd42654102d0e0991034f9a2ff Mon Sep 17 00:00:00 2001 From: DLmaster Date: Wed, 6 Nov 2024 21:51:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E2=80=9C=E5=90=AF=E5=8A=A8MA?= =?UTF-8?q?A=E5=90=8E=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF=E6=A8=A1?= =?UTF-8?q?=E6=8B=9F=E5=99=A8=E2=80=9D=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTO_MAA.py | 14 +++++++++----- res/AUTO_MAA_info.txt | 8 ++++---- res/set.txt | 5 ++--- res/version.json | 8 ++++---- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/AUTO_MAA.py b/AUTO_MAA.py index b7a99e0..9deca74 100644 --- a/AUTO_MAA.py +++ b/AUTO_MAA.py @@ -585,9 +585,13 @@ def set_maa(self, mode, index): ] = "True" # 启动MAA后直接最小化 # 启动MAA后自动开启模拟器 if "启动模拟器" in mode: - data["Configurations"]["Default"]["Start.StartEmulator"] = "True" + data["Configurations"]["Default"][ + "Start.OpenEmulatorAfterLaunch" + ] = "True" elif "仅切换账号" in mode: - data["Configurations"]["Default"]["Start.StartEmulator"] = "False" + data["Configurations"]["Default"][ + "Start.OpenEmulatorAfterLaunch" + ] = "False" data["Configurations"]["Default"][ "Start.MinimizingStartup" ] = "False" # 最小化启动模拟器 @@ -651,7 +655,7 @@ def set_maa(self, mode, index): "Start.RunDirectly" ] = "False" # 启动MAA后直接运行 data["Configurations"]["Default"][ - "Start.StartEmulator" + "Start.OpenEmulatorAfterLaunch" ] = "False" # 启动MAA后自动开启模拟器 if "全局" in mode: data["Global"][ @@ -699,7 +703,7 @@ def set_maa(self, mode, index): "Start.RunDirectly" ] = "True" # 启动MAA后直接运行 data["Configurations"]["Default"][ - "Start.StartEmulator" + "Start.OpenEmulatorAfterLaunch" ] = "True" # 启动MAA后自动开启模拟器 if self.data[index][15] == "simple": data["Global"][ @@ -791,7 +795,7 @@ def set_maa(self, mode, index): "Start.RunDirectly" ] = "True" # 启动MAA后直接运行 data["Configurations"]["Default"][ - "Start.StartEmulator" + "Start.OpenEmulatorAfterLaunch" ] = "True" # 启动MAA后自动开启模拟器 if self.data[index][15] == "simple": data["Global"][ diff --git a/res/AUTO_MAA_info.txt b/res/AUTO_MAA_info.txt index 22ef9a5..d3811af 100644 --- a/res/AUTO_MAA_info.txt +++ b/res/AUTO_MAA_info.txt @@ -4,7 +4,7 @@ VSVersionInfo( ffi=FixedFileInfo( # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # Set not needed items to zero 0. - filevers=(4, 1, 0, 0), + filevers=(4, 1, 1, 0), prodvers=(0, 0, 0, 0), # Contains a bitmask that specifies the valid bits 'flags'r mask=0x3f, @@ -31,13 +31,13 @@ VSVersionInfo( [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'), StringStruct('CompanyName', 'AUTO_MAA Team'), StringStruct('FileDescription', 'AUTO_MAA Component'), - StringStruct('FileVersion', '4.1.0.0'), + StringStruct('FileVersion', '4.1.1.0'), StringStruct('InternalName', 'AUTO_MAA'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('OriginalFilename', 'AUTO_MAA.py'), StringStruct('ProductName', 'AUTO_MAA'), - StringStruct('ProductVersion', 'v4.1.0.0'), - StringStruct('Assembly Version', 'v4.1.0.0')]) + StringStruct('ProductVersion', 'v4.1.1.0'), + StringStruct('Assembly Version', 'v4.1.1.0')]) ]) ] ) \ No newline at end of file diff --git a/res/set.txt b/res/set.txt index 6ea7ebf..9b85c70 100644 --- a/res/set.txt +++ b/res/set.txt @@ -1,6 +1,5 @@ #主界面 -"MainFunction.ActionAfterCompleted": "ExitEmulatorAndSelf" #完成后（旧） -"MainFunction.PostActions": "12" #完成后（新） +"MainFunction.PostActions": "12" #完成后 "TaskQueue.WakeUp.IsChecked": "True" #开始唤醒 "TaskQueue.Recruiting.IsChecked": "True" #自动公招 "TaskQueue.Base.IsChecked": "True" #基建换班 @@ -37,5 +36,5 @@ "VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 "Start.RunDirectly": "True" #启动MAA后直接运行 "Start.MinimizeDirectly": "True" #启动MAA后直接最小化 -"Start.StartEmulator": "True" #启动MAA后自动开启模拟器 +"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 "Start.MinimizingStartup": "True" #最小化启动模拟器 \ No newline at end of file diff --git a/res/version.json b/res/version.json index c8df7b2..224eda1 100644 --- a/res/version.json +++ b/res/version.json @@ -1,7 +1,7 @@ { - "main_version": "4.1.0.0", - "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.0/AUTO_MAA_v4.1.0.zip", + "main_version": "4.1.1.0", + "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1/AUTO_MAA_v4.1.1.zip", "updater_version": "1.0.0.0", - "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.0/Updater_v1.0.0.zip", - "announcement": "\n## 新增功能\n- 版本更新功能上线，程序可进行版本更新" + "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1/Updater_v1.0.0.zip", + "announcement": "\n## 修复BUG\n- 适配MAA的`启动MAA后自动开启模拟器`字段更改" } \ No newline at end of file