diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index b27dbbf..c5b0d5a 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -22,7 +22,7 @@ name: Build AUTO_MAA on: push: - branches: [ "main", "Dev" ] + branches: [ "main" ] paths-ignore: - '**.md' - 'LICENSE' diff --git a/README.md b/README.md index 1514342..e6e67f2 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ MAA多账号管理与自动化软件 -!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/AUTO_MAA.png "软件图标") +!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png "软件图标") --- @@ -119,7 +119,7 @@ MAA多账号管理与自动化软件 - 配置自己模拟器所在的位置并根据实际情况填写`等待模拟器启动时间`（建议预留10s以防意外）。 - 如果是模拟器多开用户，还需要填写`附加命令`，具体填写值参见多开模拟器对应快捷方式路径（如`-v 1`）。 -![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/MAA配置.png "MAA配置") +![MAA配置](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/MAA配置.png "MAA配置") #### 设置AUTO_MAA @@ -165,7 +165,7 @@ MAA多账号管理与自动化软件 - 程序会读取`data/gameid.txt`中的数据，依据此进行关卡号的替换，便于常用关卡的使用。 - `gameid.txt`会在程序首次运行时生成，其中将预置一些常用资源本的替换方案。 -![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/README/gameid.png "gameid") +![gameid](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/README/gameid.png "gameid") ## 运行代理任务 @@ -201,7 +201,6 @@ MAA多账号管理与自动化软件 - [ ] 尝试接入更多开源社区成果 - [ ] 支持对MAA运行状况的进一步识别 -- [ ] 支持宽幅ADB连接适配 - [x] 添加更多通知手段 - [ ] GUI界面美化 @@ -225,7 +224,7 @@ MAA多账号管理与自动化软件 欢迎加入AUTO_MAA项目组，欢迎反馈bug -- QQ群：957750551 +- QQ群：[957750551](https://qm.qq.com/cgi-bin/qm/qr?k=EET-OL_o52KPlDLEmbzaNkKUXuyQ4WZY&jump_from=webapi&authKey=6NxGwEu9JAOLHqfdEmNfrZy4tUvC/3ar2j5+Go7Hgf3j+ntAK1VS6SUOLOjYVKTt) --- diff --git a/app/models/MAA.py b/app/models/MAA.py index 1aebe78..af9796f 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -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后自动开启模拟器 diff --git a/app/utils/package.py b/app/utils/package.py index fcaf9f9..b95538f 100644 --- a/app/utils/package.py +++ b/app/utils/package.py @@ -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"]}", diff --git a/res/version.json b/res/version.json index 9d6b23c..aec2af5 100644 --- a/res/version.json +++ b/res/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.0.0", "updater_version": "1.1.0.0", - "announcement": "\n# 这是一个中间版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成更新后再次检查更新以获取最新版本。\n", + "announcement": "\n# 这是一个中转版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成本次更新后再次检查更新以获取最新版本。\n", "proxy_list":[ "", "https://gitproxy.click/", diff --git a/resources/audio/3星结束行动.wav b/resources/audio/3星结束行动.wav deleted file mode 100644 index 1769d44..0000000 Binary files a/resources/audio/3星结束行动.wav and /dev/null differ diff --git a/resources/audio/交谈1.wav b/resources/audio/交谈1.wav deleted file mode 100644 index 93fdef6..0000000 Binary files a/resources/audio/交谈1.wav and /dev/null differ diff --git a/resources/audio/交谈2.wav b/resources/audio/交谈2.wav deleted file mode 100644 index d22984f..0000000 Binary files a/resources/audio/交谈2.wav and /dev/null differ diff --git a/resources/audio/交谈3.wav b/resources/audio/交谈3.wav deleted file mode 100644 index 461a5e0..0000000 Binary files a/resources/audio/交谈3.wav and /dev/null differ diff --git a/resources/audio/任命助理.wav b/resources/audio/任命助理.wav deleted file mode 100644 index 1e80f09..0000000 Binary files a/resources/audio/任命助理.wav and /dev/null differ diff --git a/resources/audio/任命队长.wav b/resources/audio/任命队长.wav deleted file mode 100644 index 3f7765c..0000000 Binary files a/resources/audio/任命队长.wav and /dev/null differ diff --git a/resources/audio/作战中1.wav b/resources/audio/作战中1.wav deleted file mode 100644 index 178c862..0000000 Binary files a/resources/audio/作战中1.wav and /dev/null differ diff --git a/resources/audio/作战中2.wav b/resources/audio/作战中2.wav deleted file mode 100644 index a68eef9..0000000 Binary files a/resources/audio/作战中2.wav and /dev/null differ diff --git a/resources/audio/作战中3.wav b/resources/audio/作战中3.wav deleted file mode 100644 index 3dab79a..0000000 Binary files a/resources/audio/作战中3.wav and /dev/null differ diff --git a/resources/audio/作战中4.wav b/resources/audio/作战中4.wav deleted file mode 100644 index 172612e..0000000 Binary files a/resources/audio/作战中4.wav and /dev/null differ diff --git a/resources/audio/信赖提升后交谈1.wav b/resources/audio/信赖提升后交谈1.wav deleted file mode 100644 index 4bb56cb..0000000 Binary files a/resources/audio/信赖提升后交谈1.wav and /dev/null differ diff --git a/resources/audio/信赖提升后交谈2.wav b/resources/audio/信赖提升后交谈2.wav deleted file mode 100644 index aefc75d..0000000 Binary files a/resources/audio/信赖提升后交谈2.wav and /dev/null differ diff --git a/resources/audio/信赖提升后交谈3.wav b/resources/audio/信赖提升后交谈3.wav deleted file mode 100644 index dbab117..0000000 Binary files a/resources/audio/信赖提升后交谈3.wav and /dev/null differ diff --git a/resources/audio/信赖触摸.wav b/resources/audio/信赖触摸.wav deleted file mode 100644 index 80c6717..0000000 Binary files a/resources/audio/信赖触摸.wav and /dev/null differ diff --git a/resources/audio/周年庆典.wav b/resources/audio/周年庆典.wav deleted file mode 100644 index 6380ff9..0000000 Binary files a/resources/audio/周年庆典.wav and /dev/null differ diff --git a/resources/audio/完成高难行动.wav b/resources/audio/完成高难行动.wav deleted file mode 100644 index 75007d7..0000000 Binary files a/resources/audio/完成高难行动.wav and /dev/null differ diff --git a/resources/audio/干员报到.wav b/resources/audio/干员报到.wav deleted file mode 100644 index a6057f5..0000000 Binary files a/resources/audio/干员报到.wav and /dev/null differ diff --git a/resources/audio/戳一下.wav b/resources/audio/戳一下.wav deleted file mode 100644 index f24790e..0000000 Binary files a/resources/audio/戳一下.wav and /dev/null differ diff --git a/resources/audio/新年祝福.wav b/resources/audio/新年祝福.wav deleted file mode 100644 index 6adafc6..0000000 Binary files a/resources/audio/新年祝福.wav and /dev/null differ diff --git a/resources/audio/晋升后交谈1.wav b/resources/audio/晋升后交谈1.wav deleted file mode 100644 index 05aa36f..0000000 Binary files a/resources/audio/晋升后交谈1.wav and /dev/null differ diff --git a/resources/audio/晋升后交谈2.wav b/resources/audio/晋升后交谈2.wav deleted file mode 100644 index a29ace0..0000000 Binary files a/resources/audio/晋升后交谈2.wav and /dev/null differ diff --git a/resources/audio/标题.wav b/resources/audio/标题.wav deleted file mode 100644 index e392c40..0000000 Binary files a/resources/audio/标题.wav and /dev/null differ diff --git a/resources/audio/生日.wav b/resources/audio/生日.wav deleted file mode 100644 index 6239884..0000000 Binary files a/resources/audio/生日.wav and /dev/null differ diff --git a/resources/audio/精英化晋升1.wav b/resources/audio/精英化晋升1.wav deleted file mode 100644 index 7bcc14e..0000000 Binary files a/resources/audio/精英化晋升1.wav and /dev/null differ diff --git a/resources/audio/精英化晋升2.wav b/resources/audio/精英化晋升2.wav deleted file mode 100644 index c9d135b..0000000 Binary files a/resources/audio/精英化晋升2.wav and /dev/null differ diff --git a/resources/audio/编入队伍.wav b/resources/audio/编入队伍.wav deleted file mode 100644 index 37abd01..0000000 Binary files a/resources/audio/编入队伍.wav and /dev/null differ diff --git a/resources/audio/行动出发.wav b/resources/audio/行动出发.wav deleted file mode 100644 index 24d326a..0000000 Binary files a/resources/audio/行动出发.wav and /dev/null differ diff --git a/resources/audio/行动失败.wav b/resources/audio/行动失败.wav deleted file mode 100644 index 31a7666..0000000 Binary files a/resources/audio/行动失败.wav and /dev/null differ diff --git a/resources/audio/行动开始.wav b/resources/audio/行动开始.wav deleted file mode 100644 index 9857957..0000000 Binary files a/resources/audio/行动开始.wav and /dev/null differ diff --git a/resources/audio/观看作战记录.wav b/resources/audio/观看作战记录.wav deleted file mode 100644 index 16ddf2d..0000000 Binary files a/resources/audio/观看作战记录.wav and /dev/null differ diff --git a/resources/audio/进驻设施.wav b/resources/audio/进驻设施.wav deleted file mode 100644 index 689f7b4..0000000 Binary files a/resources/audio/进驻设施.wav and /dev/null differ diff --git a/resources/audio/选中干员1.wav b/resources/audio/选中干员1.wav deleted file mode 100644 index 91191d0..0000000 Binary files a/resources/audio/选中干员1.wav and /dev/null differ diff --git a/resources/audio/选中干员2.wav b/resources/audio/选中干员2.wav deleted file mode 100644 index 4b9cfa9..0000000 Binary files a/resources/audio/选中干员2.wav and /dev/null differ diff --git a/resources/audio/部署1.wav b/resources/audio/部署1.wav deleted file mode 100644 index d6f11b1..0000000 Binary files a/resources/audio/部署1.wav and /dev/null differ diff --git a/resources/audio/部署2.wav b/resources/audio/部署2.wav deleted file mode 100644 index da427ae..0000000 Binary files a/resources/audio/部署2.wav and /dev/null differ diff --git a/resources/audio/问候.wav b/resources/audio/问候.wav deleted file mode 100644 index b4eec06..0000000 Binary files a/resources/audio/问候.wav and /dev/null differ diff --git a/resources/audio/闲置.wav b/resources/audio/闲置.wav deleted file mode 100644 index be0f142..0000000 Binary files a/resources/audio/闲置.wav and /dev/null differ diff --git a/resources/audio/非3星结束行动.wav b/resources/audio/非3星结束行动.wav deleted file mode 100644 index 2b765ab..0000000 Binary files a/resources/audio/非3星结束行动.wav and /dev/null differ diff --git a/resources/set.txt b/resources/docs/MAA_config_info.txt similarity index 69% rename from resources/set.txt rename to resources/docs/MAA_config_info.txt index d522800..316a146 100644 --- a/resources/set.txt +++ b/resources/docs/MAA_config_info.txt @@ -18,25 +18,28 @@ "GUI.CustomStageCode": "False" #手动输入关卡名 "GUI.UseAlternateStage": "False" #使用备选关卡 "Fight.UseRemainingSanityStage": "True" #使用剩余理智 +"GUI.AllowUseStoneSave": "False" #允许吃源石保持状态 "Fight.UseExpiringMedicine": "False" #无限吃48小时内过期的理智药 "GUI.HideUnavailableStage": "False" #隐藏当日不开放关卡 +"GUI.HideSeries": "False" #隐藏连战次数 "Infrast.CustomInfrastPlanShowInFightSettings": "False" #显示基建计划 "Penguin.EnablePenguin": "True" #上报企鹅物流 "Yituliu.EnableYituliu": "True" #上报一图流 #基建换班 "Infrast.CustomInfrastEnabled": "True" #启用自定义基建配置 +"Infrast.CustomInfrastPlanIndex": "1" #自定义基建配置索引 "Infrast.DefaultInfrast": "user_defined" #内置配置 "Infrast.IsCustomInfrastFileReadOnly": "False" #自定义基建配置文件只读 "Infrast.CustomInfrastFile": "" #自定义基建配置文件地址 #设置 "Start.ClientType": "Bilibili"、 "Official" #服务器 -"Timer.Timer1": "False" #时间设置1 -"VersionUpdate.ScheduledUpdateCheck": "True" #定时检查更新 -"VersionUpdate.AutoDownloadUpdatePackage": "True" #自动下载更新包 -"VersionUpdate.AutoInstallUpdatePackage": "True" #自动安装更新包 -"Start.RunDirectly": "True" #启动MAA后直接运行 -"Start.MinimizeDirectly": "True" #启动MAA后直接最小化 -"Start.OpenEmulatorAfterLaunch": "True" #启动MAA后自动开启模拟器 -"GUI.UseTray": "True" #显示托盘图标 -"GUI.MinimizeToTray": "False" #最小化时隐藏至托盘 +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 diff --git a/resources/AUTO_MAA.png b/resources/images/AUTO_MAA.png similarity index 100% rename from resources/AUTO_MAA.png rename to resources/images/AUTO_MAA.png diff --git a/resources/README/MAA配置.png b/resources/images/README/MAA配置.png similarity index 100% rename from resources/README/MAA配置.png rename to resources/images/README/MAA配置.png diff --git a/resources/README/gameid.png b/resources/images/README/gameid.png similarity index 100% rename from resources/README/gameid.png rename to resources/images/README/gameid.png diff --git a/resources/README/payid.png b/resources/images/README/payid.png similarity index 100% rename from resources/README/payid.png rename to resources/images/README/payid.png diff --git a/resources/images/头像_白面鸮.png b/resources/images/头像_白面鸮.png deleted file mode 100644 index ccc9897..0000000 Binary files a/resources/images/头像_白面鸮.png and /dev/null differ diff --git a/resources/images/技能_治疗强化·γ型.png b/resources/images/技能_治疗强化·γ型.png deleted file mode 100644 index 9c62bae..0000000 Binary files a/resources/images/技能_治疗强化·γ型.png and /dev/null differ diff --git a/resources/images/技能_脑啡肽.png b/resources/images/技能_脑啡肽.png deleted file mode 100644 index 08f6de8..0000000 Binary files a/resources/images/技能_脑啡肽.png and /dev/null differ diff --git a/resources/images/模组_医疗环境分析装置.png b/resources/images/模组_医疗环境分析装置.png deleted file mode 100644 index 810044a..0000000 Binary files a/resources/images/模组_医疗环境分析装置.png and /dev/null differ diff --git a/resources/images/立绘_白面鸮_skin2.png b/resources/images/立绘_白面鸮_skin2.png deleted file mode 100644 index 0e45ff7..0000000 Binary files a/resources/images/立绘_白面鸮_skin2.png and /dev/null differ diff --git a/resources/images/道具_带框_白面鸮的中坚信物.png b/resources/images/道具_带框_白面鸮的中坚信物.png deleted file mode 100644 index 942e659..0000000 Binary files a/resources/images/道具_带框_白面鸮的中坚信物.png and /dev/null differ diff --git a/resources/images/道具_带框_白面鸮的信物.png b/resources/images/道具_带框_白面鸮的信物.png deleted file mode 100644 index a497410..0000000 Binary files a/resources/images/道具_带框_白面鸮的信物.png and /dev/null differ diff --git a/resources/version.json b/resources/version.json index 9d6b23c..6d64931 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,7 +1,7 @@ { "main_version": "4.2.0.0", "updater_version": "1.1.0.0", - "announcement": "\n# 这是一个中间版本，此版本后更换程序架构方式。\n# 由于更新方法无法通用，您需要在完成更新后再次检查更新以获取最新版本。\n", + "announcement": "\n## 新增功能\n- 提供完整打包代码\n## 修复BUG\n- 同步MAA`v5.11.1`的字段修改\n- 清除自动化中无效的整合流程\n## 程序优化\n- 调整项目结构，模块化各功能组件\n- 改用`nuitka`编译，压缩软件体积，提升运行速度", "proxy_list":[ "", "https://gitproxy.click/", diff --git a/update_info.txt b/update_info.txt new file mode 100644 index 0000000..a5556c9 --- /dev/null +++ b/update_info.txt @@ -0,0 +1,10 @@ +v4.2.0 +v1.1.0 +## 新增功能 +- 提供完整打包代码 +## 修复BUG +- 同步MAA`v5.11.1`的字段修改 +- 清除自动化中无效的整合流程 +## 程序优化 +- 调整项目结构，模块化各功能组件 +- 改用`nuitka`编译，压缩软件体积，提升运行速度