test: 移除测试ci

Co-authored-by: DLmaster361 <DLmaster_361@163.com>

.github/workflows/build-app.yml

@@ -77,13 +77,23 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: AUTO_MAA_${{ env.AUTO_MAA_version }}
-          path: |
+          path: AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
-            AUTO_MAA_${{ env.AUTO_MAA_version }}.zip
       - name: Upload Version_Info Artifact
         uses: actions/upload-artifact@v4
         with:
           name: version_info
           path: version_info.txt
+      - name: Compile Inno Setup Script
+        run: |
+          choco install innosetup
+          echo "C:\Program Files (x86)\Inno Setup 6" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          Expand-Archive -Path AUTO_MAA_${{ env.AUTO_MAA_version }}.zip -DestinationPath AUTO_MAA -Force
+          ISCC.exe "AUTO_MAA.iss"
+      - name: Upload Setup Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: AUTO_MAA_Setup
+          path: AUTO_MAA-Setup.exe
   publish_release:
     name: Publish release
     needs: build_AUTO_MAA
@@ -126,27 +136,3 @@ jobs:
           gh workflow run --repo $GITHUB_REPOSITORY mirrorchyan_release_note
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Setup SSH Key
-        run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts
-      - name: Upload Release to Server
-        run: |
-          scp -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/home/user/files/AUTO_MAA/
-      - name: Install obsutil
-        run: |
-          wget https://obs-community.obs.cn-north-1.myhuaweicloud.com/obsutil/current/obsutil_linux_amd64.tar.gz
-          tar -xzvf obsutil_linux_amd64.tar.gz --strip-components=1
-          chmod 755 obsutil
-          ./obsutil version
-      - name: Upload Release to Huawei OBS
-        env:
-          OBS_AK: ${{ secrets.OBS_AK }}
-          OBS_SK: ${{ secrets.OBS_SK }}
-          OBS_ENDPOINT: ${{ secrets.OBS_ENDPOINT }}
-          OBS_BUCKET: ${{ secrets.OBS_BUCKET }}
-        run: |
-          ./obsutil config -i $OBS_AK -k $OBS_SK -e $OBS_ENDPOINT
-          ./obsutil cp artifacts/ obs://$OBS_BUCKET/releases/ -r -f

README.md

@@ -1,21 +1,20 @@
-# AUTO_MAA
+<h1 align="center">AUTO_MAA</h1>
-
+<p align="center">
-MAA多账号管理与自动化软件
+  MAA多账号管理与自动化软件<br><br>
-
+  <img alt="软件图标" src="https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png">
-!["软件图标"](https://github.com/DLmaster361/AUTO_MAA/blob/main/resources/images/AUTO_MAA.png "软件图标")
+</p>
 
 ---
 
-</h1>
+<p align="center">
-
+  <a href="https://github.com/DLmaster361/AUTO_MAA/stargazers"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/DLmaster361/AUTO_MAA?style=flat-square"></a>
-[![GitHub Stars](https://img.shields.io/github/stars/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/stargazers)
+  <a href="https://github.com/DLmaster361/AUTO_MAA/network"><img alt="GitHub Forks" src="https://img.shields.io/github/forks/DLmaster361/AUTO_MAA?style=flat-square"></a>
-[![GitHub Forks](https://img.shields.io/github/forks/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/network)
+  <a href="https://github.com/DLmaster361/AUTO_MAA/releases/latest"><img alt="GitHub Downloads" src="https://img.shields.io/github/downloads/DLmaster361/AUTO_MAA/total?style=flat-square"></a>
-[![GitHub Downloads](https://img.shields.io/github/downloads/DLmaster361/AUTO_MAA/total?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/releases/latest)
+  <a href="https://github.com/DLmaster361/AUTO_MAA/issues"><img alt="GitHub Issues" src="https://img.shields.io/github/issues/DLmaster361/AUTO_MAA?style=flat-square"></a>
-[![GitHub Issues](https://img.shields.io/github/issues/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/issues)
+  <a href="https://github.com/DLmaster361/AUTO_MAA/graphs/contributors"><img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/DLmaster361/AUTO_MAA?style=flat-square"></a>
-[![GitHub Contributors](https://img.shields.io/github/contributors/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/graphs/contributors)
+  <a href="https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE"><img alt="GitHub License" src="https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square"></a>
-[![GitHub License](https://img.shields.io/github/license/DLmaster361/AUTO_MAA?style=flat-square)](https://github.com/DLmaster361/AUTO_MAA/blob/main/LICENSE)
+  <a href="https://mirrorchyan.com/zh/projects?rid=AUTO_MAA"><img alt="mirrorc" src="https://img.shields.io/badge/Mirror%E9%85%B1-%239af3f6?logo=countingworkspro&logoColor=4f46e5"></a>
-[![mirrorc](https://img.shields.io/badge/Mirror%E9%85%B1-%239af3f6?logo=countingworkspro&logoColor=4f46e5)](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA)
+</p>
-</div>
 
 ## 软件介绍
 

app/core/config.py

@@ -103,6 +103,9 @@ class GlobalConfig(QConfig):
             "Function", "IfSilence", False, BoolValidator()
         )
         self.function_BossKey = ConfigItem("Function", "BossKey", "")
+        self.function_UnattendedMode = ConfigItem(
+            "Function", "UnattendedMode", False, BoolValidator()
+        )
         self.function_IfAgreeBilibili = ConfigItem(
             "Function", "IfAgreeBilibili", False, BoolValidator()
         )
@@ -529,7 +532,12 @@ class MaaUserConfig(QConfig):
         self.Info_MedicineNumb = ConfigItem(
             "Info", "MedicineNumb", 0, RangeValidator(0, 1024)
         )
-        self.Info_SeriesNumb = ConfigItem("Info", "SeriesNumb", 1, RangeValidator(1, 6))
+        self.Info_SeriesNumb = OptionsConfigItem(
+            "Info",
+            "SeriesNumb",
+            "1",
+            OptionsValidator(["1000", "6", "5", "4", "3", "2", "1", "-1"]),
+        )
         self.Info_GameId = ConfigItem("Info", "GameId", "-")
         self.Info_GameId_1 = ConfigItem("Info", "GameId_1", "-")
         self.Info_GameId_2 = ConfigItem("Info", "GameId_2", "-")
@@ -614,7 +622,7 @@ class MaaUserConfig(QConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.3.5.0"
+    VERSION = "4.3.6.0"
 
     gameid_refreshed = Signal()
     PASSWORD_refreshed = Signal()
@@ -633,6 +641,7 @@ class AppConfig(GlobalConfig):
         self.gameid_path = self.app_path / "data/gameid.txt"
         self.version_path = self.app_path / "resources/version.json"
 
+        self.main_window = None
         self.PASSWORD = ""
         self.running_list = []
         self.silence_list = []

app/core/main_info_bar.py

@@ -29,17 +29,15 @@ from loguru import logger
 from PySide6.QtCore import Qt
 from qfluentwidgets import InfoBar, InfoBarPosition
 
+from .config import Config
+
 
 class _MainInfoBar:
     """信息通知栏"""
 
-    def __init__(self, main_window=None):
-
-        self.main_window = main_window
-
     def push_info_bar(self, mode: str, title: str, content: str, time: int):
         """推送到信息通知栏"""
-        if self.main_window is None:
+        if Config.main_window is None:
             logger.error("信息通知栏未设置父窗口")
             return None
 
@@ -61,7 +59,7 @@ class _MainInfoBar:
                 isClosable=True,
                 position=InfoBarPosition.TOP_RIGHT,
                 duration=time,
-                parent=self.main_window,
+                parent=Config.main_window,
             )
         else:
             logger.error(f"未知的通知栏模式: {mode}")

app/core/task_manager.py

@@ -173,10 +173,9 @@ class _TaskManager(QObject):
     create_gui = Signal(Task)
     connect_gui = Signal(Task)
 
-    def __init__(self, main_window=None):
+    def __init__(self):
         super(_TaskManager, self).__init__()
 
-        self.main_window = main_window
         self.task_dict: Dict[str, Task] = {}
 
     def add_task(
@@ -279,7 +278,7 @@ class _TaskManager(QObject):
                 }
 
                 choice = ProgressRingMessageBox(
-                    self.main_window,
+                    Config.main_window,
                     f"{mode_book[Config.queue_dict[name]["Config"].get(Config.queue_dict[name]["Config"].queueSet_AfterAccomplish)]}倒计时",
                 )
                 if choice.exec():
@@ -325,7 +324,7 @@ class _TaskManager(QObject):
     def push_dialog(self, name: str, title: str, content: str):
         """推送对话框"""
 
-        choice = MessageBox(title, content, self.main_window)
+        choice = MessageBox(title, content, Config.main_window)
         choice.yesButton.setText("是")
         choice.cancelButton.setText("否")
 

app/core/timer.py

@@ -55,6 +55,9 @@ class _MainTimer(QWidget):
         """长时间定期检定任务"""
 
         Config.get_gameid()
+        Config.main_window.setting.show_notice()
+        if Config.get(Config.update_IfAutoUpdate):
+            Config.main_window.setting.check_update()
 
     def timed_start(self):
         """定时启动代理任务"""

app/models/MAA.py

@@ -92,6 +92,7 @@ class MaaManager(QObject):
 
         self.maa_version = None
         self.maa_update_package = ""
+        self.task_dict = {}
         self.set = config["Config"].toDict()
 
         self.data = {}
@@ -264,6 +265,67 @@ class MaaManager(QObject):
                         ]
                     )
 
+                    # 解析任务构成
+                    if user_data["Info"]["Mode"] == "简洁":
+
+                        if mode == "Annihilation":
+                            self.task_dict = {
+                                "WakeUp": "True",
+                                "Recruiting": "False",
+                                "Base": "False",
+                                "Combat": "True",
+                                "Mission": "False",
+                                "Mall": "False",
+                                "AutoRoguelike": "False",
+                                "Reclamation": "False",
+                            }
+
+                        elif mode == "Routine":
+                            self.task_dict = {
+                                "WakeUp": "True",
+                                "Recruiting": "True",
+                                "Base": "True",
+                                "Combat": "True",
+                                "Mission": "True",
+                                "Mall": "True",
+                                "AutoRoguelike": "False",
+                                "Reclamation": "False",
+                            }
+
+                    elif user_data["Info"]["Mode"] == "详细":
+
+                        with (self.data[user[2]]["Path"] / f"{mode}/gui.json").open(
+                            mode="r", encoding="utf-8"
+                        ) as f:
+                            data = json.load(f)
+
+                        self.task_dict = {
+                            "WakeUp": data["Configurations"]["Default"][
+                                "TaskQueue.WakeUp.IsChecked"
+                            ],
+                            "Recruiting": data["Configurations"]["Default"][
+                                "TaskQueue.Recruiting.IsChecked"
+                            ],
+                            "Base": data["Configurations"]["Default"][
+                                "TaskQueue.Base.IsChecked"
+                            ],
+                            "Combat": data["Configurations"]["Default"][
+                                "TaskQueue.Combat.IsChecked"
+                            ],
+                            "Mission": data["Configurations"]["Default"][
+                                "TaskQueue.Mission.IsChecked"
+                            ],
+                            "Mall": data["Configurations"]["Default"][
+                                "TaskQueue.Mall.IsChecked"
+                            ],
+                            "AutoRoguelike": data["Configurations"]["Default"][
+                                "TaskQueue.AutoRoguelike.IsChecked"
+                            ],
+                            "Reclamation": data["Configurations"]["Default"][
+                                "TaskQueue.Reclamation.IsChecked"
+                            ],
+                        }
+
                     # 尝试次数循环
                     for i in range(self.set["RunSet"]["RunTimesLimit"]):
 
@@ -402,10 +464,13 @@ class MaaManager(QObject):
                                 mode="r", encoding="utf-8"
                             ) as f:
                                 data = json.load(f)
+
+                            # 记录自定义基建索引
                             user_data["Data"]["CustomInfrastPlanIndex"] = data[
                                 "Configurations"
                             ]["Default"]["Infrast.CustomInfrastPlanIndex"]
 
+                            # 记录更新包路径
                             if (
                                 data["Global"]["VersionUpdate.package"]
                                 and (
@@ -451,6 +516,8 @@ class MaaManager(QObject):
                                 mode="r", encoding="utf-8"
                             ) as f:
                                 data = json.load(f)
+
+                            # 记录更新包路径
                             if (
                                 data["Global"]["VersionUpdate.package"]
                                 and (
@@ -871,26 +938,53 @@ class MaaManager(QObject):
             else:
                 self.weekly_annihilation_limit_reached = False
 
-            if mode == "自动代理_日常" and "任务出错: Fight" in log:
+            if "任务出错: StartUp" in log:
-                self.maa_result = "MAA未能实际执行任务"
-            elif "任务出错: StartUp" in log:
                 self.maa_result = "MAA未能正确登录PRTS"
+
             elif "任务已全部完成！" in log:
-                self.maa_result = "Success!"
+
+                if "完成任务: StartUp" in log:
+                    self.task_dict["WakeUp"] = "False"
+                if "完成任务: Recruit" in log:
+                    self.task_dict["Recruiting"] = "False"
+                if "完成任务: Infrast" in log:
+                    self.task_dict["Base"] = "False"
+                if "完成任务: Fight" in log or "剿灭任务失败" in log:
+                    self.task_dict["Combat"] = "False"
+                if "完成任务: Mall" in log:
+                    self.task_dict["Mall"] = "False"
+                if "完成任务: Award" in log:
+                    self.task_dict["Mission"] = "False"
+                if "完成任务: Roguelike" in log:
+                    self.task_dict["AutoRoguelike"] = "False"
+                if "完成任务: Reclamation" in log:
+                    self.task_dict["Reclamation"] = "False"
+
+                if all(v == "False" for v in self.task_dict.values()):
+                    self.maa_result = "Success!"
+                else:
+                    self.maa_result = "MAA部分任务执行失败"
+
             elif "请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log:
                 self.maa_result = "MAA的ADB连接异常"
+
             elif "未检测到任何模拟器" in log:
                 self.maa_result = "MAA未检测到任何模拟器"
+
             elif "已停止" in log:
                 self.maa_result = "MAA在完成任务前中止"
+
             elif "MaaAssistantArknights GUI exited" in log:
                 self.maa_result = "MAA在完成任务前退出"
+
             elif datetime.now() - latest_time > timedelta(
                 minutes=self.set["RunSet"][time_book[mode]]
             ):
                 self.maa_result = "MAA进程超时"
+
             elif self.isInterruptionRequested:
                 self.maa_result = "任务被手动中止"
+
             else:
                 self.maa_result = "Wait"
 
@@ -1071,8 +1165,35 @@ class MaaManager(QObject):
                     "Info"
                 ]["Id"]
 
+            # 按预设设定任务
+            data["Configurations"]["Default"]["TaskQueue.Recruiting.IsChecked"] = (
+                self.task_dict["Recruiting"]
+            )  # 自动公招
+            data["Configurations"]["Default"]["TaskQueue.Base.IsChecked"] = (
+                self.task_dict["Base"]
+            )  # 基建换班
+            data["Configurations"]["Default"]["TaskQueue.Combat.IsChecked"] = (
+                self.task_dict["Combat"]
+            )  # 刷理智
+            data["Configurations"]["Default"]["TaskQueue.Mission.IsChecked"] = (
+                self.task_dict["Mission"]
+            )  # 领取奖励
+            data["Configurations"]["Default"]["TaskQueue.Mall.IsChecked"] = (
+                self.task_dict["Mall"]
+            )  # 获取信用及购物
+            data["Configurations"]["Default"]["TaskQueue.AutoRoguelike.IsChecked"] = (
+                self.task_dict["AutoRoguelike"]
+            )  # 自动肉鸽
+            data["Configurations"]["Default"]["TaskQueue.Reclamation.IsChecked"] = (
+                self.task_dict["Reclamation"]
+            )  # 生息演算
+
             if user_data["Info"]["Mode"] == "简洁":
 
+                data["Configurations"]["Default"][
+                    "TaskQueue.WakeUp.IsChecked"
+                ] = "True"  # 开始唤醒
+
                 data["Configurations"]["Default"]["Start.ClientType"] = user_data[
                     "Info"
                 ][
@@ -1091,30 +1212,6 @@ class MaaManager(QObject):
 
                 if "剿灭" in mode:
 
-                    data["Configurations"]["Default"][
-                        "TaskQueue.WakeUp.IsChecked"
-                    ] = "True"  # 开始唤醒
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Recruiting.IsChecked"
-                    ] = "False"  # 自动公招
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Base.IsChecked"
-                    ] = "False"  # 基建换班
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Combat.IsChecked"
-                    ] = "True"  # 刷理智
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Mission.IsChecked"
-                    ] = "False"  # 领取奖励
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Mall.IsChecked"
-                    ] = "False"  # 获取信用及购物
-                    data["Configurations"]["Default"][
-                        "TaskQueue.AutoRoguelike.IsChecked"
-                    ] = "False"  # 自动肉鸽
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Reclamation.IsChecked"
-                    ] = "False"  # 生息演算
                     data["Configurations"]["Default"][
                         "MainFunction.Stage1"
                     ] = "Annihilation"  # 主关卡
@@ -1151,31 +1248,6 @@ class MaaManager(QObject):
 
                 elif "日常" in mode:
 
-                    data["Configurations"]["Default"][
-                        "TaskQueue.WakeUp.IsChecked"
-                    ] = "True"  # 开始唤醒
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Recruiting.IsChecked"
-                    ] = "True"  # 自动公招
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Base.IsChecked"
-                    ] = "True"  # 基建换班
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Combat.IsChecked"
-                    ] = "True"  # 刷理智
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Mission.IsChecked"
-                    ] = "True"  # 领取奖励
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Mall.IsChecked"
-                    ] = "True"  # 获取信用及购物
-                    data["Configurations"]["Default"][
-                        "TaskQueue.AutoRoguelike.IsChecked"
-                    ] = "False"  # 自动肉鸽
-                    data["Configurations"]["Default"][
-                        "TaskQueue.Reclamation.IsChecked"
-                    ] = "False"  # 生息演算
-
                     data["Configurations"]["Default"]["MainFunction.UseMedicine"] = (
                         "False" if user_data["Info"]["MedicineNumb"] == 0 else "True"
                     )  # 吃理智药
@@ -1206,9 +1278,9 @@ class MaaManager(QObject):
                     )  # 剩余理智关卡
                     data["Configurations"]["Default"][
                         "MainFunction.Series.Quantity"
-                    ] = str(
+                    ] = user_data["Info"][
-                        user_data["Info"]["SeriesNumb"]
+                        "SeriesNumb"
-                    )  # 连战次数
+                    ]  # 连战次数
                     data["Configurations"]["Default"][
                         "Penguin.IsDrGrandet"
                     ] = "False"  # 博朗台模式
@@ -1310,9 +1382,9 @@ class MaaManager(QObject):
                     )  # 剩余理智关卡
                     data["Configurations"]["Default"][
                         "MainFunction.Series.Quantity"
-                    ] = str(
+                    ] = user_data["Info"][
-                        user_data["Info"]["SeriesNumb"]
+                        "SeriesNumb"
-                    )  # 连战次数
+                    ]  # 连战次数
                     data["Configurations"]["Default"][
                         "GUI.UseAlternateStage"
                     ] = "True"  # 备选关卡
@@ -1320,6 +1392,17 @@ class MaaManager(QObject):
                         "Fight.UseRemainingSanityStage"
                     ] = "True"  # 使用剩余理智
 
+                    # 基建模式
+                    if (
+                        data["Configurations"]["Default"]["Infrast.InfrastMode"]
+                        == "Custom"
+                    ):
+                        data["Configurations"]["Default"][
+                            "Infrast.CustomInfrastPlanIndex"
+                        ] = user_data["Data"][
+                            "CustomInfrastPlanIndex"
+                        ]  # 自定义基建配置索引
+
         # 人工排查配置
         elif "人工排查" in mode:
 

app/services/notification.py

@@ -37,9 +37,6 @@ from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
 from email.utils import formataddr
-
-from serverchan_sdk import sc_send
-
 from app.core import Config
 from app.services.security import Crypto
 
@@ -143,76 +140,91 @@ class Notification(QWidget):
                 self.push_info_bar.emit("error", "发送邮件时出错", f"{e}", -1)
 
     def ServerChanPush(self, title, content):
-        """使用Server酱推送通知"""
+        """使用Server酱推送通知（支持 tag 和 channel，避免使用SDK）"""
-
         if Config.get(Config.notify_IfServerChan):
+            send_key = Config.get(Config.notify_ServerChanKey)
 
-            if Config.get(Config.notify_ServerChanKey) == "":
+            if not send_key:
                 logger.error("请正确设置Server酱的SendKey")
                 self.push_info_bar.emit(
-                    "error",
+                    "error", "Server酱通知推送异常", "请正确设置Server酱的SendKey", -1
-                    "Server酱通知推送异常",
-                    "请正确设置Server酱的SendKey",
-                    -1,
                 )
                 return None
-            else:
-                send_key = Config.get(Config.notify_ServerChanKey)
 
-            option = {}
+            try:
-            is_valid = lambda s: s == "" or (
+                # 构造 URL
-                s == "|".join(s.split("|")) and (s.count("|") == 0 or all(s.split("|")))
+                if send_key.startswith("sctp"):
-            )
+                    match = re.match(r"^sctp(\d+)t", send_key)
-            """
+                    if match:
-            is_valid => True, 如果启用的话需要正确设置Tag和Channel。
+                        url = f"https://{match.group(1)}.push.ft07.com/send/{send_key}.send"
-            允许空的Tag和Channel即不启用，但不允许例如a||b，|a|b，a|b|，||||
+                    else:
-            """
+                        raise ValueError("SendKey 格式错误（sctp）")
-            send_tag = "|".join(
+                else:
-                _.strip() for _ in Config.get(Config.notify_ServerChanTag).split("|")
+                    url = f"https://sctapi.ftqq.com/{send_key}.send"
-            )
-            send_channel = "|".join(
-                _.strip()
-                for _ in Config.get(Config.notify_ServerChanChannel).split("|")
-            )
 
-            if is_valid(send_tag):
+                # 构建 tags 和 channel
-                option["tags"] = send_tag
+                def is_valid(s):
-            else:
+                    return s == "" or (
-                option["tags"] = ""
+                        s == "|".join(s.split("|"))
-                logger.warning("请正确设置Auto_MAA中ServerChan的Tag。")
+                        and (s.count("|") == 0 or all(s.split("|")))
-                self.push_info_bar.emit(
+                    )
-                    "warning",
+
-                    "Server酱通知推送异常",
+                tags = "|".join(
-                    "请正确设置Auto_MAA中ServerChan的Tag。",
+                    _.strip()
-                    -1,
+                    for _ in Config.get(Config.notify_ServerChanTag).split("|")
+                )
+                channels = "|".join(
+                    _.strip()
+                    for _ in Config.get(Config.notify_ServerChanChannel).split("|")
                 )
 
-            if is_valid(send_channel):
+                options = {}
-                option["channel"] = send_channel
+                if is_valid(tags):
-            else:
+                    options["tags"] = tags
-                option["channel"] = ""
+                else:
-                logger.warning("请正确设置Auto_MAA中ServerChan的Channel。")
+                    logger.warning("Server酱 Tag 配置不正确，将被忽略")
-                self.push_info_bar.emit(
+                    self.push_info_bar.emit(
-                    "warning",
+                        "warning",
-                    "Server酱通知推送异常",
+                        "Server酱通知推送异常",
-                    "请正确设置Auto_MAA中ServerChan的Channel。",
+                        "请正确设置 ServerChan 的 Tag",
-                    -1,
+                        -1,
-                )
+                    )
 
-            response = sc_send(send_key, title, content, option)
+                if is_valid(channels):
-            if response["code"] == 0:
+                    options["channel"] = channels
-                logger.info("Server酱推送通知成功")
+                else:
-                return True
+                    logger.warning("Server酱 Channel 配置不正确，将被忽略")
-            else:
+                    self.push_info_bar.emit(
-                logger.info("Server酱推送通知失败")
+                        "warning",
-                logger.error(response)
+                        "Server酱通知推送异常",
+                        "请正确设置 ServerChan 的 Channel",
+                        -1,
+                    )
+
+                # 请求发送
+                params = {"title": title, "desp": content, **options}
+                headers = {"Content-Type": "application/json;charset=utf-8"}
+
+                response = requests.post(url, json=params, headers=headers, timeout=10)
+                result = response.json()
+
+                if result.get("code") == 0:
+                    logger.info("Server酱推送通知成功")
+                    return True
+                else:
+                    error_code = result.get("code", "-1")
+                    logger.error(f"Server酱通知推送失败：响应码：{error_code}")
+                    self.push_info_bar.emit(
+                        "error", "Server酱通知推送失败", f"响应码：{error_code}", -1
+                    )
+                    return f"Server酱通知推送失败：{error_code}"
+
+            except Exception as e:
+                logger.exception("Server酱通知推送异常")
                 self.push_info_bar.emit(
-                    "error",
+                    "error", "Server酱通知推送异常", f"请检查相关设置，如还有问题可联系开发者", -1
-                    "Server酱通知推送失败",
-                    f'使用Server酱推送通知时出错：\n{response["data"]['error']}',
-                    -1,
                 )
-                return f'使用Server酱推送通知时出错：\n{response["data"]['error']}'
+                return f"Server酱通知推送异常：{str(e)}"
 
     def CompanyWebHookBotPush(self, title, content):
         """使用企业微信群机器人推送通知"""

app/services/system.py

@@ -44,9 +44,7 @@ class _SystemHandler:
     ES_CONTINUOUS = 0x80000000
     ES_SYSTEM_REQUIRED = 0x00000001
 
-    def __init__(self, main_window: QWidget = None):
+    def __init__(self):
-
-        self.main_window = main_window
 
         self.set_Sleep()
         self.set_SelfStart()
@@ -112,7 +110,7 @@ class _SystemHandler:
 
             elif mode == "KillSelf":
 
-                self.main_window.close()
+                Config.main_window.close()
                 QApplication.quit()
 
         elif sys.platform.startswith("linux"):
@@ -138,7 +136,7 @@ class _SystemHandler:
 
             elif mode == "KillSelf":
 
-                self.main_window.close()
+                Config.main_window.close()
                 QApplication.quit()
 
     def is_startup(self) -> bool:

app/ui/main_window.py

@@ -26,7 +26,7 @@ v4.3
 """
 
 from loguru import logger
-from PySide6.QtWidgets import QSystemTrayIcon
+from PySide6.QtWidgets import QApplication, QSystemTrayIcon
 from qfluentwidgets import (
     qconfig,
     Action,
@@ -62,16 +62,22 @@ class AUTO_MAA(MSFluentWindow):
         super().__init__()
 
         self.setWindowIcon(QIcon(str(Config.app_path / "resources/icons/AUTO_MAA.ico")))
-        self.setWindowTitle("AUTO_MAA")
+
+        version_numb = list(map(int, Config.VERSION.split(".")))
+        version_text = (
+            f"v{'.'.join(str(_) for _ in version_numb[0:3])}"
+            if version_numb[3] == 0
+            else f"v{'.'.join(str(_) for _ in version_numb[0:3])}-beta.{version_numb[3]}"
+        )
+
+        self.setWindowTitle(f"AUTO_MAA - {version_text}")
 
         self.switch_theme()
 
         self.splashScreen = SplashScreen(self.windowIcon(), self)
         self.show_ui("显示主窗口", if_quick=True)
 
-        TaskManager.main_window = self.window()
+        Config.main_window = self.window()
-        MainInfoBar.main_window = self.window()
-        System.main_window = self.window()
 
         # 创建主窗口
         self.home = Home(self)
@@ -173,13 +179,19 @@ class AUTO_MAA(MSFluentWindow):
 
         # 退出主程序菜单项
         self.tray_menu.addAction(
-            Action(FluentIcon.POWER_BUTTON, "退出主程序", triggered=self.window().close)
+            Action(
+                FluentIcon.POWER_BUTTON,
+                "退出主程序",
+                triggered=lambda: (self.window().close(), QApplication.quit()),
+            )
         )
 
         # 设置托盘菜单
         self.tray.setContextMenu(self.tray_menu)
         self.tray.activated.connect(self.on_tray_activated)
 
+        self.set_min_method()
+
         Config.user_info_changed.connect(self.member_manager.refresh_dashboard)
         TaskManager.create_gui.connect(self.dispatch_center.add_board)
         TaskManager.connect_gui.connect(self.dispatch_center.connect_main_board)
@@ -255,11 +267,11 @@ class AUTO_MAA(MSFluentWindow):
             self.start_main_task()
 
         # 获取公告
-        self.setting.show_notice(if_show=False)
+        self.setting.show_notice(if_first=True)
 
         # 检查更新
         if Config.get(Config.update_IfAutoUpdate):
-            self.setting.check_update()
+            self.setting.check_update(if_first=True)
 
         # 直接最小化
         if Config.get(Config.start_IfMinimizeDirectly):
@@ -347,27 +359,37 @@ class AUTO_MAA(MSFluentWindow):
         if mode == "显示主窗口":
 
             # 配置主窗口
-            size = list(
+            if not self.window().isVisible():
-                map(
+                size = list(
-                    int,
+                    map(
-                    Config.get(Config.ui_size).split("x"),
+                        int,
+                        Config.get(Config.ui_size).split("x"),
+                    )
                 )
-            )
+                location = list(
-            location = list(
+                    map(
-                map(
+                        int,
-                    int,
+                        Config.get(Config.ui_location).split("x"),
-                    Config.get(Config.ui_location).split("x"),
+                    )
                 )
-            )
+                if self.window().isMaximized():
-            self.window().setGeometry(location[0], location[1], size[0], size[1])
+                    self.window().showNormal()
-            self.window().show()
+                self.window().setGeometry(location[0], location[1], size[0], size[1])
+                self.window().show()
+                if not if_quick:
+                    if Config.get(Config.ui_maximized):
+                        self.titleBar.maxBtn.click()
+                    self.show_ui("配置托盘")
+
+            if not any(
+                self.window().geometry().intersects(screen.availableGeometry())
+                for screen in QApplication.screens()
+            ):
+                self.window().showNormal()
+                self.window().setGeometry(100, 100, 1200, 700)
+
             self.window().raise_()
             self.window().activateWindow()
-            if not if_quick:
-                if Config.get(Config.ui_maximized):
-                    self.window().showMaximized()
-                self.set_min_method()
-                self.show_ui("配置托盘")
 
         elif mode == "配置托盘":
 
@@ -389,6 +411,7 @@ class AUTO_MAA(MSFluentWindow):
                     Config.ui_location,
                     f"{self.geometry().x()}x{self.geometry().y()}",
                 )
+
             Config.set(Config.ui_maximized, self.window().isMaximized())
             Config.save()
 

app/ui/member_manager.py

@@ -35,6 +35,7 @@ from PySide6.QtWidgets import (
     QTableWidgetItem,
     QHeaderView,
 )
+from PySide6.QtGui import QIcon
 from qfluentwidgets import (
     Action,
     Pivot,
@@ -314,68 +315,120 @@ class MemberManager(QWidget):
     def member_downloader(self):
         """脚本下载器"""
 
+        if not Config.get(Config.update_MirrorChyanCDK):
+
+            logger.warning("脚本下载器未设置CDK")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "未设置Mirror酱CDK",
+                "下载器依赖于Mirror酱，未设置CDK时无法使用",
+                5000,
+            )
+            return None
+
         choice = ComboBoxMessageBox(
             self.window(),
             "选择一个脚本类型以下载相应脚本",
             ["选择脚本类型"],
-            [["MAA"]],
+            [["MAA", "StarRailAssistant"]],
         )
         if choice.exec() and choice.input[0].currentIndex() != -1:
 
-            if choice.input[0].currentText() == "MAA":
+            app_name = choice.input[0].currentText()
 
-                (Config.app_path / "script/MAA").mkdir(parents=True, exist_ok=True)
+            (Config.app_path / f"script/{app_name}").mkdir(parents=True, exist_ok=True)
-                folder = QFileDialog.getExistingDirectory(
+            folder = QFileDialog.getExistingDirectory(
-                    self, "选择MAA下载目录", str(Config.app_path / "script/MAA")
+                self,
+                f"选择{app_name}下载目录",
+                str(Config.app_path / f"script/{app_name}"),
+            )
+            if not folder:
+                logger.warning(f"选择{app_name}下载目录时未选择文件夹")
+                MainInfoBar.push_info_bar(
+                    "warning", "警告", f"未选择{app_name}下载目录", 5000
                 )
-                if not folder:
+                return None
-                    logger.warning("选择MAA下载目录时未选择文件夹")
+
-                    MainInfoBar.push_info_bar(
+            if app_name in ["MAA"]:
-                        "warning", "警告", "未选择MAA下载目录", 5000
+
-                    )
+                url = f"https://mirrorchyan.com/api/resources/{app_name}/latest?user_agent=AutoMaaGui&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&os=win&arch=x64&channel=stable"
-                    return None
+
+            elif app_name in ["StarRailAssistant"]:
+
+                url = f"https://mirrorchyan.com/api/resources/{app_name}/latest?user_agent=AutoMaaGui&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&channel=stable"
+
+            # 从mirrorc服务器获取最新版本信息
+            Network.set_info(mode="get", url=url)
+            Network.start()
+            Network.loop.exec()
+            if Network.stutus_code == 200:
+                app_info = Network.response_json
+            else:
+
+                if Network.response_json:
+
+                    app_info = Network.response_json
+
+                    if app_info["code"] != 0:
+
+                        logger.error(f"获取版本信息时出错：{app_info["msg"]}")
+
+                        error_remark_dict = {
+                            1001: "获取版本信息的URL参数不正确",
+                            7001: "填入的 CDK 已过期",
+                            7002: "填入的 CDK 错误",
+                            7003: "填入的 CDK 今日下载次数已达上限",
+                            7004: "填入的 CDK 类型和待下载的资源不匹配",
+                            7005: "填入的 CDK 已被封禁",
+                            8001: "对应架构和系统下的资源不存在",
+                            8002: "错误的系统参数",
+                            8003: "错误的架构参数",
+                            8004: "错误的更新通道参数",
+                            1: app_info["msg"],
+                        }
+
+                        if app_info["code"] in error_remark_dict:
+                            MainInfoBar.push_info_bar(
+                                "error",
+                                "获取版本信息时出错",
+                                error_remark_dict[app_info["code"]],
+                                -1,
+                            )
+                        else:
+                            MainInfoBar.push_info_bar(
+                                "error",
+                                "获取版本信息时出错",
+                                "意料之外的错误，请及时联系项目组以获取来自 Mirror 酱的技术支持",
+                                -1,
+                            )
 
-                # 从mirrorc服务器获取最新版本信息
-                Network.set_info(
-                    mode="get",
-                    url="https://mirrorchyan.com/api/resources/MAA/latest?user_agent=AutoMaaGui&os=win&arch=x64&channel=stable",
-                )
-                Network.start()
-                Network.loop.exec()
-                if Network.stutus_code == 200:
-                    maa_info = Network.response_json
-                else:
-                    choice = MessageBox(
-                        "错误",
-                        f"获取版本信息时出错：\n{Network.error_message}",
-                        self.window(),
-                    )
-                    choice.cancelButton.hide()
-                    choice.buttonLayout.insertStretch(1)
-                    if choice.exec():
                         return None
-                maa_version = list(
-                    map(
-                        int,
-                        maa_info["data"]["version_name"][1:]
-                        .replace("-beta", "")
-                        .split("."),
-                    )
-                )
-                while len(maa_version) < 4:
-                    maa_version.append(0)
 
-                self.downloader = DownloadManager(
+                logger.warning(f"获取版本信息时出错：{Network.error_message}")
-                    Path(folder),
+                MainInfoBar.push_info_bar(
-                    "MAA",
+                    "warning",
-                    maa_version,
+                    "获取版本信息时出错",
-                    {
+                    f"网络错误：{Network.stutus_code}",
-                        "mode": "Proxy",
+                    5000,
-                        "thread_numb": Config.get(Config.update_ThreadNumb),
-                    },
                 )
-                self.downloader.show()
+                return None
-                self.downloader.run()
+
+            self.downloader = DownloadManager(
+                Path(folder),
+                app_name,
+                None,
+                {
+                    "mode": "MirrorChyan",
+                    "thread_numb": 1,
+                    "url": app_info["data"]["url"],
+                },
+            )
+            self.downloader.setWindowTitle("AUTO_MAA下载器 - Mirror酱渠道")
+            self.downloader.setWindowIcon(
+                QIcon(str(Config.app_path / "resources/icons/MirrorChyan.ico"))
+            )
+            self.downloader.show()
+            self.downloader.run()
 
     def show_password(self):
 
@@ -1207,14 +1260,24 @@ class MemberManager(QWidget):
                                     int(name[3:]) - 1,
                                     9,
                                     QTableWidgetItem(
-                                        Config.gameid_dict["ALL"]["text"][
+                                        "不使用"
-                                            Config.gameid_dict["ALL"]["value"].index(
+                                        if config.get(config.Info_GameId_Remain) == "-"
-                                                config.get(config.Info_GameId_Remain)
+                                        else (
+                                            (
+                                                Config.gameid_dict["ALL"]["text"][
+                                                    Config.gameid_dict["ALL"][
+                                                        "value"
+                                                    ].index(
+                                                        config.get(
+                                                            config.Info_GameId_Remain
+                                                        )
+                                                    )
+                                                ]
                                             )
-                                        ]
+                                            if config.get(config.Info_GameId_Remain)
-                                        if config.get(config.Info_GameId_Remain)
+                                            in Config.gameid_dict["ALL"]["value"]
-                                        in Config.gameid_dict["ALL"]["value"]
+                                            else config.get(config.Info_GameId_Remain)
-                                        else config.get(config.Info_GameId_Remain)
+                                        )
                                     ),
                                 )
                                 self.dashboard.setCellWidget(
@@ -1359,15 +1422,16 @@ class MemberManager(QWidget):
                                 configItem=self.config.Info_MedicineNumb,
                                 parent=self,
                             )
-                            self.card_SeriesNumb = SpinBoxSettingCard(
+                            self.card_SeriesNumb = ComboBoxSettingCard(
                                 icon=FluentIcon.GAME,
                                 title="连战次数",
                                 content="连战次数较大时建议搭配剩余理智关卡使用",
-                                range=(1, 6),
+                                texts=["AUTO", "6", "5", "4", "3", "2", "1", "不选择"],
                                 qconfig=self.config,
                                 configItem=self.config.Info_SeriesNumb,
                                 parent=self,
                             )
+                            self.card_SeriesNumb.comboBox.setMinimumWidth(150)
                             self.card_GameId = EditableComboBoxSettingCard(
                                 icon=FluentIcon.GAME,
                                 title="关卡选择",
@@ -1403,7 +1467,10 @@ class MemberManager(QWidget):
                                 title="剩余理智关卡",
                                 content="按下回车以添加自定义关卡号",
                                 value=Config.gameid_dict["ALL"]["value"],
-                                texts=Config.gameid_dict["ALL"]["text"],
+                                texts=[
+                                    "不使用" if _ == "当前/上次" else _
+                                    for _ in Config.gameid_dict["ALL"]["text"]
+                                ],
                                 qconfig=self.config,
                                 configItem=self.config.Info_GameId_Remain,
                                 parent=self,
@@ -1513,7 +1580,10 @@ class MemberManager(QWidget):
                             )
                             self.card_GameId_Remain.reLoadOptions(
                                 Config.gameid_dict["ALL"]["value"],
-                                Config.gameid_dict["ALL"]["text"],
+                                [
+                                    "不使用" if _ == "当前/上次" else _
+                                    for _ in Config.gameid_dict["ALL"]["text"]
+                                ],
                             )
 
                         def refresh_password(self):

app/ui/setting.py

@@ -87,9 +87,9 @@ class Setting(QWidget):
         self.start.card_IfSelfStart.checkedChanged.connect(System.set_SelfStart)
         self.security.card_changePASSWORD.clicked.connect(self.change_PASSWORD)
         self.updater.card_CheckUpdate.clicked.connect(
-            lambda: self.check_update(if_click=True)
+            lambda: self.check_update(if_show=True)
         )
-        self.other.card_Notice.clicked.connect(self.show_notice)
+        self.other.card_Notice.clicked.connect(lambda: self.show_notice(if_show=True))
 
         content_layout.addWidget(self.function)
         content_layout.addWidget(self.start)
@@ -177,10 +177,7 @@ class Setting(QWidget):
         while True:
 
             choice = LineEditMessageBox(
-                self.window(),
+                self.window(), "请设置您的管理密钥", "管理密钥", "密码"
-                "未检测到管理密钥，请设置您的管理密钥",
-                "管理密钥",
-                "密码",
             )
             if choice.exec() and choice.input.text() != "":
                 Crypto.get_PASSWORD(choice.input.text())
@@ -258,12 +255,12 @@ class Setting(QWidget):
                 if choice.exec():
                     break
 
-    def check_update(self, if_click: bool = False) -> None:
+    def check_update(self, if_show: bool = False, if_first: bool = False) -> None:
         """检查版本更新，调起文件下载进程"""
 
         current_version = list(map(int, Config.VERSION.split(".")))
 
-        if Network.if_running and if_click:
+        if Network.if_running and if_show:
             MainInfoBar.push_info_bar(
                 "warning", "请求速度过快", "上个网络请求还未结束，请稍等片刻", 5000
             )
@@ -280,6 +277,46 @@ class Setting(QWidget):
                 Network.response_json
             )
         else:
+
+            if Network.response_json:
+
+                version_info = Network.response_json
+
+                if version_info["code"] != 0:
+
+                    logger.error(f"获取版本信息时出错：{version_info["msg"]}")
+
+                    error_remark_dict = {
+                        1001: "获取版本信息的URL参数不正确",
+                        7001: "填入的 CDK 已过期",
+                        7002: "填入的 CDK 错误",
+                        7003: "填入的 CDK 今日下载次数已达上限",
+                        7004: "填入的 CDK 类型和待下载的资源不匹配",
+                        7005: "填入的 CDK 已被封禁",
+                        8001: "对应架构和系统下的资源不存在",
+                        8002: "错误的系统参数",
+                        8003: "错误的架构参数",
+                        8004: "错误的更新通道参数",
+                        1: version_info["msg"],
+                    }
+
+                    if version_info["code"] in error_remark_dict:
+                        MainInfoBar.push_info_bar(
+                            "error",
+                            "获取版本信息时出错",
+                            error_remark_dict[version_info["code"]],
+                            -1,
+                        )
+                    else:
+                        MainInfoBar.push_info_bar(
+                            "error",
+                            "获取版本信息时出错",
+                            "意料之外的错误，请及时联系项目组以获取来自 Mirror 酱的技术支持",
+                            -1,
+                        )
+
+                    return None
+
             logger.warning(f"获取版本信息时出错：{Network.error_message}")
             MainInfoBar.push_info_bar(
                 "warning",
@@ -289,41 +326,6 @@ class Setting(QWidget):
             )
             return None
 
-        if version_info["code"] != 0:
-
-            logger.error(f"获取版本信息时出错：{version_info["msg"]}")
-
-            error_remark_dict = {
-                1001: "获取版本信息的URL参数不正确",
-                7001: "填入的 CDK 已过期",
-                7002: "填入的 CDK 错误",
-                7003: "填入的 CDK 今日下载次数已达上限",
-                7004: "填入的 CDK 类型和待下载的资源不匹配",
-                7005: "填入的 CDK 已被封禁",
-                8001: "对应架构和系统下的资源不存在",
-                8002: "错误的系统参数",
-                8003: "错误的架构参数",
-                8004: "错误的更新通道参数",
-                1: version_info["msg"],
-            }
-
-            if version_info["code"] in error_remark_dict:
-                MainInfoBar.push_info_bar(
-                    "error",
-                    "获取版本信息时出错",
-                    error_remark_dict[version_info["code"]],
-                    -1,
-                )
-            else:
-                MainInfoBar.push_info_bar(
-                    "error",
-                    "获取版本信息时出错",
-                    "意料之外的错误，请及时联系项目组以获取来自 Mirror 酱的技术支持",
-                    -1,
-                )
-
-            return None
-
         remote_version = list(
             map(
                 int,
@@ -333,8 +335,14 @@ class Setting(QWidget):
             )
         )
 
-        # 有版本更新
+        if (
-        if version.parse(version_text(remote_version)) > version.parse(
+            if_show
+            or (
+                not if_show
+                and if_first
+                and not Config.get(Config.function_UnattendedMode)
+            )
+        ) and version.parse(version_text(remote_version)) > version.parse(
             version_text(current_version)
         ):
 
@@ -410,11 +418,26 @@ class Setting(QWidget):
                 self.window().close()
                 QApplication.quit()
 
-        # 无版本更新
+        elif (
-        else:
+            if_show
-            MainInfoBar.push_info_bar("success", "更新检查", "已是最新版本~", 3000)
+            or if_first
+            or version.parse(version_text(remote_version))
+            > version.parse(version_text(current_version))
+        ):
 
-    def show_notice(self, if_show: bool = True) -> None:
+            if version.parse(version_text(remote_version)) > version.parse(
+                version_text(current_version)
+            ):
+                MainInfoBar.push_info_bar(
+                    "info",
+                    "发现新版本",
+                    f"{version_text(current_version)} --> {version_text(remote_version)}",
+                    3600000,
+                )
+            else:
+                MainInfoBar.push_info_bar("success", "更新检查", "已是最新版本~", 3000)
+
+    def show_notice(self, if_show: bool = False, if_first: bool = False) -> None:
         """显示公告"""
 
         # 从远程服务器获取最新公告
@@ -453,9 +476,11 @@ class Setting(QWidget):
         }
 
         if if_show or (
-            datetime.now()
+            if_first
+            and datetime.now()
             > datetime.strptime(notice["time"], "%Y-%m-%d %H:%M")
             > time_local
+            and not Config.get(Config.function_UnattendedMode)
         ):
 
             choice = NoticeMessageBox(self.window(), "公告", notice["notice_dict"])
@@ -467,6 +492,17 @@ class Setting(QWidget):
                 ) as f:
                     json.dump(notice, f, ensure_ascii=False, indent=4)
 
+        elif (
+            datetime.now()
+            > datetime.strptime(notice["time"], "%Y-%m-%d %H:%M")
+            > time_local
+        ):
+
+            MainInfoBar.push_info_bar(
+                "info", "有新公告", "请前往设置界面查看公告", 3600000
+            )
+            return None
+
 
 class FunctionSettingCard(HeaderCardWidget):
 
@@ -501,6 +537,14 @@ class FunctionSettingCard(HeaderCardWidget):
             parent=self,
         )
         self.card_IfSilence = self.SilenceSettingCard(self)
+        self.card_UnattendedMode = SwitchSettingCard(
+            icon=FluentIcon.PAGE_RIGHT,
+            title="无人值守模式",
+            content="开启后AUTO_MAA不再主动弹出对话框，以免影响代理任务运行",
+            qconfig=Config,
+            configItem=Config.function_UnattendedMode,
+            parent=self,
+        )
         self.card_IfAgreeBilibili = SwitchSettingCard(
             icon=FluentIcon.PAGE_RIGHT,
             title="托管bilibili游戏隐私政策",
@@ -523,6 +567,7 @@ class FunctionSettingCard(HeaderCardWidget):
         Layout.addWidget(self.card_HistoryRetentionTime)
         Layout.addWidget(self.card_IfAllowSleep)
         Layout.addWidget(self.card_IfSilence)
+        Layout.addWidget(self.card_UnattendedMode)
         Layout.addWidget(self.card_IfAgreeBilibili)
         Layout.addWidget(self.card_IfSkipMumuSplashAds)
         self.viewLayout.addLayout(Layout)
@@ -998,9 +1043,9 @@ class OtherSettingCard(HeaderCardWidget):
         )
         self.card_UserDocs = HyperlinkCard(
             url="https://clozya.github.io/AUTOMAA_docs",
-            text="访问",
+            text="查看指南",
             icon=FluentIcon.PAGE_RIGHT,
-            title="AUTO_MAA官方文档站",
+            title="用户指南",
             content="访问AUTO_MAA的官方文档站，获取使用指南和项目相关信息",
             parent=self,
         )

app/utils/AUTO_MAA.iss

@@ -0,0 +1,89 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "AUTO_MAA"
+#define MyAppVersion ""
+#define MyAppPublisher "AUTO_MAA Team"
+#define MyAppURL "https://doc.automaa.xyz/"
+#define MyAppExeName "AUTO_MAA.exe"
+#define MyAppPath ""
+#define OutputDir ""
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{D116A92A-E174-4699-B777-61C5FD837B19}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName=D:\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+DisableProgramGroupPage=yes
+LicenseFile={#MyAppPath}\LICENSE
+; Remove the following line to run in administrative install mode (install for all users).
+PrivilegesRequired=lowest
+OutputDir={#OutputDir}
+OutputBaseFilename=AUTO_MAA-Setup
+SetupIconFile={#MyAppPath}\resources\icons\AUTO_MAA.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "Chinese"; MessagesFile: "{#MyAppPath}\resources\docs\ChineseSimplified.isl"
+Name: "English"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+Source: "{#MyAppPath}\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\app\*"; DestDir: "{app}\app"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppPath}\resources\*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#MyAppPath}\AUTO_Updater.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\main.py"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\requirements.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\README.md"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppPath}\LICENSE"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+
+[Code]
+var
+  DeleteDataQuestion: Boolean;
+
+function InitializeUninstall: Boolean;
+begin
+  DeleteDataQuestion := MsgBox('您确认要完全移除 AUTO_MAA 的所有用户数据文件与子组件吗？', mbConfirmation, MB_YESNO) = IDYES;
+  Result := True;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usPostUninstall then
+  begin
+    DelTree(ExpandConstant('{app}\app'), True, True, True);
+    DelTree(ExpandConstant('{app}\resources'), True, True, True);
+    if DeleteDataQuestion then
+    begin
+      DelTree(ExpandConstant('{app}'), True, True, True);
+    end;
+  end;
+end;

app/utils/downloader.py

@@ -266,14 +266,14 @@ class DownloadManager(QDialog):
 
     def run(self) -> None:
 
-        if self.name == "MAA":
+        if self.name == "AUTO_MAA":
-            self.download_task1()
-        elif self.name == "AUTO_MAA":
             if self.config["mode"] == "Proxy":
                 self.test_speed_task1()
                 self.speed_test_accomplish.connect(self.download_task1)
             elif self.config["mode"] == "MirrorChyan":
                 self.download_task1()
+        elif self.config["mode"] == "MirrorChyan":
+            self.download_task1()
 
     def get_download_url(self, mode: str) -> Union[str, Dict[str, str]]:
         """获取下载链接"""
@@ -300,9 +300,6 @@ class DownloadManager(QDialog):
 
         elif mode == "下载":
 
-            if self.name == "MAA":
-                return f"https://jp-download.fearr.xyz/MAA/MAA-{version_text(self.version)}-win-x64.zip"
-
             if self.name == "AUTO_MAA":
 
                 if self.config["mode"] == "Proxy":
@@ -325,6 +322,7 @@ class DownloadManager(QDialog):
                         return f"{selected_url}https://github.com/DLmaster361/AUTO_MAA/releases/download/{version_text(self.version)}/AUTO_MAA_{version_text(self.version)}.zip"
 
                 elif self.config["mode"] == "MirrorChyan":
+
                     with requests.get(
                         self.config["url"],
                         allow_redirects=True,
@@ -334,6 +332,14 @@ class DownloadManager(QDialog):
                         if response.status_code == 200:
                             return response.url
 
+            elif self.config["mode"] == "MirrorChyan":
+
+                with requests.get(
+                    self.config["url"], allow_redirects=True, timeout=10, stream=True
+                ) as response:
+                    if response.status_code == 200:
+                        return response.url
+
     def test_speed_task1(self) -> None:
 
         if self.isInterruptionRequested:
@@ -613,11 +619,7 @@ class DownloadManager(QDialog):
 
 class AUTO_MAA_Downloader(QApplication):
     def __init__(
-        self,
+        self, app_path: Path, name: str, main_version: list, config: dict
-        app_path: Path,
-        name: str,
-        main_version: list,
-        config: dict,
     ) -> None:
         super().__init__()
 
@@ -750,10 +752,5 @@ if __name__ == "__main__":
     if version.parse(version_text(remote_version)) > version.parse(
         version_text(current_version)
     ):
-        app = AUTO_MAA_Downloader(
+        app = AUTO_MAA_Downloader(app_path, "AUTO_MAA", remote_version, download_config)
-            app_path,
-            "AUTO_MAA",
-            remote_version,
-            download_config,
-        )
         sys.exit(app.exec())

app/utils/package.py

@@ -146,3 +146,20 @@ if __name__ == "__main__":
         f"{version_text(main_version_numb)}\n{version_text(updater_version_numb)}\n<!--{json.dumps(version["version_info"], ensure_ascii=False)}-->\n{version_info_markdown(all_version_info)}",
         encoding="utf-8",
     )
+
+    with (root_path / "app/utils/AUTO_MAA.iss").open(mode="r", encoding="utf-8") as f:
+        iss = f.read()
+
+    iss = (
+        iss.replace(
+            '#define MyAppVersion ""',
+            f'#define MyAppVersion "{version["main_version"]}"',
+        )
+        .replace(
+            '#define MyAppPath ""', f'#define MyAppPath "{root_path / "AUTO_MAA"}"'
+        )
+        .replace('#define OutputDir ""', f'#define OutputDir "{root_path}"')
+    )
+
+    with (root_path / "AUTO_MAA.iss").open(mode="w", encoding="utf-8") as f:
+        f.write(iss)

requirements.txt

@@ -10,5 +10,4 @@ pycryptodome
 requests
 markdown
 Jinja2
-serverchan_sdk
 nuitka

resources/docs/ChineseSimplified.isl

@@ -0,0 +1,403 @@
+; *** Inno Setup version 6.4.0+ Chinese Simplified messages ***
+;
+; To download user-contributed translations of this file, go to:
+;   https://jrsoftware.org/files/istrans/
+;
+; Note: When translating this text, do not add periods (.) to the end of
+; messages that didn't have them already, because on those messages Inno
+; Setup adds the periods automatically (appending a period would result in
+; two periods being displayed).
+;
+; Maintained by Zhenghan Yang
+; Email: 847320916@QQ.com
+; Translation based on network resource
+; The latest Translation is on https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
+;
+
+[LangOptions]
+; The following three entries are very important. Be sure to read and 
+; understand the '[LangOptions] section' topic in the help file.
+LanguageName=简体中文
+; If Language Name display incorrect, uncomment next line
+; LanguageName=<7B80><4F53><4E2D><6587>
+; About LanguageID, to reference link:
+; https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lcid/a9eac961-e77d-41a6-90a5-ce1a8b0cdb9c
+LanguageID=$0804
+; About CodePage, to reference link:
+; https://docs.microsoft.com/en-us/windows/win32/intl/code-page-identifiers
+LanguageCodePage=936
+; If the language you are translating to requires special font faces or
+; sizes, uncomment any of the following entries and change them accordingly.
+;DialogFontName=
+;DialogFontSize=8
+;WelcomeFontName=Verdana
+;WelcomeFontSize=12
+;TitleFontName=Arial
+;TitleFontSize=29
+;CopyrightFontName=Arial
+;CopyrightFontSize=8
+
+[Messages]
+
+; *** 应用程序标题
+SetupAppTitle=安装
+SetupWindowTitle=安装 - %1
+UninstallAppTitle=卸载
+UninstallAppFullTitle=%1 卸载
+
+; *** Misc. common
+InformationTitle=信息
+ConfirmTitle=确认
+ErrorTitle=错误
+
+; *** SetupLdr messages
+SetupLdrStartupMessage=现在将安装 %1。您想要继续吗？
+LdrCannotCreateTemp=无法创建临时文件。安装程序已中止
+LdrCannotExecTemp=无法执行临时目录中的文件。安装程序已中止
+HelpTextNote=
+
+; *** 启动错误消息
+LastErrorMessage=%1。%n%n错误 %2: %3
+SetupFileMissing=安装目录中缺少文件 %1。请修正这个问题或者获取程序的新副本。
+SetupFileCorrupt=安装文件已损坏。请获取程序的新副本。
+SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
+InvalidParameter=无效的命令行参数：%n%n%1
+SetupAlreadyRunning=安装程序正在运行。
+WindowsVersionNotSupported=此程序不支持当前计算机运行的 Windows 版本。
+WindowsServicePackRequired=此程序需要 %1 服务包 %2 或更高版本。
+NotOnThisPlatform=此程序不能在 %1 上运行。
+OnlyOnThisPlatform=此程序只能在 %1 上运行。
+OnlyOnTheseArchitectures=此程序只能安装到为下列处理器架构设计的 Windows 版本中：%n%n%1
+WinVersionTooLowError=此程序需要 %1 版本 %2 或更高。
+WinVersionTooHighError=此程序不能安装于 %1 版本 %2 或更高。
+AdminPrivilegesRequired=在安装此程序时您必须以管理员身份登录。
+PowerUserPrivilegesRequired=在安装此程序时您必须以管理员身份或有权限的用户组身份登录。
+SetupAppRunningError=安装程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
+UninstallAppRunningError=卸载程序发现 %1 当前正在运行。%n%n请先关闭正在运行的程序，然后点击“确定”继续，或点击“取消”退出。
+
+; *** 启动问题
+PrivilegesRequiredOverrideTitle=选择安装程序模式
+PrivilegesRequiredOverrideInstruction=选择安装模式
+PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员权限)，或仅为您安装。
+PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
+PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
+PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(&A) (建议选项)
+PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(&M) (建议选项)
+
+; *** 其他错误
+ErrorCreatingDir=安装程序无法创建目录“%1”
+ErrorTooManyFilesInDir=无法在目录“%1”中创建文件，因为里面包含太多文件
+
+; *** 安装程序公共消息
+ExitSetupTitle=退出安装程序
+ExitSetupMessage=安装程序尚未完成。如果现在退出，将不会安装该程序。%n%n您之后可以再次运行安装程序完成安装。%n%n现在退出安装程序吗？
+AboutSetupMenuItem=关于安装程序(&A)...
+AboutSetupTitle=关于安装程序
+AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页：%n%4
+AboutSetupNote=
+TranslatorNote=简体中文翻译由Kira(847320916@qq.com)维护。项目地址：https://github.com/kira-96/Inno-Setup-Chinese-Simplified-Translation
+
+; *** 按钮
+ButtonBack=< 上一步(&B)
+ButtonNext=下一步(&N) >
+ButtonInstall=安装(&I)
+ButtonOK=确定
+ButtonCancel=取消
+ButtonYes=是(&Y)
+ButtonYesToAll=全是(&A)
+ButtonNo=否(&N)
+ButtonNoToAll=全否(&O)
+ButtonFinish=完成(&F)
+ButtonBrowse=浏览(&B)...
+ButtonWizardBrowse=浏览(&R)...
+ButtonNewFolder=新建文件夹(&M)
+
+; *** “选择语言”对话框消息
+SelectLanguageTitle=选择安装语言
+SelectLanguageLabel=选择安装时使用的语言。
+
+; *** 公共向导文字
+ClickNext=点击“下一步”继续，或点击“取消”退出安装程序。
+BeveledLabel=
+BrowseDialogTitle=浏览文件夹
+BrowseDialogLabel=在下面的列表中选择一个文件夹，然后点击“确定”。
+NewFolderName=新建文件夹
+
+; *** “欢迎”向导页
+WelcomeLabel1=欢迎使用 [name] 安装向导
+WelcomeLabel2=现在将安装 [name/ver] 到您的电脑中。%n%n建议您在继续安装前关闭所有其他应用程序。
+
+; *** “密码”向导页
+WizardPassword=密码
+PasswordLabel1=这个安装程序有密码保护。
+PasswordLabel3=请输入密码，然后点击“下一步”继续。密码区分大小写。
+PasswordEditLabel=密码(&P)：
+IncorrectPassword=您输入的密码不正确，请重新输入。
+
+; *** “许可协议”向导页
+WizardLicense=许可协议
+LicenseLabel=请在继续安装前阅读以下重要信息。
+LicenseLabel3=请仔细阅读下列许可协议。在继续安装前您必须同意这些协议条款。
+LicenseAccepted=我同意此协议(&A)
+LicenseNotAccepted=我不同意此协议(&D)
+
+; *** “信息”向导页
+WizardInfoBefore=信息
+InfoBeforeLabel=请在继续安装前阅读以下重要信息。
+InfoBeforeClickLabel=准备好继续安装后，点击“下一步”。
+WizardInfoAfter=信息
+InfoAfterLabel=请在继续安装前阅读以下重要信息。
+InfoAfterClickLabel=准备好继续安装后，点击“下一步”。
+
+; *** “用户信息”向导页
+WizardUserInfo=用户信息
+UserInfoDesc=请输入您的信息。
+UserInfoName=用户名(&U)：
+UserInfoOrg=组织(&O)：
+UserInfoSerial=序列号(&S)：
+UserInfoNameRequired=您必须输入用户名。
+
+; *** “选择目标目录”向导页
+WizardSelectDir=选择目标位置
+SelectDirDesc=您想将 [name] 安装在哪里？
+SelectDirLabel3=安装程序将安装 [name] 到下面的文件夹中。
+SelectDirBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
+DiskSpaceGBLabel=至少需要有 [gb] GB 的可用磁盘空间。
+DiskSpaceMBLabel=至少需要有 [mb] MB 的可用磁盘空间。
+CannotInstallToNetworkDrive=安装程序无法安装到一个网络驱动器。
+CannotInstallToUNCPath=安装程序无法安装到一个 UNC 路径。
+InvalidPath=您必须输入一个带驱动器卷标的完整路径，例如：%n%nC:\APP%n%n或UNC路径：%n%n\\server\share
+InvalidDrive=您选定的驱动器或 UNC 共享不存在或不能访问。请选择其他位置。
+DiskSpaceWarningTitle=磁盘空间不足
+DiskSpaceWarning=安装程序至少需要 %1 KB 的可用空间才能安装，但选定驱动器只有 %2 KB 的可用空间。%n%n您一定要继续吗？
+DirNameTooLong=文件夹名称或路径太长。
+InvalidDirName=文件夹名称无效。
+BadDirName32=文件夹名称不能包含下列任何字符：%n%n%1
+DirExistsTitle=文件夹已存在
+DirExists=文件夹：%n%n%1%n%n已经存在。您一定要安装到这个文件夹中吗？
+DirDoesntExistTitle=文件夹不存在
+DirDoesntExist=文件夹：%n%n%1%n%n不存在。您想要创建此文件夹吗？
+
+; *** “选择组件”向导页
+WizardSelectComponents=选择组件
+SelectComponentsDesc=您想安装哪些程序组件？
+SelectComponentsLabel2=选中您想安装的组件；取消您不想安装的组件。然后点击“下一步”继续。
+FullInstallation=完全安装
+; if possible don't translate 'Compact' as 'Minimal' (I mean 'Minimal' in your language)
+CompactInstallation=简洁安装
+CustomInstallation=自定义安装
+NoUninstallWarningTitle=组件已存在
+NoUninstallWarning=安装程序检测到下列组件已安装在您的电脑中：%n%n%1%n%n取消选中这些组件不会卸载它们。%n%n确定要继续吗？
+ComponentSize1=%1 KB
+ComponentSize2=%1 MB
+ComponentsDiskSpaceGBLabel=当前选择的组件需要至少 [gb] GB 的磁盘空间。
+ComponentsDiskSpaceMBLabel=当前选择的组件需要至少 [mb] MB 的磁盘空间。
+
+; *** “选择附加任务”向导页
+WizardSelectTasks=选择附加任务
+SelectTasksDesc=您想要安装程序执行哪些附加任务？
+SelectTasksLabel2=选择您想要安装程序在安装 [name] 时执行的附加任务，然后点击“下一步”。
+
+; *** “选择开始菜单文件夹”向导页
+WizardSelectProgramGroup=选择开始菜单文件夹
+SelectStartMenuFolderDesc=安装程序应该在哪里放置程序的快捷方式？
+SelectStartMenuFolderLabel3=安装程序将在下列“开始”菜单文件夹中创建程序的快捷方式。
+SelectStartMenuFolderBrowseLabel=点击“下一步”继续。如果您想选择其他文件夹，点击“浏览”。
+MustEnterGroupName=您必须输入一个文件夹名。
+GroupNameTooLong=文件夹名或路径太长。
+InvalidGroupName=无效的文件夹名字。
+BadGroupName=文件夹名不能包含下列任何字符：%n%n%1
+NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
+
+; *** “准备安装”向导页
+WizardReady=准备安装
+ReadyLabel1=安装程序准备就绪，现在可以开始安装 [name] 到您的电脑。
+ReadyLabel2a=点击“安装”继续此安装程序。如果您想重新考虑或修改任何设置，点击“上一步”。
+ReadyLabel2b=点击“安装”继续此安装程序。
+ReadyMemoUserInfo=用户信息：
+ReadyMemoDir=目标位置：
+ReadyMemoType=安装类型：
+ReadyMemoComponents=已选择组件：
+ReadyMemoGroup=开始菜单文件夹：
+ReadyMemoTasks=附加任务：
+
+; *** TExtractionWizardPage wizard page and Extract7ZipArchive
+ExtractionLabel=正在提取附加文件...
+ButtonStopExtraction=停止提取(&S)
+StopExtraction=您确定要停止提取吗？
+ErrorExtractionAborted=提取已中止
+ErrorExtractionFailed=提取失败：%1
+
+; *** TDownloadWizardPage wizard page and DownloadTemporaryFile
+DownloadingLabel=正在下载附加文件...
+ButtonStopDownload=停止下载(&S)
+StopDownload=您确定要停止下载吗？
+ErrorDownloadAborted=下载已中止
+ErrorDownloadFailed=下载失败：%1 %2
+ErrorDownloadSizeFailed=获取下载大小失败：%1 %2
+ErrorFileHash1=校验文件哈希失败：%1
+ErrorFileHash2=无效的文件哈希：预期 %1，实际 %2
+ErrorProgress=无效的进度：%1 / %2
+ErrorFileSize=文件大小错误：预期 %1，实际 %2
+
+; *** “正在准备安装”向导页
+WizardPreparing=正在准备安装
+PreparingDesc=安装程序正在准备安装 [name] 到您的电脑。
+PreviousInstallNotCompleted=先前的程序安装或卸载未完成，您需要重启您的电脑以完成。%n%n在重启电脑后，再次运行安装程序以完成 [name] 的安装。
+CannotContinue=安装程序不能继续。请点击“取消”退出。
+ApplicationsFound=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。
+ApplicationsFound2=以下应用程序正在使用将由安装程序更新的文件。建议您允许安装程序自动关闭这些应用程序。安装完成后，安装程序将尝试重新启动这些应用程序。
+CloseApplications=自动关闭应用程序(&A)
+DontCloseApplications=不要关闭应用程序(&D)
+ErrorCloseApplications=安装程序无法自动关闭所有应用程序。建议您在继续之前，关闭所有在使用需要由安装程序更新的文件的应用程序。
+PrepareToInstallNeedsRestart=安装程序必须重启您的计算机。计算机重启后，请再次运行安装程序以完成 [name] 的安装。%n%n是否立即重新启动？
+
+; *** “正在安装”向导页
+WizardInstalling=正在安装
+InstallingLabel=安装程序正在安装 [name] 到您的电脑，请稍候。
+
+; *** “安装完成”向导页
+FinishedHeadingLabel=[name] 安装完成
+FinishedLabelNoIcons=安装程序已在您的电脑中安装了 [name]。
+FinishedLabel=安装程序已在您的电脑中安装了 [name]。您可以通过已安装的快捷方式运行此应用程序。
+ClickFinish=点击“完成”退出安装程序。
+FinishedRestartLabel=为完成 [name] 的安装，安装程序必须重新启动您的电脑。要立即重启吗？
+FinishedRestartMessage=为完成 [name] 的安装，安装程序必须重新启动您的电脑。%n%n要立即重启吗？
+ShowReadmeCheck=是，我想查阅自述文件
+YesRadio=是，立即重启电脑(&Y)
+NoRadio=否，稍后重启电脑(&N)
+; used for example as 'Run MyProg.exe'
+RunEntryExec=运行 %1
+; used for example as 'View Readme.txt'
+RunEntryShellExec=查阅 %1
+
+; *** “安装程序需要下一张磁盘”提示
+ChangeDiskTitle=安装程序需要下一张磁盘
+SelectDiskLabel2=请插入磁盘 %1 并点击“确定”。%n%n如果这个磁盘中的文件可以在下列文件夹之外的文件夹中找到，请输入正确的路径或点击“浏览”。
+PathLabel=路径(&P)：
+FileNotInDir2=“%2”中找不到文件“%1”。请插入正确的磁盘或选择其他文件夹。
+SelectDirectoryLabel=请指定下一张磁盘的位置。
+
+; *** 安装状态消息
+SetupAborted=安装程序未完成安装。%n%n请修正这个问题并重新运行安装程序。
+AbortRetryIgnoreSelectAction=选择操作
+AbortRetryIgnoreRetry=重试(&T)
+AbortRetryIgnoreIgnore=忽略错误并继续(&I)
+AbortRetryIgnoreCancel=关闭安装程序
+
+; *** 安装状态消息
+StatusClosingApplications=正在关闭应用程序...
+StatusCreateDirs=正在创建目录...
+StatusExtractFiles=正在解压缩文件...
+StatusCreateIcons=正在创建快捷方式...
+StatusCreateIniEntries=正在创建 INI 条目...
+StatusCreateRegistryEntries=正在创建注册表条目...
+StatusRegisterFiles=正在注册文件...
+StatusSavingUninstall=正在保存卸载信息...
+StatusRunProgram=正在完成安装...
+StatusRestartingApplications=正在重启应用程序...
+StatusRollback=正在撤销更改...
+
+; *** 其他错误
+ErrorInternal2=内部错误：%1
+ErrorFunctionFailedNoCode=%1 失败
+ErrorFunctionFailed=%1 失败；错误代码 %2
+ErrorFunctionFailedWithMessage=%1 失败；错误代码 %2.%n%3
+ErrorExecutingProgram=无法执行文件：%n%1
+
+; *** 注册表错误
+ErrorRegOpenKey=打开注册表项时出错：%n%1\%2
+ErrorRegCreateKey=创建注册表项时出错：%n%1\%2
+ErrorRegWriteKey=写入注册表项时出错：%n%1\%2
+
+; *** INI 错误
+ErrorIniEntry=在文件“%1”中创建 INI 条目时出错。
+
+; *** 文件复制错误
+FileAbortRetryIgnoreSkipNotRecommended=跳过此文件(&S) (不推荐)
+FileAbortRetryIgnoreIgnoreNotRecommended=忽略错误并继续(&I) (不推荐)
+SourceIsCorrupted=源文件已损坏
+SourceDoesntExist=源文件“%1”不存在
+ExistingFileReadOnly2=无法替换现有文件，它是只读的。
+ExistingFileReadOnlyRetry=移除只读属性并重试(&R)
+ExistingFileReadOnlyKeepExisting=保留现有文件(&K)
+ErrorReadingExistingDest=尝试读取现有文件时出错：
+FileExistsSelectAction=选择操作
+FileExists2=文件已经存在。
+FileExistsOverwriteExisting=覆盖已存在的文件(&O)
+FileExistsKeepExisting=保留现有的文件(&K)
+FileExistsOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
+ExistingFileNewerSelectAction=选择操作
+ExistingFileNewer2=现有的文件比安装程序将要安装的文件还要新。
+ExistingFileNewerOverwriteExisting=覆盖已存在的文件(&O)
+ExistingFileNewerKeepExisting=保留现有的文件(&K) (推荐)
+ExistingFileNewerOverwriteOrKeepAll=为所有冲突文件执行此操作(&D)
+ErrorChangingAttr=尝试更改下列现有文件的属性时出错：
+ErrorCreatingTemp=尝试在目标目录创建文件时出错：
+ErrorReadingSource=尝试读取下列源文件时出错：
+ErrorCopying=尝试复制下列文件时出错：
+ErrorReplacingExistingFile=尝试替换现有文件时出错：
+ErrorRestartReplace=重启并替换失败：
+ErrorRenamingTemp=尝试重命名下列目标目录中的一个文件时出错：
+ErrorRegisterServer=无法注册 DLL/OCX：%1
+ErrorRegSvr32Failed=RegSvr32 失败；退出代码 %1
+ErrorRegisterTypeLib=无法注册类库：%1
+
+; *** 卸载显示名字标记
+; used for example as 'My Program (32-bit)'
+UninstallDisplayNameMark=%1 (%2)
+; used for example as 'My Program (32-bit, All users)'
+UninstallDisplayNameMarks=%1 (%2, %3)
+UninstallDisplayNameMark32Bit=32 位
+UninstallDisplayNameMark64Bit=64 位
+UninstallDisplayNameMarkAllUsers=所有用户
+UninstallDisplayNameMarkCurrentUser=当前用户
+
+; *** 安装后错误
+ErrorOpeningReadme=尝试打开自述文件时出错。
+ErrorRestartingComputer=安装程序无法重启电脑，请手动重启。
+
+; *** 卸载消息
+UninstallNotFound=文件“%1”不存在。无法卸载。
+UninstallOpenError=文件“%1”不能被打开。无法卸载。
+UninstallUnsupportedVer=此版本的卸载程序无法识别卸载日志文件“%1”的格式。无法卸载
+UninstallUnknownEntry=卸载日志中遇到一个未知条目 (%1)
+ConfirmUninstall=您确认要完全移除 %1 及其所有组件吗？
+UninstallOnlyOnWin64=仅允许在 64 位 Windows 中卸载此程序。
+OnlyAdminCanUninstall=仅使用管理员权限的用户能完成此卸载。
+UninstallStatusLabel=正在从您的电脑中移除 %1，请稍候。
+UninstalledAll=已顺利从您的电脑中移除 %1。
+UninstalledMost=%1 卸载完成。%n%n有部分内容未能被删除，但您可以手动删除它们。
+UninstalledAndNeedsRestart=为完成 %1 的卸载，需要重启您的电脑。%n%n立即重启电脑吗？
+UninstallDataCorrupted=文件“%1”已损坏。无法卸载
+
+; *** 卸载状态消息
+ConfirmDeleteSharedFileTitle=删除共享的文件吗？
+ConfirmDeleteSharedFile2=系统表示下列共享的文件已不有其他程序使用。您希望卸载程序删除这些共享的文件吗？%n%n如果删除这些文件，但仍有程序在使用这些文件，则这些程序可能出现异常。如果您不能确定，请选择“否”，在系统中保留这些文件以免引发问题。
+SharedFileNameLabel=文件名：
+SharedFileLocationLabel=位置：
+WizardUninstalling=卸载状态
+StatusUninstalling=正在卸载 %1...
+
+; *** Shutdown block reasons
+ShutdownBlockReasonInstallingApp=正在安装 %1。
+ShutdownBlockReasonUninstallingApp=正在卸载 %1。
+
+; The custom messages below aren't used by Setup itself, but if you make
+; use of them in your scripts, you'll want to translate them.
+
+[CustomMessages]
+
+NameAndVersion=%1 版本 %2
+AdditionalIcons=附加快捷方式：
+CreateDesktopIcon=创建桌面快捷方式(&D)
+CreateQuickLaunchIcon=创建快速启动栏快捷方式(&Q)
+ProgramOnTheWeb=%1 网站
+UninstallProgram=卸载 %1
+LaunchProgram=运行 %1
+AssocFileExtension=将 %2 文件扩展名与 %1 建立关联(&A)
+AssocingFileExtension=正在将 %2 文件扩展名与 %1 建立关联...
+AutoStartProgramGroupDescription=启动：
+AutoStartProgram=自动启动 %1
+AddonHostProgramNotFound=您选择的文件夹中无法找到 %1。%n%n您要继续吗？

resources/docs/MAA_config_info.txt

@@ -6,8 +6,8 @@
 "TaskQueue.Recruiting.IsChecked": "True"        #自动公招
 "TaskQueue.Base.IsChecked": "True"      #基建换班
 "TaskQueue.Combat.IsChecked": "True"        #刷理智
-"TaskQueue.Mission.IsChecked": "True"       #领取奖励
 "TaskQueue.Mall.IsChecked": "True"       #获取信用及购物
+"TaskQueue.Mission.IsChecked": "True"       #领取奖励
 "TaskQueue.AutoRoguelike.IsChecked": "False"        #自动肉鸽
 "TaskQueue.Reclamation.IsChecked": "False"      #生息演算
 "TaskQueue.Order.WakeUp": "0"

resources/version.json

@@ -1,29 +1,49 @@
 {
-    "main_version": "4.3.5.0",
+    "main_version": "4.3.6.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.5.0": {
+        "4.3.6.0": {
             "新增功能": [
-                "用户设置中新增连战次数与剩余理智关卡两项配置项",
+                "适配MAA连战次数`AUTO`模式"
-                "支持自动代理时更新MAA"
-            ],
-            "修复BUG": [
-                "适配MAAv5.16.0基建模式",
-                "适配自定义基建自动轮换功能"
-            ],
-            "程序优化": [
-                "移除增效任务"
             ]
         },
-        "4.3.5.2": {
+        "4.3.6.5": {
-            "修复BUG": [
+            "新增功能": [
-                "修复无法建立网络连接时软件卡死问题"
+                "release中添加安装程序"
             ]
         },
-        "4.3.5.1": {
+        "4.3.6.4": {
+            "修复BUG": [
+                "修复详细模式下非定时自定义基建无法正常换班的问题"
+            ]
+        },
+        "4.3.6.3": {
+            "新增功能": [
+                "下载器仅支持调用Mirror酱"
+            ],
+            "修复BUG": [
+                "修复Mirror酱更新检查报错不显示详细信息的问题"
+            ]
+        },
+        "4.3.6.2": {
+            "新增功能": [
+                "新增`无人值守模式`"
+            ],
+            "修复BUG": [
+                "修复软件窗口最大化异常问题",
+                "修复异常操作导致窗口离开屏幕后难以复原的问题",
+                "修正剩余理智关卡文案",
+                "修复隐藏到托盘时，托盘无法退出主程序的问题",
+                "修复Server酱网络异常导致的卡死问题"
+            ],
             "程序优化": [
-                "模拟器路径适配快捷方式"
+                "主窗口显示版本号"
+            ]
+        },
+        "4.3.6.1": {
+            "新增功能": [
+                "单次自动代理任务中，已完成的子任务在重复执行时不再启用"
             ]
         }
     },
@@ -36,7 +56,6 @@
         "https://ghfast.top/"
     ],
     "download_dict": {
-        "官方下载站-jp": "https://jp-download.fearr.xyz/AUTO_MAA/",
+        "官方下载站-jp": "https://jp-download.fearr.xyz/AUTO_MAA/"
-        "官方下载站-hw": "http://hwobs.fearr.xyz/releases/artifacts/"
     }
 }