diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 5ea3f85..506e9ce 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -21,11 +21,7 @@ name: Build AUTO_MAA on: - push: - branches: [ "main" ] - paths-ignore: - - '**.md' - - 'LICENSE' + workflow_dispatch: permissions: contents: write diff --git a/.github/workflows/build-pre.yml b/.github/workflows/build-pre.yml index 25ea104..0de837d 100644 --- a/.github/workflows/build-pre.yml +++ b/.github/workflows/build-pre.yml @@ -21,11 +21,7 @@ name: Build AUTO_MAA_Pre on: - push: - branches: [ "dev" ] - paths-ignore: - - '**.md' - - 'LICENSE' + workflow_dispatch: permissions: contents: write diff --git a/app/core/config.py b/app/core/config.py index 8e473c5..988f3ef 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -599,7 +599,7 @@ class MaaUserConfig(QConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.2.0" + VERSION = "4.3.3.0" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/ui/main_window.py b/app/ui/main_window.py index a46d4bc..5160a32 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -241,7 +241,6 @@ class AUTO_MAA(MSFluentWindow): # 清理临时更新器 if (Config.app_path / "AUTO_Updater.active.exe").exists(): try: - System.kill_process(Config.app_path / "AUTO_Updater.active.exe") (Config.app_path / "AUTO_Updater.active.exe").unlink() except Exception: pass diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index c19c6f4..a0234a1 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -340,7 +340,7 @@ class MemberManager(QWidget): for _ in range(3): try: response = requests.get( - "https://mirrorchyan.com/api/resources/MAA/latest?user_agent=MaaWpfGui&os=win&arch=x64&channel=stable" + "https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable" ) maa_info = response.json() break @@ -372,7 +372,10 @@ class MemberManager(QWidget): Path(folder), "MAA", maa_version, - {"thread_numb": Config.get(Config.update_ThreadNumb)}, + { + "mode": "Proxy", + "thread_numb": Config.get(Config.update_ThreadNumb), + }, ) self.downloader.show() self.downloader.run() diff --git a/app/ui/setting.py b/app/ui/setting.py index edb4053..b8cddf6 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -271,7 +271,7 @@ class Setting(QWidget): for _ in range(3): try: response = requests.get( - f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?current_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}" + f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaGui¤t_version={version_text(current_version)}&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel={Config.get(Config.update_UpdateType)}" ) version_info: Dict[str, Union[int, str, Dict[str, str]]] = ( response.json() @@ -404,8 +404,7 @@ class Setting(QWidget): shell=True, creationflags=subprocess.CREATE_NO_WINDOW, ) - self.close() - QApplication.quit() + self.window().close() # 无版本更新 else: diff --git a/app/utils/downloader.py b/app/utils/downloader.py index f35994d..0a8b126 100644 --- a/app/utils/downloader.py +++ b/app/utils/downloader.py @@ -507,16 +507,16 @@ class DownloadManager(QDialog): self.zip_loop.exec() self.update_info("正在删除已弃用的文件") - if (app_path / "changes.json").exists(): + if (self.app_path / "changes.json").exists(): - with (app_path / "changes.json").open(mode="r", encoding="utf-8") as f: + with (self.app_path / "changes.json").open(mode="r", encoding="utf-8") as f: info: Dict[str, List[str]] = json.load(f) if "deleted" in info: for file_path in info: (self.app_path / file_path).unlink() - (app_path / "changes.json").unlink() + (self.app_path / "changes.json").unlink() self.update_info("正在删除临时文件") self.update_progress(0, 0, 0) @@ -661,7 +661,7 @@ if __name__ == "__main__": for _ in range(3): try: response = requests.get( - f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?current_version={version_text(current_version)}&cdk={mirrorchyan_CDK}&channel={update_type}" + f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaDownloader¤t_version={version_text(current_version)}&cdk={mirrorchyan_CDK}&channel={update_type}" ) version_info: Dict[str, Union[int, str, Dict[str, str]]] = response.json() break diff --git a/resources/version.json b/resources/version.json index c34a962..a203f90 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,8 +1,16 @@ { - "main_version": "4.3.2.0", + "main_version": "4.3.3.0", "updater_version": "1.0.0.0", "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n- 修复`检测到MAA未能实际执行任务`报错被异常屏蔽\n- 修复MAA超时判定异常失效\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作\n- 公告样式优化", "version_info": { + "4.3.3.0": { + "修复BUG": [ + "修复更新器无法下载MAA的异常" + ], + "程序优化": [ + "自动发版改为手动触发" + ] + }, "4.3.2.0": { "修复BUG": [ "修复更新器无法启动的异常"