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

完善打包流程

Browse Source
This commit is contained in:
DLmaster
2024-12-30 19:41:25 +08:00
parent 9604fc9a8e
commit 756c0926ec
57 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/models/MAA.py
View File

@@ -676,21 +676,15 @@ class MaaManager(QtCore.QThread):
data["Configurations"]["Default"][
"MainFunction.PostActions"
] = "12" # 完成后退出MAA和模拟器
data["Configurations"]["Default"][
"Start.RunDirectly"
] = "True" # 启动MAA后直接运行
data["Configurations"]["Default"][
data["Global"]["Start.RunDirectly"] = "True" # 启动MAA后直接运行
data["Global"][
"Start.OpenEmulatorAfterLaunch"
] = "True" # 启动MAA后自动开启模拟器
if self.if_silence:
data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化
data["Configurations"]["Default"][
"GUI.UseTray"
] = "True" # 显示托盘图标
data["Configurations"]["Default"][
"GUI.MinimizeToTray"
] = "True" # 最小化时隐藏至托盘
data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标
data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘
if self.data[index][15] == "simple":
@@ -774,6 +768,9 @@ class MaaManager(QtCore.QThread):
data["Configurations"]["Default"][
"Fight.UseExpiringMedicine"
] = "True" # 无限吃48小时内过期的理智药
data["Configurations"]["Default"][
"GUI.HideSeries"
] = "False" # 隐藏连战次数
elif "日常" in mode:
@@ -864,6 +861,9 @@ class MaaManager(QtCore.QThread):
data["Configurations"]["Default"][
"Infrast.CustomInfrastEnabled"
] = "True" # 启用自定义基建配置
data["Configurations"]["Default"][
"Infrast.CustomInfrastPlanIndex"
] = "1" # 自定义基建配置索引
data["Configurations"]["Default"][
"Infrast.DefaultInfrast"
] = "user_defined" # 内置配置
@@ -883,23 +883,15 @@ class MaaManager(QtCore.QThread):
data["Configurations"]["Default"][
"MainFunction.PostActions"
] = "8" # 完成后退出MAA
data["Configurations"]["Default"][
"Start.RunDirectly"
] = "True" # 启动MAA后直接运行
data["Global"]["Start.RunDirectly"] = "True" # 启动MAA后直接运行
data["Global"]["Start.MinimizeDirectly"] = "True" # 启动MAA后直接最小化
data["Configurations"]["Default"]["GUI.UseTray"] = "True" # 显示托盘图标
data["Configurations"]["Default"][
"GUI.MinimizeToTray"
] = "True" # 最小化时隐藏至托盘
data["Global"]["GUI.UseTray"] = "True" # 显示托盘图标
data["Global"]["GUI.MinimizeToTray"] = "True" # 最小化时隐藏至托盘
# 启动MAA后自动开启模拟器
if "启动模拟器" in mode:
data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch"
] = "True"
data["Global"]["Start.OpenEmulatorAfterLaunch"] = "True"
elif "仅切换账号" in mode:
data["Configurations"]["Default"][
"Start.OpenEmulatorAfterLaunch"
] = "False"
data["Global"]["Start.OpenEmulatorAfterLaunch"] = "False"
if self.data[index][15] == "simple":
@@ -961,10 +953,8 @@ class MaaManager(QtCore.QThread):
data["Configurations"]["Default"][
"MainFunction.PostActions"
] = "0" # 完成后无动作
data["Configurations"]["Default"][
"Start.RunDirectly"
] = "False" # 启动MAA后直接运行
data["Configurations"]["Default"][
data["Global"]["Start.RunDirectly"] = "False" # 启动MAA后直接运行
data["Global"][
"Start.OpenEmulatorAfterLaunch"
] = "False" # 启动MAA后自动开启模拟器

14
app/utils/package.py
View File

@@ -41,6 +41,8 @@ if __name__ == "__main__":
main_version_numb = list(map(int, version["main_version"].split(".")))
updater_version_numb = list(map(int, version["updater_version"].split(".")))
print("正在打包AUTO_MAA主程序...")
result = subprocess.run(
f"powershell -Command nuitka --standalone --onefile --mingw64"
f" --enable-plugins=pyside6 --windows-console-mode=disable"
@@ -58,6 +60,10 @@ if __name__ == "__main__":
text=True,
)
print(result.stdout)
print(result.stderr)
print("AUTO_MAA主程序打包完成！")
shutil.copy(os.path.normpath("app/utils/Updater.py"), os.path.normpath("."))
with open(os.path.normpath("Updater.py"), "r", encoding="utf-8") as f:
@@ -70,6 +76,8 @@ if __name__ == "__main__":
with open(os.path.normpath("Updater.py"), "w", encoding="utf-8") as f:
f.write(file_content)
print("正在打包AUTO_MAA更新程序...")
result = subprocess.run(
f"powershell -Command nuitka --standalone --onefile --mingw64"
f" --enable-plugins=pyside6 --windows-console-mode=disable"
@@ -87,6 +95,12 @@ if __name__ == "__main__":
text=True,
)
print(result.stdout)
print(result.stderr)
print("AUTO_MAA更新程序打包完成！")
os.remove(os.path.normpath("Updater.py"))
with open("update_info.txt", "w", encoding="utf-8") as f:
print(
f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}{version["announcement"]}",