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

适配“启动MAA后自动开启模拟器”字段更改

Browse Source
This commit is contained in:
DLmaster
2024-11-06 21:51:56 +08:00
parent 640d80e334
commit f4f99c25db
4 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
AUTO_MAA.py
View File

@@ -585,9 +585,13 @@ class MaaRunner(QtCore.QThread):
] = "True" # 启动MAA后直接最小化 ] = "True" # 启动MAA后直接最小化
# 启动MAA后自动开启模拟器 # 启动MAA后自动开启模拟器
if "启动模拟器" in mode: if "启动模拟器" in mode:
data["Configurations"]["Default"]["Start.StartEmulator"] = "True" data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch"
] = "True"
elif "仅切换账号" in mode: elif "仅切换账号" in mode:
data["Configurations"]["Default"]["Start.StartEmulator"] = "False" data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch"
] = "False"
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Start.MinimizingStartup" "Start.MinimizingStartup"
] = "False" # 最小化启动模拟器 ] = "False" # 最小化启动模拟器
@@ -651,7 +655,7 @@ class MaaRunner(QtCore.QThread):
"Start.RunDirectly" "Start.RunDirectly"
] = "False" # 启动MAA后直接运行 ] = "False" # 启动MAA后直接运行
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Start.StartEmulator" "Start.OpenEmulatorAfterLaunch"
] = "False" # 启动MAA后自动开启模拟器 ] = "False" # 启动MAA后自动开启模拟器
if "全局" in mode: if "全局" in mode:
data["Global"][ data["Global"][
@@ -699,7 +703,7 @@ class MaaRunner(QtCore.QThread):
"Start.RunDirectly" "Start.RunDirectly"
] = "True" # 启动MAA后直接运行 ] = "True" # 启动MAA后直接运行
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Start.StartEmulator" "Start.OpenEmulatorAfterLaunch"
] = "True" # 启动MAA后自动开启模拟器 ] = "True" # 启动MAA后自动开启模拟器
if self.data[index][15] == "simple": if self.data[index][15] == "simple":
data["Global"][ data["Global"][
@@ -791,7 +795,7 @@ class MaaRunner(QtCore.QThread):
"Start.RunDirectly" "Start.RunDirectly"
] = "True" # 启动MAA后直接运行 ] = "True" # 启动MAA后直接运行
data["Configurations"]["Default"][ data["Configurations"]["Default"][
"Start.StartEmulator" "Start.OpenEmulatorAfterLaunch"
] = "True" # 启动MAA后自动开启模拟器 ] = "True" # 启动MAA后自动开启模拟器
if self.data[index][15] == "simple": if self.data[index][15] == "simple":
data["Global"][ data["Global"][

8
res/AUTO_MAA_info.txt
View File

@@ -4,7 +4,7 @@ VSVersionInfo(
ffi=FixedFileInfo( ffi=FixedFileInfo(
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4) # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
# Set not needed items to zero 0. # Set not needed items to zero 0.
filevers=(4, 1, 0, 0), filevers=(4, 1, 1, 0),
prodvers=(0, 0, 0, 0), prodvers=(0, 0, 0, 0),
# Contains a bitmask that specifies the valid bits 'flags'r # Contains a bitmask that specifies the valid bits 'flags'r
mask=0x3f, mask=0x3f,
@@ -31,13 +31,13 @@ VSVersionInfo(
[StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'), [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),
StringStruct('CompanyName', 'AUTO_MAA Team'), StringStruct('CompanyName', 'AUTO_MAA Team'),
StringStruct('FileDescription', 'AUTO_MAA Component'), StringStruct('FileDescription', 'AUTO_MAA Component'),
StringStruct('FileVersion', '4.1.0.0'), StringStruct('FileVersion', '4.1.1.0'),
StringStruct('InternalName', 'AUTO_MAA'), StringStruct('InternalName', 'AUTO_MAA'),
StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'), StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),
StringStruct('OriginalFilename', 'AUTO_MAA.py'), StringStruct('OriginalFilename', 'AUTO_MAA.py'),
StringStruct('ProductName', 'AUTO_MAA'), StringStruct('ProductName', 'AUTO_MAA'),
StringStruct('ProductVersion', 'v4.1.0.0'), StringStruct('ProductVersion', 'v4.1.1.0'),
StringStruct('Assembly Version', 'v4.1.0.0')]) StringStruct('Assembly Version', 'v4.1.1.0')])
]) ])
] ]
) )

5
res/set.txt
View File

@@ -1,6 +1,5 @@
#主界面 #主界面
"MainFunction.ActionAfterCompleted": "ExitEmulatorAndSelf" #完成后（旧） "MainFunction.PostActions": "12" #完成后
"MainFunction.PostActions": "12" #完成后（新）
"TaskQueue.WakeUp.IsChecked": "True" #开始唤醒 "TaskQueue.WakeUp.IsChecked": "True" #开始唤醒
"TaskQueue.Recruiting.IsChecked": "True" #自动公招 "TaskQueue.Recruiting.IsChecked": "True" #自动公招
"TaskQueue.Base.IsChecked": "True" #基建换班 "TaskQueue.Base.IsChecked": "True" #基建换班
@@ -37,5 +36,5 @@
"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 "VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包
"Start.RunDirectly": "True" #启动MAA后直接运行 "Start.RunDirectly": "True" #启动MAA后直接运行
"Start.MinimizeDirectly": "True" #启动MAA后直接最小化 "Start.MinimizeDirectly": "True" #启动MAA后直接最小化
"Start.StartEmulator": "True" #启动MAA后自动开启模拟器 "Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器
"Start.MinimizingStartup": "True" #最小化启动模拟器 "Start.MinimizingStartup": "True" #最小化启动模拟器

8
res/version.json
View File

@@ -1,7 +1,7 @@
{ {
"main_version": "4.1.0.0", "main_version": "4.1.1.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_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_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", "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.1/Updater_v1.0.0.zip",
"announcement": "\n## 新增功能\n- 版本更新功能上线，程序可进行版本更新" "announcement": "\n## 修复BUG\n- 适配MAA的`启动MAA后自动开启模拟器`字段更改"
} }