同步“启动MAA后直接最小化”字段

fix: MAA项目地址

.github/workflows/python-app.yml

@@ -83,12 +83,10 @@ jobs:
       - name: Create Zip
         id: create_zip
         run: |
-          move gui\ui\updater.ui .\
           move gui\ico\AUTO_MAA_Updater.ico .\
           Compress-Archive -Path gui,res,AUTO_MAA.py,Updater.py,package.py,dist/AUTO_MAA.exe,requirements.txt,README.md,LICENSE -DestinationPath AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
           del gui\ui\main.ui
           del gui\ico\AUTO_MAA.ico
-          move updater.ui gui\ui
           move AUTO_MAA_Updater.ico gui\ico
           Compress-Archive -Path gui,dist/Updater.exe -DestinationPath Updater_${{ env.updater_version }}.zip
       - name: Upload Artifact

README.md

@@ -15,16 +15,35 @@ MAA多账号管理与自动化软件
 [![GitHub License](https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE)
 </div>
 
+## 软件介绍
+
+### 性质
+
+本软件是明日方舟第三方软件`MAA`的第三方工具，即第3<sup>3</sup>方软件。旨在优化MAA多账号功能体验，并通过一些方法解决MAA项目未能解决的部分问题，提高代理的稳定性。
+
+### 原理
+
+本软件可以存储多个明日方舟账号数据，并通过以下流程实现代理功能：
+
+1. **配置：** 根据对应用户的配置信息，生成配置文件并将其导入MAA。
+2. **监测：** 在MAA开始代理后，持续读取MAA的日志以判断其运行状态。当软件认定MAA出现异常时，通过重启MAA使之仍能继续完成任务。
+3. **循环：** 重复上述步骤，使MAA依次完成各个用户的日常代理任务。
+
+### 优势
+
+- **节省运行开销：** 只需要一份MAA软件与一个模拟器，无需多开就能完成多账号代理，羸弱的电脑也能代理日常。
+- **自定义空间大：** 依靠高级用户配置模式，支持MAA几乎所有设置选项自定义，同时保留对模拟器多开的支持。
+- **一键代理无忧：** 无须中途手动修改MAA配置，将繁琐交给AUTO_MAA，把游戏留给自己。
+- **代理结果复核：** 通过人工排查功能核实各用户代理情况，堵住日常代理的最后一丝风险。
+
 ## 重要声明
 
-本软件是一个外部工具，旨在优化MAA多账号功能体验，并通过一些方法解决MAA项目未能解决的部分问题，改善代理的稳定性。该软件包可以存储明日方舟多账号数据，并通过修改MAA配置文件、读取MAA日志等行为自动完成多账号代理。本开发团队承诺，不会修改明日方舟游戏本体与相关配置文件。
-
-本项目使用GPL开源，相关细则如下：
+本开发团队承诺，不会修改明日方舟游戏本体与相关配置文件。本项目使用GPL开源，相关细则如下：
 
 - **作者：** AUTO_MAA软件作者为DLmaster、DLmaster361或DLmaster_361，以上均指代同一人。
 - **使用：** AUTO_MAA使用者可以按自己的意愿自由使用本软件。依据GPL，对于由此可能产生的损失，AUTO_MAA项目组不负任何责任。
-- **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。但所有分发者必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件），违反者可能会被追究法律责任。
-- **传播：** AUTO_MAA原则上允许传播者自由传播本软件。但由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解。
+- **分发：** AUTO_MAA允许任何人自由分发本软件，包括进行商业活动牟利。若为直接分发本软件，必须遵循GPL向接收者提供本软件项目地址、完整的软件源码与GPL协议原文（件）；若为修改软件后进行分发，必须遵循GPL向接收者提供本软件项目地址、修改前的完整软件源码副本与GPL协议原文（件），违反者可能会被追究法律责任。
+- **传播：** AUTO_MAA原则上允许传播者自由传播本软件，但无论在何种传播过程中，不得删除项目作者与开发者所留版权声明，不得隐瞒项目作者与相关开发者的存在。由于软件性质，项目组不希望发现任何人在明日方舟官方媒体（包括官方媒体账号与森空岛社区等）或明日方舟游戏相关内容（包括同好群、线下活动与游戏内容讨论等）下提及AUTO_MAA或MAA，希望各位理解。
 - **衍生：** AUTO_MAA允许任何人对软件本体或软件部分代码进行二次开发或利用。但依据GPL，相关成果也必须使用GPL开源。
 - **授权：** 如果希望在使用AUTO_MAA的相关成果后仍保持自己的项目闭源，请在Issues中说明来意。得到项目组认可后，我们可以提供另一份使用不同协议的代码，此协议主要内容如下：被授权者可以自由使用该代码并维持闭源；被授权者必须定期为AUTO_MAA作出贡献。
 - **贡献：** 不论是直接参与软件的维护编写，或是撰写文档、测试、反馈BUG、给出建议、参与讨论，都为AUTO_MAA项目的发展完善做出了不可忽视的贡献。项目组提倡各位贡献者遵照GitHub开源社区惯例，发布Issues参与项目。避免私信或私发邮件（安全性漏洞或敏感问题除外），以帮助更多用户。
@@ -47,7 +66,7 @@ MAA多账号管理与自动化软件
 
 ### 下载MAA
 
-- 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/CHNZYX/Auto_Simulated_Universe/archive/refs/heads/main.zip)
+- 什么是MAA？    [官网](https://maa.plus/)/[GitHub](https://github.com/MaaAssistantArknights/MaaAssistantArknights)
 
 - MAA下载地址    [GitHub下载](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases)
 
@@ -114,7 +133,8 @@ MAA多账号管理与自动化软件
 - `开机自动启动AUTO_MAA`：实现AUTO_MAA的自启动。
 - `AUTO_MAA启动时禁止电脑休眠`：仅阻止电脑自动休眠，不会影响屏幕是否熄灭。
 - `启动AUTO_MAA后直接代理`：在AUTO_MAA启动后立即执行代理任务。
-- `检查版本更新`：从GitHub上获取版本更新，要求网络能够访问GitHub。获取版本信息时若遇网络不稳定，主程序有概率未响应，稍等片刻后恢复。
+- `通过邮件通知结果`：在AUTO_MAA完成任务后将结果发送至用户指定邮箱。
+- `检查版本更新`：从GitHub镜像源获取版本更新信息，并调起更新器完成程序更新，更新器已支持多个代理地址。
 - `修改管理密钥`：修改管理密钥，当用户列表中无用户时，将跳过验证旧管理密钥。
 
 #### 设置用户配置
@@ -122,9 +142,6 @@ MAA多账号管理与自动化软件
 本项目已基本完成GUI开发，您可以直接在用户管理页配置用户相关信息，页面简介如下：
 - `新建`、`删除`：新建一个用户到当前用户配置列表、删除当前所选第一行所对应的用户。
 - `转为高级/简洁`：将当前所选第一行所对应的用户转为高级/简洁配置模式。
-- `修改配置`：修改更深层的用户配置信息，当前支持该项的有`简洁用户配置列表的自定义基建栏目`、`高级用户配置列表的日常、剿灭栏目`，详解如下：
-  - `简洁用户配置列表的自定义基建栏目`：获取自定义基建的JSON文件。
-  - `高级用户配置列表的日常、剿灭栏目`：打开MAA进行具体的任务配置，配置方法参见上文。注意，此时你还需要确保所要执行的任务被勾选。
 - `显示密码`：输入管理密钥以显示用户密码，仅当管理密钥正确时能够修改`密码栏目`。
 - `刷新`：清除临时保存的管理密钥。
 - `简洁用户配置列表`：仅支持核心代理选项的设置，其它设置选项沿用MAA的全局设置，部分代理核心功能选项由程序托管。
@@ -139,7 +156,7 @@ MAA多账号管理与自动化软件
   - `关卡`、`备选关卡-1`、`备选关卡-2`：关卡号。
   - `日常`：单独设定是否进行日常代理的日常部分，可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
   - `剿灭`：单独设定是否进行日常代理的剿灭部分，高级配置模式下可进一步配置MAA的具体代理任务，该配置与全局MAA配置相互独立。
-  - `自定义基建`：是否启用自定义基建功能，可进一步配置自定义基建文件，该配置与其他用户相互独立。
+  - `自定义基建`：是否启用自定义基建功能，需要进一步配置自定义基建文件，该配置与其他用户相互独立。
   - `密码`：仅用于登记用户的密码，可留空。
   - `备注`：用于备注用户信息。
 
@@ -182,12 +199,10 @@ MAA多账号管理与自动化软件
 
 ## 未来开发方向
 
-- [x] 支持B服
-- [x] 支持完全自定义MAA配置
-- [x] 支持程序版本更新
+- [ ] 尝试接入更多开源社区成果
 - [ ] 支持对MAA运行状况的进一步识别
 - [ ] 支持宽幅ADB连接适配
-- [ ] 添加更多通知手段
+- [x] 添加更多通知手段
 - [ ] GUI界面美化
 
 ## 贡献者
@@ -216,4 +231,4 @@ MAA多账号管理与自动化软件
 
 如果喜欢这个项目的话，给作者来杯咖啡吧！
 
-![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/payid.png "payid")
+![payid](https://github.com/DLmaster361/AUTO_MAA/blob/main/res/README/payid.png "payid")

Updater.py

@@ -31,17 +31,19 @@ import json
 import zipfile
 import requests
 import subprocess
+import time
 
 from PySide6.QtWidgets import (
     QApplication,
+    QDialog,
+    QVBoxLayout,
     QLabel,
     QProgressBar,
 )
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import QObject, QThread, Signal
-from PySide6.QtUiTools import QUiLoader
 
-uiLoader = QUiLoader()
+from package import version_text
 
 
 class UpdateProcess(QThread):
@@ -50,15 +52,17 @@ class UpdateProcess(QThread):
     progress = Signal(int, int, int)
     accomplish = Signal()
 
-    def __init__(self, app_path, name, download_url, version):
+    def __init__(self, app_path, name, main_version, updater_version):
         super(UpdateProcess, self).__init__()
 
         self.app_path = app_path
         self.name = name
-        self.download_url = download_url
-        self.version = version
-        self.download_path = f"{app_path}/AUTO_MAA_Update.zip"  #  临时下载文件的路径
-        self.version_path = f"{app_path}/res/version.json"
+        self.main_version = main_version
+        self.updater_version = updater_version
+        self.download_path = os.path.normpath(
+            f"{app_path}/AUTO_MAA_Update.zip"
+        )  #  临时下载文件的路径
+        self.version_path = os.path.normpath(f"{app_path}/res/version.json")
 
     def run(self):
 
@@ -68,23 +72,70 @@ class UpdateProcess(QThread):
         except FileNotFoundError:
             pass
 
-        # 下载
+        self.info.emit("正在获取下载链接")
+        url_list = self.get_download_url()
+
+        # 验证下载地址并获取文件大小
+        for i in range(len(url_list)):
+            try:
+                self.info.emit(f"正在验证下载地址：{url_list[i]}")
+                response = requests.get(url_list[i], stream=True)
+                if response.status_code != 200:
+                    self.info.emit(
+                        f"连接失败，错误代码 {response.status_code} ，正在切换代理（{i+1}/{len(url_list)}）"
+                    )
+                    time.sleep(1)
+                    continue
+                file_size = response.headers.get("Content-Length")
+                break
+            except requests.RequestException:
+                self.info.emit(f"请求超时，正在切换代理（{i+1}/{len(url_list)}）")
+                time.sleep(1)
+        else:
+            self.info.emit(f"连接失败，已尝试所有{len(url_list)}个代理")
+            return None
+
+        if file_size is None:
+            file_size = 1
+        else:
+            file_size = int(file_size)
+
         try:
-            response = requests.get(self.download_url, stream=True)
-            file_size = response.headers.get("Content-Length")
-            if file_size is None:
-                file_size = 1
-            else:
-                file_size = int(file_size)
+            # 下载文件
             with open(self.download_path, "wb") as f:
+
                 downloaded_size = 0
+                last_download_size = 0
+                speed = 0
+                last_time = time.time()
+
                 for chunk in response.iter_content(chunk_size=8192):
+
+                    # 写入已下载数据
                     f.write(chunk)
                     downloaded_size += len(chunk)
-                    self.info.emit(
-                        f"正在下载：{self.name} 已下载: {downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB ({downloaded_size / file_size * 100:.2f}%)"
-                    )
+
+                    # 计算下载速度
+                    if time.time() - last_time >= 1.0:
+                        speed = (
+                            (downloaded_size - last_download_size)
+                            / (time.time() - last_time)
+                            / 1024
+                        )
+                        last_download_size = downloaded_size
+                        last_time = time.time()
+
+                    # 更新下载进度
+                    if speed >= 1024:
+                        self.info.emit(
+                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed / 1024:.2f} MB/s",
+                        )
+                    else:
+                        self.info.emit(
+                            f"正在下载：{self.name} 已下载：{downloaded_size / 1048576:.2f}/{file_size / 1048576:.2f} MB （{downloaded_size / file_size * 100:.2f}%） 下载速度：{speed:.2f} KB/s",
+                        )
                     self.progress.emit(0, 100, int(downloaded_size / file_size * 100))
+
         except Exception as e:
             e = str(e)
             e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
@@ -93,10 +144,17 @@ class UpdateProcess(QThread):
 
         # 解压
         try:
-            self.info.emit("正在解压更新文件")
-            self.progress.emit(0, 0, 0)
-            with zipfile.ZipFile(self.download_path, "r") as zip_ref:
-                zip_ref.extractall(self.app_path)
+
+            while True:
+                try:
+                    self.info.emit("正在解压更新文件")
+                    self.progress.emit(0, 0, 0)
+                    with zipfile.ZipFile(self.download_path, "r") as zip_ref:
+                        zip_ref.extractall(self.app_path)
+                    break
+                except PermissionError:
+                    self.info.emit("解压出错：AUTO_MAA正在运行，正在等待其关闭")
+                    time.sleep(1)
 
             self.info.emit("正在删除临时文件")
             self.progress.emit(0, 0, 0)
@@ -104,7 +162,9 @@ class UpdateProcess(QThread):
 
             self.info.emit(f"{self.name}更新成功！")
             self.progress.emit(0, 100, 100)
+
         except Exception as e:
+
             e = str(e)
             e = "\n".join([e[_ : _ + 75] for _ in range(0, len(e), 75)])
             self.info.emit(f"解压更新时出错：\n{e}")
@@ -114,37 +174,100 @@ class UpdateProcess(QThread):
         with open(self.version_path, "r", encoding="utf-8") as f:
             version_info = json.load(f)
         if self.name == "AUTO_MAA更新器":
-            version_info["updater_version"] = self.version
+            version_info["updater_version"] = ".".join(map(str, self.updater_version))
         elif self.name == "AUTO_MAA主程序":
-            version_info["main_version"] = self.version
+            version_info["main_version"] = ".".join(map(str, self.main_version))
         with open(self.version_path, "w", encoding="utf-8") as f:
             json.dump(version_info, f, indent=4)
 
         # 主程序更新完成后打开AUTO_MAA
         if self.name == "AUTO_MAA主程序":
             subprocess.Popen(
-                f"{self.app_path}/AUTO_MAA.exe",
+                os.path.normpath(f"{self.app_path}/AUTO_MAA.exe"),
                 shell=True,
                 creationflags=subprocess.CREATE_NO_WINDOW,
             )
 
         self.accomplish.emit()
 
+    def get_download_url(self):
+        """获取下载链接"""
+
+        try_num = 3
+        for i in range(try_num):
+            try:
+                response = requests.get(
+                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/res/version.json"
+                )
+                if response.status_code != 200:
+                    self.info.emit(
+                        f"连接失败，错误代码 {response.status_code} ，正在重试（{i+1}/{try_num}）"
+                    )
+                    time.sleep(0.1)
+                    continue
+                version_remote = response.json()
+                PROXY_list = version_remote["proxy_list"]
+                break
+            except requests.RequestException:
+                self.info.emit(f"请求超时，正在重试（{i+1}/{try_num}）")
+                time.sleep(0.1)
+            except KeyError:
+                self.info.emit(f"未找到远端代理网址项，正在重试（{i+1}/{try_num}）")
+                time.sleep(0.1)
+        else:
+            self.info.emit("获取远端代理信息失败，将使用默认代理地址")
+            PROXY_list = [
+                "",
+                "https://gitproxy.click/",
+                "https://cdn.moran233.xyz/",
+                "https://gh.llkk.cc/",
+                "https://github.akams.cn/",
+                "https://www.ghproxy.cn/",
+                "https://ghp.ci/",
+            ]
+            time.sleep(1)
+
+        url_list = []
+        if self.name == "AUTO_MAA主程序":
+            url_list.append(
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
+            )
+            for i in range(len(PROXY_list)):
+                url_list.append(
+                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/AUTO_MAA_{version_text(self.main_version)}.zip"
+                )
+        elif self.name == "AUTO_MAA更新器":
+            url_list.append(
+                f"https://gitee.com/DLmaster_361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
+            )
+            for i in range(len(PROXY_list)):
+                url_list.append(
+                    f"{PROXY_list[i]}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.main_version)}/Updater_{version_text(self.updater_version)}.zip"
+                )
+        return url_list
+
 
 class Updater(QObject):
 
     def __init__(self, app_path, name, download_url, version):
         super().__init__()
 
-        self.ui = uiLoader.load(f"{app_path}/gui/ui/updater.ui")
+        self.ui = QDialog()
         self.ui.setWindowTitle("AUTO_MAA更新器")
-        self.ui.setWindowIcon(QIcon(f"{app_path}/gui/ico/AUTO_MAA_Updater.ico"))
+        self.ui.resize(700, 70)
+        self.ui.setWindowIcon(
+            QIcon(os.path.normpath(f"{app_path}/gui/ico/AUTO_MAA_Updater.ico"))
+        )
 
-        self.info = self.ui.findChild(QLabel, "label")
-        self.info.setText("正在初始化")
+        # 创建垂直布局
+        self.Layout_v = QVBoxLayout(self.ui)
 
-        self.progress = self.ui.findChild(QProgressBar, "progressBar")
+        self.info = QLabel("正在初始化", self.ui)
+        self.Layout_v.addWidget(self.info)
+
+        self.progress = QProgressBar(self.ui)
         self.progress.setRange(0, 0)
+        self.Layout_v.addWidget(self.progress)
 
         self.update_process = UpdateProcess(app_path, name, download_url, version)
 
@@ -172,11 +295,13 @@ class AUTO_MAA_Updater(QApplication):
 if __name__ == "__main__":
 
     # 获取软件自身的路径
-    app_path = os.path.dirname(os.path.realpath(sys.argv[0])).replace("\\", "/")
+    app_path = os.path.normpath(os.path.dirname(os.path.realpath(sys.argv[0])))
 
     # 从本地版本信息文件获取当前版本信息
-    if os.path.exists(f"{app_path}/res/version.json"):
-        with open(f"{app_path}/res/version.json", "r", encoding="utf-8") as f:
+    if os.path.exists(os.path.normpath(f"{app_path}/res/version.json")):
+        with open(
+            os.path.normpath(f"{app_path}/res/version.json"), "r", encoding="utf-8"
+        ) as f:
             version_current = json.load(f)
         main_version_current = list(
             map(int, version_current["main_version"].split("."))
@@ -185,18 +310,28 @@ if __name__ == "__main__":
         main_version_current = [0, 0, 0, 0]
 
     # 从远程服务器获取最新版本信息
-    response = requests.get(
-        "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/blob/main/res/version.json"
-    )
-    version_remote = response.json()
-    main_version_remote = list(map(int, version_remote["main_version"].split(".")))
+    for _ in range(3):
+        try:
+            response = requests.get(
+                "https://gitee.com/DLmaster_361/AUTO_MAA/raw/main/res/version.json"
+            )
+            version_remote = response.json()
+            main_version_remote = list(
+                map(int, version_remote["main_version"].split("."))
+            )
+            break
+        except Exception as e:
+            err = e
+            time.sleep(0.1)
+    else:
+        sys.exit(f"获取版本信息时出错：\n{err}")
 
     # 启动更新线程
     if main_version_remote > main_version_current:
         app = AUTO_MAA_Updater(
             app_path,
             "AUTO_MAA主程序",
-            version_remote["main_download_url"],
-            version_remote["main_version"],
+            main_version_remote,
+            "",
         )
         sys.exit(app.exec())

gui/ui/main.ui

@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_13">
    <item>
-    <widget class="QTabWidget" name="tabWidget">
+    <widget class="QTabWidget" name="tabWidget_main">
      <property name="currentIndex">
       <number>0</number>
      </property>
@@ -59,13 +59,6 @@
               </property>
              </widget>
             </item>
-            <item>
-             <widget class="QPushButton" name="pushButton_changeset">
-              <property name="text">
-               <string>修改配置</string>
-              </property>
-             </widget>
-            </item>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
@@ -106,7 +99,7 @@
                <x>0</x>
                <y>0</y>
                <width>1156</width>
-               <height>546</height>
+               <height>542</height>
               </rect>
              </property>
              <attribute name="label">
@@ -919,6 +912,12 @@
                  <height>0</height>
                 </size>
                </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1024</number>
+               </property>
               </widget>
              </item>
              <item>
@@ -968,6 +967,12 @@
                  <height>0</height>
                 </size>
                </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1024</number>
+               </property>
               </widget>
              </item>
              <item>
@@ -1017,6 +1022,12 @@
                  <height>0</height>
                 </size>
                </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+               <property name="maximum">
+                <number>1024</number>
+               </property>
               </widget>
              </item>
              <item>
@@ -1037,84 +1048,7 @@
          <property name="title">
           <string>AUTO_MAA设置</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,1,1,1">
-          <item row="0" column="0">
-           <widget class="QFrame" name="frame_routine_3">
-            <property name="frameShape">
-             <enum>QFrame::Shape::StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Shadow::Raised</enum>
-            </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_19">
-             <item>
-              <widget class="QCheckBox" name="checkBox_ifselfstart">
-               <property name="text">
-                <string>开机自动启动AUTO_MAA</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_14">
-               <property name="orientation">
-                <enum>Qt::Orientation::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <spacer name="horizontalSpacer_6">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="0" column="2">
-           <widget class="QFrame" name="frame_routine_2">
-            <property name="frameShape">
-             <enum>QFrame::Shape::StyledPanel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Shadow::Raised</enum>
-            </property>
-            <layout class="QHBoxLayout" name="horizontalLayout_18">
-             <item>
-              <widget class="QCheckBox" name="checkBox_ifsleep">
-               <property name="text">
-                <string>AUTO_MAA启动时禁止电脑休眠</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <spacer name="horizontalSpacer_13">
-               <property name="orientation">
-                <enum>Qt::Orientation::Horizontal</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>20</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
+         <layout class="QGridLayout" name="gridLayout_3">
           <item row="0" column="3">
            <spacer name="horizontalSpacer_7">
             <property name="orientation">
@@ -1128,6 +1062,136 @@
             </property>
            </spacer>
           </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QFrame" name="frame_routine_5">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_22" stretch="0,1,3">
+             <item>
+              <widget class="QCheckBox" name="checkBox_silence">
+               <property name="text">
+                <string>后台静默代理</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_16">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="lineEdit_boss">
+               <property name="placeholderText">
+                <string>安卓模拟器老板键</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <spacer name="horizontalSpacer_11">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>231</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="2" column="2" colspan="2">
+           <widget class="QFrame" name="frame_routine_6">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_26" stretch="0,1,3,0">
+             <item>
+              <widget class="QCheckBox" name="checkBox_ifsendmail">
+               <property name="text">
+                <string>通过邮件通知结果</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_24">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QLineEdit" name="lineEdit_mailaddress">
+               <property name="placeholderText">
+                <string>收信邮箱地址</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="checkBox_ifonlyerror">
+               <property name="text">
+                <string>仅推送异常信息</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QFrame" name="frame_iftotray">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_23">
+             <item>
+              <widget class="QCheckBox" name="checkBox_iftotray">
+               <property name="text">
+                <string>最小化到托盘</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_17">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>149</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
           <item row="1" column="0">
            <widget class="QFrame" name="frame_routine_4">
             <property name="frameShape">
@@ -1160,20 +1224,168 @@
             </layout>
            </widget>
           </item>
-          <item row="1" column="1">
-           <spacer name="horizontalSpacer_11">
+          <item row="3" column="1">
+           <spacer name="horizontalSpacer_23">
             <property name="orientation">
              <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>231</width>
+              <width>32</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
-          <item row="1" column="2">
+          <item row="0" column="0">
+           <widget class="QFrame" name="frame_routine_3">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_19">
+             <item>
+              <widget class="QCheckBox" name="checkBox_ifselfstart">
+               <property name="text">
+                <string>开机自动启动AUTO_MAA</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_14">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="QFrame" name="frame_routine_2">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_18">
+             <item>
+              <widget class="QCheckBox" name="checkBox_ifsleep">
+               <property name="text">
+                <string>AUTO_MAA启动时禁止电脑休眠</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_13">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <spacer name="horizontalSpacer_12">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>311</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="0" column="1">
+           <spacer name="horizontalSpacer_6">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="0">
+           <widget class="QFrame" name="frame_changePASSWORD">
+            <property name="frameShape">
+             <enum>QFrame::Shape::StyledPanel</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Shadow::Raised</enum>
+            </property>
+            <layout class="QHBoxLayout" name="horizontalLayout_25">
+             <item>
+              <spacer name="horizontalSpacer_21">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushButton_changePASSWORD">
+               <property name="text">
+                <string>修改管理密钥</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="horizontalSpacer_22">
+               <property name="orientation">
+                <enum>Qt::Orientation::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="3" column="3">
+           <spacer name="horizontalSpacer_25">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>20</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+          <item row="3" column="2">
            <widget class="QFrame" name="frame_check_update">
             <property name="frameShape">
              <enum>QFrame::Shape::StyledPanel</enum>
@@ -1218,35 +1430,6 @@
             </layout>
            </widget>
           </item>
-          <item row="1" column="3">
-           <spacer name="horizontalSpacer_12">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>311</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_5">
-         <property name="title">
-          <string>管理密钥</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QPushButton" name="pushButton_changePASSWORD">
-            <property name="text">
-             <string>修改管理密钥</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -1272,15 +1455,13 @@ li.checked::marker { content: &quot;\2612&quot;; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       对于B服用户，由于我们无权替您同意用户协议，若出现用户协议弹窗，您需要自行完成确认，否则可能造成MAA卡死，代理任务失败。&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       老用户请务必备份原有数据，此次更新的代码改动较大，可能有数据遗失的风险。&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       由于用户与项目贡献者的稀缺，我们无法确保正式版足够完善，还望谅解。遇到问题时，请先更新到最新版本试试。若仍无法解决，请在官方仓库发布Issues求助。&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       由于用户与项目贡献者的稀缺，我们无法确保正式版足够完善，还望谅解。&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       官方仓库：&lt;a href=&quot;https://github.com/DLmaster361/AUTO_MAA/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#004194;&quot;&gt;DLmaster361/AUTO_MAA&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       当遇到严重漏洞，请先确保当前为最新版本。&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       官方QQ交流群：&lt;a href=&quot;https://qm.qq.com/cgi-bin/qm/qr?k=EET-OL_o52KPlDLEmbzaNkKUXuyQ4WZY&amp;amp;jump_from=webapi&amp;amp;authKey=6NxGwEu9JAOLHqfdEmNfrZy4tUvC/3ar2j5+Go7Hgf3j+ntAK1VS6SUOLOjYVKTt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#004194;&quot;&gt;957750551&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       您还可以通过官方仓库 &lt;a href=&quot;https://github.com/DLmaster361/AUTO_MAA/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007ad6;&quot;&gt;DLmaster361/AUTO_MAA&lt;/span&gt;&lt;/a&gt; 发布Issues求助。&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       官方QQ交流群：957750551&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;       友情推荐项目：&lt;a href=&quot;https://git.zhaozuohong.vip/mower-ng&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#004194;&quot;&gt;zhaozuohong/mower-ng&lt;/span&gt;&lt;/a&gt; 、  &lt;a href=&quot;https://github.com/AegirTech/ArkLights&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#004194;&quot;&gt;AegirTech/ArkLights&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p align=&quot;right&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;DLmaster&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
@@ -1289,7 +1470,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
           <item>
            <widget class="QLabel" name="label_notice">
             <property name="text">
-             <string>注意：在用户管理页与设置页执行的所有更改，不会对正在执行的任务生效。</string>
+             <string>注意：在设置页执行的所有更改，不会对正在执行的任务生效；正在执行任务时，用户管理页无法编辑。</string>
             </property>
            </widget>
           </item>

gui/ui/updater.ui

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>500</width>
-    <height>61</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>AUTO_MAA更新器</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="progressBar">
-     <property name="value">
-      <number>24</number>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

package.py

@@ -38,29 +38,31 @@ def version_text(version_numb):
     return version
 
 
-with open("res/version.json", "r", encoding="utf-8") as f:
-    version = json.load(f)
+if __name__ == "__main__":
 
-main_version_numb = list(map(int, version["main_version"].split(".")))
-updater_version_numb = list(map(int, version["updater_version"].split(".")))
+    with open("res/version.json", "r", encoding="utf-8") as f:
+        version = json.load(f)
 
-main_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in main_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["main_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'AUTO_MAA.py'),\n        StringStruct('ProductName', 'AUTO_MAA'),\n        StringStruct('ProductVersion', 'v{version["main_version"]}'),\n        StringStruct('Assembly Version', 'v{version["main_version"]}')])\n      ])\n  ]\n)"
-updater_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in updater_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["updater_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA_Updater'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'Updater.py'),\n        StringStruct('ProductName', 'AUTO_MAA_Updater'),\n        StringStruct('ProductVersion', 'v{version["updater_version"]}'),\n        StringStruct('Assembly Version', 'v{version["updater_version"]}')])\n      ])\n  ]\n)"
+    main_version_numb = list(map(int, version["main_version"].split(".")))
+    updater_version_numb = list(map(int, version["updater_version"].split(".")))
 
-with open("AUTO_MAA_info.txt", "w", encoding="utf-8") as f:
-    print(main_info, end="", file=f)
-with open("Updater_info.txt", "w", encoding="utf-8") as f:
-    print(updater_info, end="", file=f)
+    main_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in main_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["main_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'AUTO_MAA.py'),\n        StringStruct('ProductName', 'AUTO_MAA'),\n        StringStruct('ProductVersion', 'v{version["main_version"]}'),\n        StringStruct('Assembly Version', 'v{version["main_version"]}')])\n      ])\n  ]\n)"
+    updater_info = f"# UTF-8\n#\nVSVersionInfo(\n  ffi=FixedFileInfo(\n    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)\n    # Set not needed items to zero 0.\n    filevers=({', '.join(str(_) for _ in updater_version_numb)}),\n    prodvers=(0, 0, 0, 0),\n    # Contains a bitmask that specifies the valid bits 'flags'r\n    mask=0x3f,\n    # Contains a bitmask that specifies the Boolean attributes of the file.\n    flags=0x0,\n    # The operating system for which this file was designed.\n    # 0x4 - NT and there is no need to change it.\n    OS=0x4,\n    # The general type of file.\n    # 0x1 - the file is an application.\n    fileType=0x1,\n    # The function of the file.\n    # 0x0 - the function is not defined for this fileType\n    subtype=0x0,\n    # Creation date and time stamp.\n    date=(0, 0)\n    ),\n  kids=[\n    VarFileInfo([VarStruct('Translation', [0, 1200])]), \n    StringFileInfo(\n      [\n      StringTable(\n        '000004b0',\n        [StringStruct('Comments', 'https://github.com/DLmaster361/AUTO_MAA/'),\n        StringStruct('CompanyName', 'AUTO_MAA Team'),\n        StringStruct('FileDescription', 'AUTO_MAA Component'),\n        StringStruct('FileVersion', '{version["updater_version"]}'),\n        StringStruct('InternalName', 'AUTO_MAA_Updater'),\n        StringStruct('LegalCopyright', 'Copyright © 2024 DLmaster361'),\n        StringStruct('OriginalFilename', 'Updater.py'),\n        StringStruct('ProductName', 'AUTO_MAA_Updater'),\n        StringStruct('ProductVersion', 'v{version["updater_version"]}'),\n        StringStruct('Assembly Version', 'v{version["updater_version"]}')])\n      ])\n  ]\n)"
 
-os.system(
-    "pyinstaller -F --version-file AUTO_MAA_info.txt -w --icon=gui/ico/AUTO_MAA.ico AUTO_MAA.py --hidden-import plyer.platforms.win.notification"
-)
-os.system(
-    "pyinstaller -F --version-file Updater_info.txt -w --icon=gui/ico/AUTO_MAA_Updater.ico Updater.py"
-)
+    with open("AUTO_MAA_info.txt", "w", encoding="utf-8") as f:
+        print(main_info, end="", file=f)
+    with open("Updater_info.txt", "w", encoding="utf-8") as f:
+        print(updater_info, end="", file=f)
 
-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"]}",
-        file=f,
+    os.system(
+        "pyinstaller -F --version-file AUTO_MAA_info.txt -w --icon=gui/ico/AUTO_MAA.ico AUTO_MAA.py --hidden-import plyer.platforms.win.notification"
     )
+    os.system(
+        "pyinstaller -F --version-file Updater_info.txt -w --icon=gui/ico/AUTO_MAA_Updater.ico 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"]}",
+            file=f,
+        )

requirements.txt

@@ -1,5 +1,8 @@
 plyer
 PySide6
+psutil
+pywin32
+pyautogui
 pycryptodome
 pyinstaller
 requests

res/set.txt

@@ -37,4 +37,6 @@
 "Start.RunDirectly": "True"        #启动MAA后直接运行
 "Start.MinimizeDirectly": "True"        #启动MAA后直接最小化
 "Start.OpenEmulatorAfterLaunch": "True"        #启动MAA后自动开启模拟器
-"Start.MinimizingStartup": "True"        #最小化启动模拟器
+"GUI.UseTray": "True"        #显示托盘图标
+"GUI.MinimizeToTray": "False"        #最小化时隐藏至托盘
+"Start.EmulatorPath"        #模拟器路径

res/version.json

@@ -1,7 +1,14 @@
 {
-    "main_version": "4.1.2.1",
-    "main_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.2_beta/AUTO_MAA_v4.1.2_beta.zip",
-    "updater_version": "1.0.4.0",
-    "updater_download_url": "https://ghp.ci/https://github.com/DLmaster361/AUTO_MAA/releases/download/v4.1.2_beta/Updater_v1.0.4.zip",
-    "announcement": "\n## 新增功能\n- 记忆窗口位置\n## 修复BUG\n- 暂无\n## 程序优化\n- 暂无"
+    "main_version": "4.1.4.0",
+    "updater_version": "1.0.5.2",
+    "announcement": "\n## 新增功能\n- 添加托盘中止当前任务选项\n- 添加邮件仅推送异常信息选项\n- 后台静默代理功能上线\n## 修复BUG\n- 修复深色模式下UI异常 #10\n- 同步MAA`启动MAA后直接最小化`字段修改\n## 程序优化\n- MainTimer逻辑实现优化\n- 修改配置方法优化\n- 代理逻辑优化\n- 更新器添加更多代理地址，更新流程优化，可获取远端代理地址\n- 路径跨平台适配",
+    "proxy_list":[
+        "",
+        "https://gitproxy.click/",
+        "https://cdn.moran233.xyz/",
+        "https://gh.llkk.cc/",
+        "https://github.akams.cn/",
+        "https://www.ghproxy.cn/",
+        "https://ghp.ci/"
+    ]
 }