From c727eddc545eaff02bdcc36d6d10f3961c967862 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Fri, 11 Apr 2025 20:56:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ci):=20=E6=B7=BB=E5=8A=A0=E5=86=99?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-app.yml | 3 ++- .github/workflows/build-pre.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 10d8671..a5ad763 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -28,7 +28,8 @@ on: - 'LICENSE' permissions: - contents: read + contents: write + actions: write jobs: pre_check: diff --git a/.github/workflows/build-pre.yml b/.github/workflows/build-pre.yml index 6051cdf..6f6760a 100644 --- a/.github/workflows/build-pre.yml +++ b/.github/workflows/build-pre.yml @@ -28,7 +28,8 @@ on: - 'LICENSE' permissions: - contents: read + contents: write + actions: write jobs: pre_check: From 7d5dccc649fb3ade937a983aef14aa3ba1f93f0a Mon Sep 17 00:00:00 2001 From: DLmaster Date: Sat, 12 Apr 2025 23:09:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=99=A8=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 2 +- app/ui/main_window.py | 13 ++++++++----- resources/version.json | 9 +++++++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index e5de7c9..441fa7a 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -599,7 +599,7 @@ class MaaUserConfig(QConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.1.0" + VERSION = "4.3.1.1" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/ui/main_window.py b/app/ui/main_window.py index e558e32..a46d4bc 100644 --- a/app/ui/main_window.py +++ b/app/ui/main_window.py @@ -238,6 +238,14 @@ class AUTO_MAA(MSFluentWindow): # 清理旧日志 self.clean_old_logs() + # 清理临时更新器 + 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 + # 检查密码 self.setting.check_PASSWORD() @@ -399,11 +407,6 @@ class AUTO_MAA(MSFluentWindow): self.show_ui("隐藏到托盘", if_quick=True) - # 清理临时更新器 - if (Config.app_path / "AUTO_Updater.active.exe").exists(): - System.kill_process(Config.app_path / "AUTO_Updater.active.exe") - (Config.app_path / "AUTO_Updater.active.exe").unlink() - # 清理各功能线程 MainTimer.Timer.stop() MainTimer.Timer.deleteLater() diff --git a/resources/version.json b/resources/version.json index 3c315a7..495f74e 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,9 +1,14 @@ { - "main_version": "4.3.1.0", + "main_version": "4.3.1.1", "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.1.0":{ + "4.3.1.1": { + "修复BUG": [ + "修复更新器无法启动的异常" + ] + }, + "4.3.1.0": { "修复BUG": [ "覆盖规避v4.3.0错误包" ]