Merge branch 'dev'

app/core/config.py

@@ -599,7 +599,7 @@ class MaaUserConfig(QConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.3.1.0"
+    VERSION = "4.3.2.0"
 
     gameid_refreshed = Signal()
     PASSWORD_refreshed = Signal()

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()

app/utils/package.py

@@ -71,8 +71,9 @@ if __name__ == "__main__":
     print("Packaging AUTO_MAA main program ...")
 
     os.system(
-        "powershell -Command python -m nuitka --standalone --mingw64"
+        "powershell -Command python -m nuitka --standalone --onefile --mingw64"
         " --enable-plugins=pyside6 --windows-console-mode=disable"
+        " --onefile-tempdir-spec='{TEMP}\\AUTO_MAA'"
         " --windows-icon-from-ico=resources\\icons\\AUTO_MAA.ico"
         " --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
         f" --file-version={version["main_version"]}"
@@ -107,19 +108,9 @@ if __name__ == "__main__":
 
     (root_path / "AUTO_MAA").mkdir(parents=True, exist_ok=True)
 
-    print("Start to copy AUTO_MAA main program ...")
-
-    for item in (root_path / "main.dist").iterdir():
-        if item.is_dir():
-            shutil.copytree(
-                item, root_path / "AUTO_MAA" / item.name, dirs_exist_ok=True
-            )
-        else:
-            shutil.copy(item, root_path / "AUTO_MAA/")
-    shutil.rmtree(root_path / "main.dist")
-
-    print("Start to copy AUTO_MAA update program ...")
+    print("Start to move AUTO_MAA program ...")
 
+    shutil.move(root_path / "AUTO_MAA.exe", root_path / "AUTO_MAA/")
     shutil.move(root_path / "AUTO_Updater.exe", root_path / "AUTO_MAA/")
 
     print("Start to copy rescourses ...")

resources/version.json

@@ -1,9 +1,14 @@
 {
-    "main_version": "4.3.1.0",
+    "main_version": "4.3.2.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.1.0":{
+        "4.3.2.0": {
+            "修复BUG": [
+                "修复更新器无法启动的异常"
+            ]
+        },
+        "4.3.1.0": {
             "修复BUG": [
                 "覆盖规避v4.3.0错误包"
             ]