Merge branch 'dev'

.github/workflows/build-app.yml

@@ -55,6 +55,8 @@ jobs:
           python -m pip install --upgrade pip
           pip install flake8 pytest
           pip install -r requirements.txt
+          choco install innosetup
+          echo "C:\Program Files (x86)\Inno Setup 6" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names
@@ -71,8 +73,6 @@ jobs:
         run: |
           $MAIN_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 1).Trim()
           "AUTO_MAA_version=$MAIN_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
-          $UPDATER_VERSION=(Get-Content -Path "version_info.txt" -TotalCount 2 | Select-Object -Index 1).Trim()
-          "updater_version=$UPDATER_VERSION" | Out-File -FilePath $env:GITHUB_ENV -Append
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -83,17 +83,6 @@ jobs:
         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
@@ -120,8 +109,11 @@ jobs:
           NAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
           TAGNAME="$(sed 's/\r$//g' <(head -n 1 version_info.txt))"
           NOTES_MAIN="$(sed 's/\r$//g' <(tail -n +3 version_info.txt))"
-          NOTES_TAIL="\`\`\`本release通过GitHub Actions自动构建\`\`\`"
+          NOTES="$NOTES_MAIN
-          NOTES="$NOTES_MAIN<br><br>$NOTES_TAIL"
+          
+          [已有 Mirror酱 CDK ？前往 Mirror酱 高速下载](https://mirrorchyan.com/zh/projects?rid=AUTO_MAA)
+
+          \`\`\`本release通过GitHub Actions自动构建\`\`\`"
           if [ "${{ github.ref_name }}" == "main" ]; then
             PRERELEASE_FLAG=""
           else

app/__init__.py

@@ -33,7 +33,6 @@ from .core import QueueConfig, MaaConfig, MaaUserConfig, Task, TaskManager, Main
 from .models import MaaManager
 from .services import Notify, Crypto, System
 from .ui import AUTO_MAA
-from .utils import DownloadManager
 
 __all__ = [
     "QueueConfig",
@@ -47,5 +46,4 @@ __all__ = [
     "Crypto",
     "System",
     "AUTO_MAA",
-    "DownloadManager",
 ]

app/core/config.py

@@ -260,8 +260,10 @@ class QueueConfig(QConfig):
         self.queueSet_AfterAccomplish = OptionsConfigItem(
             "QueueSet",
             "AfterAccomplish",
-            "None",
+            "NoAction",
-            OptionsValidator(["None", "KillSelf", "Sleep", "Hibernate", "Shutdown"]),
+            OptionsValidator(
+                ["NoAction", "KillSelf", "Sleep", "Hibernate", "Shutdown"]
+            ),
         )
 
         self.time_TimeEnabled_0 = ConfigItem(
@@ -622,11 +624,12 @@ class MaaUserConfig(QConfig):
 
 class AppConfig(GlobalConfig):
 
-    VERSION = "4.3.6.0"
+    VERSION = "4.3.8.1"
 
     gameid_refreshed = Signal()
     PASSWORD_refreshed = Signal()
     user_info_changed = Signal()
+    power_sign_changed = Signal()
 
     def __init__(self) -> None:
         super().__init__()
@@ -649,6 +652,7 @@ class AppConfig(GlobalConfig):
             "ALL": {"value": [], "text": []},
             "Today": {"value": [], "text": []},
         }
+        self.power_sign = "NoAction"
         self.if_ignore_silence = False
         self.if_database_opened = False
 
@@ -1310,6 +1314,12 @@ class AppConfig(GlobalConfig):
 
         self.user_info_changed.emit()
 
+    def set_power_sign(self, sign: str) -> None:
+        """设置当前电源状态"""
+
+        self.power_sign = sign
+        self.power_sign_changed.emit()
+
     def save_history(self, key: str, content: dict) -> None:
         """保存历史记录"""
 

app/core/task_manager.py

@@ -265,28 +265,14 @@ class _TaskManager(QObject):
                 Config.queue_dict[name]["Config"].get(
                     Config.queue_dict[name]["Config"].queueSet_AfterAccomplish
                 )
-                != "None"
+                != "NoAction"
+                and Config.power_sign == "NoAction"
             ):
-
+                Config.set_power_sign(
-                from app.ui import ProgressRingMessageBox
+                    Config.queue_dict[name]["Config"].get(
-
+                        Config.queue_dict[name]["Config"].queueSet_AfterAccomplish
-                mode_book = {
-                    "Shutdown": "关机",
-                    "Hibernate": "休眠",
-                    "Sleep": "睡眠",
-                    "KillSelf": "关闭AUTO_MAA",
-                }
-
-                choice = ProgressRingMessageBox(
-                    Config.main_window,
-                    f"{mode_book[Config.queue_dict[name]["Config"].get(Config.queue_dict[name]["Config"].queueSet_AfterAccomplish)]}倒计时",
-                )
-                if choice.exec():
-                    System.set_power(
-                        Config.queue_dict[name]["Config"].get(
-                            Config.queue_dict[name]["Config"].queueSet_AfterAccomplish
-                        )
                     )
+                )
 
     def check_maa_version(self, v: str):
         """检查MAA版本"""

app/core/timer.py

@@ -46,6 +46,7 @@ class _MainTimer(QWidget):
         self.Timer = QTimer()
         self.Timer.timeout.connect(self.timed_start)
         self.Timer.timeout.connect(self.set_silence)
+        self.Timer.timeout.connect(self.check_power)
         self.Timer.start(1000)
         self.LongTimer = QTimer()
         self.LongTimer.timeout.connect(self.long_timed_task)
@@ -113,5 +114,27 @@ class _MainTimer(QWidget):
                         logger.warning(f"FailSafeException: {e}")
                         self.if_FailSafeException = True
 
+    def check_power(self):
+
+        if Config.power_sign != "NoAction" and not Config.running_list:
+
+            from app.ui import ProgressRingMessageBox
+
+            mode_book = {
+                "KillSelf": "退出软件",
+                "Sleep": "睡眠",
+                "Hibernate": "休眠",
+                "Shutdown": "关机",
+            }
+
+            choice = ProgressRingMessageBox(
+                Config.main_window, f"{mode_book[Config.power_sign]}倒计时"
+            )
+            if choice.exec():
+                System.set_power(Config.power_sign)
+                Config.set_power_sign("NoAction")
+            else:
+                Config.set_power_sign("NoAction")
+
 
 MainTimer = _MainTimer()

app/models/MAA.py

@@ -965,7 +965,7 @@ class MaaManager(QObject):
                 else:
                     self.maa_result = "MAA部分任务执行失败"
 
-            elif "请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log:
+            elif "请 ｢检查连接设置｣ → ｢尝试重启模拟器与 ADB｣ → ｢重启电脑｣" in log:
                 self.maa_result = "MAA的ADB连接异常"
 
             elif "未检测到任何模拟器" in log:
@@ -991,7 +991,7 @@ class MaaManager(QObject):
         elif mode == "人工排查":
             if "完成任务: StartUp" in log:
                 self.maa_result = "Success!"
-            elif "请「检查连接设置」或「尝试重启模拟器与 ADB」或「重启电脑」" in log:
+            elif "请 ｢检查连接设置｣ → ｢尝试重启模拟器与 ADB｣ → ｢重启电脑｣" in log:
                 self.maa_result = "MAA的ADB连接异常"
             elif "未检测到任何模拟器" in log:
                 self.maa_result = "MAA未检测到任何模拟器"

app/services/system.py

@@ -26,7 +26,7 @@ v4.3
 """
 
 from loguru import logger
-from PySide6.QtWidgets import QApplication, QWidget
+from PySide6.QtWidgets import QApplication
 import sys
 import ctypes
 import win32gui
@@ -87,7 +87,7 @@ class _SystemHandler:
 
         if sys.platform.startswith("win"):
 
-            if mode == "None":
+            if mode == "NoAction":
 
                 logger.info("不执行系统电源操作")
 
@@ -115,7 +115,7 @@ class _SystemHandler:
 
         elif sys.platform.startswith("linux"):
 
-            if mode == "None":
+            if mode == "NoAction":
 
                 logger.info("不执行系统电源操作")
 

app/ui/Widget.py

@@ -71,6 +71,9 @@ from qfluentwidgets import (
     SwitchButton,
     IndicatorPosition,
     Slider,
+    ScrollArea,
+    Pivot,
+    PivotItem,
 )
 from qfluentwidgets.common.overload import singledispatchmethod
 import os
@@ -1128,6 +1131,84 @@ class QuantifiedItemCard(CardWidget):
         self.Layout.addWidget(self.Numb)
 
 
+class PivotArea(ScrollArea):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        # 创建中间容器并设置布局
+        self.center_container = QWidget()
+        self.center_layout = QHBoxLayout(self.center_container)
+        self.center_layout.setContentsMargins(0, 0, 0, 0)
+        self.center_layout.setSpacing(0)
+        self.center_container.setStyleSheet("background: transparent; border: none;")
+        self.center_container.setFixedHeight(45)
+
+        self.pivot = self._Pivot(self)
+        self.pivot.ItemNumbChanged.connect(
+            lambda: QTimer.singleShot(
+                100,
+                lambda: (
+                    self.center_container.setFixedWidth(
+                        max(self.width() - 2, self.pivot.width())
+                    )
+                ),
+            )
+        )
+
+        self.center_layout.addStretch(1)
+        self.center_layout.addWidget(self.pivot)
+        self.center_layout.addStretch(1)
+
+        self.setWidgetResizable(False)
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.viewport().setCursor(Qt.ArrowCursor)
+        self.setStyleSheet("background: transparent; border: none;")
+        self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+        self.setWidget(self.center_container)
+
+    def wheelEvent(self, event):
+        scroll_bar = self.horizontalScrollBar()
+        if scroll_bar.maximum() > 0:
+            delta = event.angleDelta().y()
+            scroll_bar.setValue(scroll_bar.value() - delta // 15)
+        event.ignore()
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+
+        self.center_container.setFixedWidth(max(self.width() - 2, self.pivot.width()))
+        QTimer.singleShot(
+            100,
+            lambda: (
+                self.center_container.setFixedWidth(
+                    max(self.width() - 2, self.pivot.width())
+                )
+            ),
+        )
+
+    class _Pivot(Pivot):
+
+        ItemNumbChanged = Signal()
+
+        def __init__(self, parent=None):
+            super().__init__(parent)
+
+        def insertWidget(
+            self, index: int, routeKey: str, widget: PivotItem, onClick=None
+        ):
+            super().insertWidget(index, routeKey, widget, onClick)
+            self.ItemNumbChanged.emit()
+
+        def removeWidget(self, routeKey: str):
+            super().removeWidget(routeKey)
+            self.ItemNumbChanged.emit()
+
+        def clear(self):
+            super().clear()
+            self.ItemNumbChanged.emit()
+
+
 class QuickExpandGroupCard(ExpandGroupSettingCard):
     """全局配置"""
 

app/ui/dispatch_center.py

@@ -33,8 +33,8 @@ from PySide6.QtWidgets import (
     QHBoxLayout,
 )
 from qfluentwidgets import (
+    BodyLabel,
     CardWidget,
-    Pivot,
     ScrollArea,
     FluentIcon,
     HeaderCardWidget,
@@ -44,13 +44,12 @@ from qfluentwidgets import (
     SubtitleLabel,
     PushButton,
 )
-from PySide6.QtCore import Qt
 from PySide6.QtGui import QTextCursor
 from typing import List, Dict
 
 
 from app.core import Config, TaskManager, Task, MainInfoBar
-from .Widget import StatefulItemCard, ComboBoxMessageBox
+from .Widget import StatefulItemCard, ComboBoxMessageBox, PivotArea
 
 
 class DispatchCenter(QWidget):
@@ -60,13 +59,29 @@ class DispatchCenter(QWidget):
 
         self.setObjectName("调度中枢")
 
-        self.pivot = Pivot(self)
+        self.multi_button = PushButton(FluentIcon.ADD, "添加任务", self)
+        self.multi_button.setToolTip("添加任务")
+        self.multi_button.clicked.connect(self.start_multi_task)
+
+        self.power_combox = ComboBox()
+        self.power_combox.addItem("无动作", userData="NoAction")
+        self.power_combox.addItem("退出软件", userData="KillSelf")
+        self.power_combox.addItem("睡眠", userData="Sleep")
+        self.power_combox.addItem("休眠", userData="Hibernate")
+        self.power_combox.addItem("关机", userData="Shutdown")
+        self.power_combox.setCurrentText("无动作")
+        self.power_combox.currentIndexChanged.connect(self.set_power_sign)
+
+        self.pivotArea = PivotArea(self)
+        self.pivot = self.pivotArea.pivot
+
         self.stackedWidget = QStackedWidget(self)
-        self.Layout = QVBoxLayout(self)
+        self.stackedWidget.setContentsMargins(0, 0, 0, 0)
+        self.stackedWidget.setStyleSheet("background: transparent; border: none;")
 
-        self.script_list: Dict[str, DispatchBox] = {}
+        self.script_list: Dict[str, DispatchCenter.DispatchBox] = {}
 
-        dispatch_box = DispatchBox("主调度台", self)
+        dispatch_box = self.DispatchBox("主调度台", self)
         self.script_list["主调度台"] = dispatch_box
         self.stackedWidget.addWidget(self.script_list["主调度台"])
         self.pivot.addItem(
@@ -76,7 +91,15 @@ class DispatchCenter(QWidget):
             icon=FluentIcon.CAFE,
         )
 
-        self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+        h_layout = QHBoxLayout()
+        h_layout.addWidget(self.multi_button)
+        h_layout.addWidget(self.pivotArea)
+        h_layout.addWidget(BodyLabel("全部完成后", self))
+        h_layout.addWidget(self.power_combox)
+        h_layout.setContentsMargins(11, 5, 11, 0)
+
+        self.Layout = QVBoxLayout(self)
+        self.Layout.addLayout(h_layout)
         self.Layout.addWidget(self.stackedWidget)
         self.Layout.setContentsMargins(0, 0, 0, 0)
 
@@ -87,7 +110,7 @@ class DispatchCenter(QWidget):
     def add_board(self, task: Task) -> None:
         """添加一个调度台界面"""
 
-        dispatch_box = DispatchBox(task.name, self)
+        dispatch_box = self.DispatchBox(task.name, self)
 
         dispatch_box.top_bar.main_button.clicked.connect(
             lambda: TaskManager.stop_task(task.name)
@@ -123,7 +146,6 @@ class DispatchCenter(QWidget):
         self.script_list["主调度台"].top_bar.Lable.show()
         self.script_list["主调度台"].top_bar.object.hide()
         self.script_list["主调度台"].top_bar.mode.hide()
-        self.script_list["主调度台"].top_bar.multi_button.show()
         self.script_list["主调度台"].top_bar.main_button.clicked.disconnect()
         self.script_list["主调度台"].top_bar.main_button.setText("中止任务")
         self.script_list["主调度台"].top_bar.main_button.clicked.connect(
@@ -154,7 +176,6 @@ class DispatchCenter(QWidget):
         self.script_list["主调度台"].top_bar.Lable.hide()
         self.script_list["主调度台"].top_bar.object.show()
         self.script_list["主调度台"].top_bar.mode.show()
-        self.script_list["主调度台"].top_bar.multi_button.hide()
         self.script_list["主调度台"].top_bar.main_button.clicked.disconnect()
         self.script_list["主调度台"].top_bar.main_button.setText("开始任务")
         self.script_list["主调度台"].top_bar.main_button.clicked.connect(
@@ -208,301 +229,327 @@ class DispatchCenter(QWidget):
         self.script_list["主调度台"].top_bar.mode.addItems(["自动代理", "人工排查"])
         self.script_list["主调度台"].top_bar.mode.setCurrentIndex(0)
 
+    def update_power_sign(self) -> None:
+        """更新电源设置"""
 
-class DispatchBox(QWidget):
+        mode_book = {
+            "NoAction": "无动作",
+            "KillSelf": "退出软件",
+            "Sleep": "睡眠",
+            "Hibernate": "休眠",
+            "Shutdown": "关机",
+        }
+        self.power_combox.currentIndexChanged.disconnect()
+        self.power_combox.setCurrentText(mode_book[Config.power_sign])
+        self.power_combox.currentIndexChanged.connect(self.set_power_sign)
 
-    def __init__(self, name: str, parent=None):
+    def set_power_sign(self) -> None:
-        super().__init__(parent)
+        """设置所有任务完成后动作"""
 
-        self.setObjectName(name)
+        if not Config.running_list:
 
-        layout = QVBoxLayout()
+            self.power_combox.currentIndexChanged.disconnect()
-
+            self.power_combox.setCurrentText("无动作")
-        scrollArea = ScrollArea()
+            self.power_combox.currentIndexChanged.connect(self.set_power_sign)
-        scrollArea.setWidgetResizable(True)
+            logger.warning("没有正在运行的任务，无法设置任务完成后动作")
-
+            MainInfoBar.push_info_bar(
-        content_widget = QWidget()
+                "warning",
-        content_layout = QVBoxLayout(content_widget)
+                "没有正在运行的任务",
-
+                "无法设置任务完成后动作",
-        self.top_bar = self.DispatchTopBar(self, name)
+                5000,
-        self.info = self.DispatchInfoCard(self)
-
-        content_layout.addWidget(self.top_bar)
-        content_layout.addWidget(self.info)
-
-        scrollArea.setWidget(content_widget)
-
-        layout.addWidget(scrollArea)
-
-        self.setLayout(layout)
-
-    class DispatchTopBar(CardWidget):
-
-        def __init__(self, parent=None, name: str = None):
-            super().__init__(parent)
-
-            Layout = QHBoxLayout(self)
-
-            if name == "主调度台":
-
-                self.Lable = SubtitleLabel("", self)
-                self.Lable.hide()
-                self.object = ComboBox()
-                self.object.setPlaceholderText("请选择调度对象")
-                self.mode = ComboBox()
-                self.mode.setPlaceholderText("请选择调度模式")
-
-                self.multi_button = PushButton("添加任务")
-                self.multi_button.clicked.connect(self.start_multi_task)
-                self.main_button = PushButton("开始任务")
-                self.main_button.clicked.connect(self.start_main_task)
-                self.multi_button.hide()
-
-                Layout.addWidget(self.Lable)
-                Layout.addWidget(self.object)
-                Layout.addWidget(self.mode)
-                Layout.addStretch(1)
-                Layout.addWidget(self.multi_button)
-                Layout.addWidget(self.main_button)
-
-            else:
-
-                self.Lable = SubtitleLabel(name, self)
-                self.main_button = PushButton("中止任务")
-
-                Layout.addWidget(self.Lable)
-                Layout.addStretch(1)
-                Layout.addWidget(self.main_button)
-
-        def start_main_task(self):
-            """开始任务"""
-
-            if self.object.currentIndex() == -1:
-                logger.warning("未选择调度对象")
-                MainInfoBar.push_info_bar(
-                    "warning", "未选择调度对象", "请选择后再开始任务", 5000
-                )
-                return None
-
-            if self.mode.currentIndex() == -1:
-                logger.warning("未选择调度模式")
-                MainInfoBar.push_info_bar(
-                    "warning", "未选择调度模式", "请选择后再开始任务", 5000
-                )
-                return None
-
-            if self.object.currentData() in Config.running_list:
-                logger.warning(f"任务已存在：{self.object.currentData()}")
-                MainInfoBar.push_info_bar(
-                    "warning", "任务已存在", self.object.currentData(), 5000
-                )
-                return None
-
-            if "调度队列" in self.object.currentData():
-
-                logger.info(f"用户添加任务：{self.object.currentData()}")
-                TaskManager.add_task(
-                    f"{self.mode.currentText()}_主调度台",
-                    self.object.currentData(),
-                    Config.queue_dict[self.object.currentData()]["Config"].toDict(),
-                )
-
-            elif "脚本" in self.object.currentData():
-
-                if Config.member_dict[self.object.currentData()]["Type"] == "Maa":
-
-                    logger.info(f"用户添加任务：{self.object.currentData()}")
-                    TaskManager.add_task(
-                        f"{self.mode.currentText()}_主调度台",
-                        "自定义队列",
-                        {"Queue": {"Member_1": self.object.currentData()}},
-                    )
-
-        def start_multi_task(self):
-            """开始任务"""
-
-            # 获取所有可用的队列和实例
-            text_list = []
-            data_list = []
-            for name, info in Config.queue_dict.items():
-                if name in Config.running_list:
-                    continue
-                text_list.append(
-                    "队列"
-                    if info["Config"].get(info["Config"].queueSet_Name) == ""
-                    else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}"
-                )
-                data_list.append(name)
-
-            for name, info in Config.member_dict.items():
-                if name in Config.running_list:
-                    continue
-                text_list.append(
-                    f"实例 - {info['Type']}"
-                    if info["Config"].get(info["Config"].MaaSet_Name) == ""
-                    else f"实例 - {info['Type']} - {info["Config"].get(info["Config"].MaaSet_Name)}"
-                )
-                data_list.append(name)
-
-            choice = ComboBoxMessageBox(
-                self.window(),
-                "选择一个对象以添加相应多开任务",
-                ["选择调度对象"],
-                [text_list],
-                [data_list],
             )
 
-            if choice.exec() and choice.input[0].currentIndex() != -1:
+        else:
 
-                if choice.input[0].currentData() in Config.running_list:
+            Config.set_power_sign(self.power_combox.currentData())
-                    logger.warning(f"任务已存在：{choice.input[0].currentData()}")
-                    MainInfoBar.push_info_bar(
-                        "warning", "任务已存在", choice.input[0].currentData(), 5000
-                    )
-                    return None
 
-                if "调度队列" in choice.input[0].currentData():
+    def start_multi_task(self) -> None:
+        """开始任务"""
+
+        # 获取所有可用的队列和实例
+        text_list = []
+        data_list = []
+        for name, info in Config.queue_dict.items():
+            if name in Config.running_list:
+                continue
+            text_list.append(
+                "队列"
+                if info["Config"].get(info["Config"].queueSet_Name) == ""
+                else f"队列 - {info["Config"].get(info["Config"].queueSet_Name)}"
+            )
+            data_list.append(name)
+
+        for name, info in Config.member_dict.items():
+            if name in Config.running_list:
+                continue
+            text_list.append(
+                f"实例 - {info['Type']}"
+                if info["Config"].get(info["Config"].MaaSet_Name) == ""
+                else f"实例 - {info['Type']} - {info["Config"].get(info["Config"].MaaSet_Name)}"
+            )
+            data_list.append(name)
+
+        choice = ComboBoxMessageBox(
+            self.window(),
+            "选择一个对象以添加相应多开任务",
+            ["选择调度对象"],
+            [text_list],
+            [data_list],
+        )
+
+        if choice.exec() and choice.input[0].currentIndex() != -1:
+
+            if choice.input[0].currentData() in Config.running_list:
+                logger.warning(f"任务已存在：{choice.input[0].currentData()}")
+                MainInfoBar.push_info_bar(
+                    "warning", "任务已存在", choice.input[0].currentData(), 5000
+                )
+                return None
+
+            if "调度队列" in choice.input[0].currentData():
+
+                logger.info(f"用户添加任务：{choice.input[0].currentData()}")
+                TaskManager.add_task(
+                    "自动代理_新调度台",
+                    choice.input[0].currentData(),
+                    Config.queue_dict[choice.input[0].currentData()]["Config"].toDict(),
+                )
+
+            elif "脚本" in choice.input[0].currentData():
+
+                if Config.member_dict[choice.input[0].currentData()]["Type"] == "Maa":
 
                     logger.info(f"用户添加任务：{choice.input[0].currentData()}")
                     TaskManager.add_task(
                         "自动代理_新调度台",
-                        choice.input[0].currentData(),
+                        f"自定义队列 - {choice.input[0].currentData()}",
-                        Config.queue_dict[choice.input[0].currentData()][
+                        {"Queue": {"Member_1": choice.input[0].currentData()}},
-                            "Config"
-                        ].toDict(),
                     )
 
-                elif "脚本" in choice.input[0].currentData():
+    class DispatchBox(QWidget):
 
-                    if (
+        def __init__(self, name: str, parent=None):
-                        Config.member_dict[choice.input[0].currentData()]["Type"]
-                        == "Maa"
-                    ):
-
-                        logger.info(f"用户添加任务：{choice.input[0].currentData()}")
-                        TaskManager.add_task(
-                            "自动代理_新调度台",
-                            f"自定义队列 - {choice.input[0].currentData()}",
-                            {"Queue": {"Member_1": choice.input[0].currentData()}},
-                        )
-
-    class DispatchInfoCard(HeaderCardWidget):
-
-        def __init__(self, parent=None):
             super().__init__(parent)
 
-            self.setTitle("调度信息")
+            self.setObjectName(name)
 
-            self.task = self.TaskInfoCard(self)
+            layout = QVBoxLayout()
-            self.user = self.UserInfoCard(self)
-            self.log_text = self.LogCard(self)
 
-            self.viewLayout.addWidget(self.task)
+            scrollArea = ScrollArea()
-            self.viewLayout.addWidget(self.user)
+            scrollArea.setWidgetResizable(True)
-            self.viewLayout.addWidget(self.log_text)
+            scrollArea.setContentsMargins(0, 0, 0, 0)
+            scrollArea.setStyleSheet("background: transparent; border: none;")
 
-            self.viewLayout.setStretch(0, 1)
+            content_widget = QWidget()
-            self.viewLayout.setStretch(1, 1)
+            content_layout = QVBoxLayout(content_widget)
-            self.viewLayout.setStretch(2, 5)
 
-        def update_board(self, task_list: list, user_list: list, log: str):
+            self.top_bar = self.DispatchTopBar(self, name)
-            """更新调度信息"""
+            self.info = self.DispatchInfoCard(self)
 
-            self.task.update_task(task_list)
+            content_layout.addWidget(self.top_bar)
-            self.user.update_user(user_list)
+            content_layout.addWidget(self.info)
-            self.log_text.text.setText(log)
 
-        class TaskInfoCard(HeaderCardWidget):
+            scrollArea.setWidget(content_widget)
+
+            layout.addWidget(scrollArea)
+
+            self.setLayout(layout)
+
+        class DispatchTopBar(CardWidget):
+
+            def __init__(self, parent=None, name: str = None):
+                super().__init__(parent)
+
+                Layout = QHBoxLayout(self)
+
+                if name == "主调度台":
+
+                    self.Lable = SubtitleLabel("", self)
+                    self.Lable.hide()
+                    self.object = ComboBox()
+                    self.object.setPlaceholderText("请选择调度对象")
+                    self.mode = ComboBox()
+                    self.mode.setPlaceholderText("请选择调度模式")
+
+                    self.main_button = PushButton("开始任务")
+                    self.main_button.clicked.connect(self.start_main_task)
+
+                    Layout.addWidget(self.Lable)
+                    Layout.addWidget(self.object)
+                    Layout.addWidget(self.mode)
+                    Layout.addStretch(1)
+                    Layout.addWidget(self.main_button)
+
+                else:
+
+                    self.Lable = SubtitleLabel(name, self)
+                    self.main_button = PushButton("中止任务")
+
+                    Layout.addWidget(self.Lable)
+                    Layout.addStretch(1)
+                    Layout.addWidget(self.main_button)
+
+            def start_main_task(self):
+                """开始任务"""
+
+                if self.object.currentIndex() == -1:
+                    logger.warning("未选择调度对象")
+                    MainInfoBar.push_info_bar(
+                        "warning", "未选择调度对象", "请选择后再开始任务", 5000
+                    )
+                    return None
+
+                if self.mode.currentIndex() == -1:
+                    logger.warning("未选择调度模式")
+                    MainInfoBar.push_info_bar(
+                        "warning", "未选择调度模式", "请选择后再开始任务", 5000
+                    )
+                    return None
+
+                if self.object.currentData() in Config.running_list:
+                    logger.warning(f"任务已存在：{self.object.currentData()}")
+                    MainInfoBar.push_info_bar(
+                        "warning", "任务已存在", self.object.currentData(), 5000
+                    )
+                    return None
+
+                if "调度队列" in self.object.currentData():
+
+                    logger.info(f"用户添加任务：{self.object.currentData()}")
+                    TaskManager.add_task(
+                        f"{self.mode.currentText()}_主调度台",
+                        self.object.currentData(),
+                        Config.queue_dict[self.object.currentData()]["Config"].toDict(),
+                    )
+
+                elif "脚本" in self.object.currentData():
+
+                    if Config.member_dict[self.object.currentData()]["Type"] == "Maa":
+
+                        logger.info(f"用户添加任务：{self.object.currentData()}")
+                        TaskManager.add_task(
+                            f"{self.mode.currentText()}_主调度台",
+                            "自定义队列",
+                            {"Queue": {"Member_1": self.object.currentData()}},
+                        )
+
+        class DispatchInfoCard(HeaderCardWidget):
 
             def __init__(self, parent=None):
                 super().__init__(parent)
-                self.setTitle("任务队列")
 
-                self.Layout = QVBoxLayout()
+                self.setTitle("调度信息")
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                self.task_cards: List[StatefulItemCard] = []
+                self.task = self.TaskInfoCard(self)
+                self.user = self.UserInfoCard(self)
+                self.log_text = self.LogCard(self)
 
-            def create_task(self, task_list: list):
+                self.viewLayout.addWidget(self.task)
-                """创建任务队列"""
+                self.viewLayout.addWidget(self.user)
+                self.viewLayout.addWidget(self.log_text)
 
-                while self.Layout.count() > 0:
+                self.viewLayout.setStretch(0, 1)
-                    item = self.Layout.takeAt(0)
+                self.viewLayout.setStretch(1, 1)
-                    if item.spacerItem():
+                self.viewLayout.setStretch(2, 5)
-                        self.Layout.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
 
-                self.task_cards = []
+            def update_board(self, task_list: list, user_list: list, log: str):
+                """更新调度信息"""
 
-                for task in task_list:
+                self.task.update_task(task_list)
+                self.user.update_user(user_list)
+                self.log_text.text.setText(log)
 
-                    self.task_cards.append(StatefulItemCard(task))
+            class TaskInfoCard(HeaderCardWidget):
-                    self.Layout.addWidget(self.task_cards[-1])
 
-                self.Layout.addStretch(1)
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("任务队列")
 
-            def update_task(self, task_list: list):
+                    self.Layout = QVBoxLayout()
-                """更新任务队列"""
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                for i in range(len(task_list)):
+                    self.task_cards: List[StatefulItemCard] = []
 
-                    self.task_cards[i].update_status(task_list[i][1])
+                def create_task(self, task_list: list):
+                    """创建任务队列"""
 
-        class UserInfoCard(HeaderCardWidget):
+                    while self.Layout.count() > 0:
+                        item = self.Layout.takeAt(0)
+                        if item.spacerItem():
+                            self.Layout.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
 
-            def __init__(self, parent=None):
+                    self.task_cards = []
-                super().__init__(parent)
-                self.setTitle("用户队列")
 
-                self.Layout = QVBoxLayout()
+                    for task in task_list:
-                self.viewLayout.addLayout(self.Layout)
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                self.user_cards: List[StatefulItemCard] = []
+                        self.task_cards.append(StatefulItemCard(task))
+                        self.Layout.addWidget(self.task_cards[-1])
 
-            def create_user(self, user_list: list):
+                    self.Layout.addStretch(1)
-                """创建用户队列"""
 
-                while self.Layout.count() > 0:
+                def update_task(self, task_list: list):
-                    item = self.Layout.takeAt(0)
+                    """更新任务队列"""
-                    if item.spacerItem():
-                        self.Layout.removeItem(item.spacerItem())
-                    elif item.widget():
-                        item.widget().deleteLater()
 
-                self.user_cards = []
+                    for i in range(len(task_list)):
 
-                for user in user_list:
+                        self.task_cards[i].update_status(task_list[i][1])
 
-                    self.user_cards.append(StatefulItemCard(user))
+            class UserInfoCard(HeaderCardWidget):
-                    self.Layout.addWidget(self.user_cards[-1])
 
-                self.Layout.addStretch(1)
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("用户队列")
 
-            def update_user(self, user_list: list):
+                    self.Layout = QVBoxLayout()
-                """更新用户队列"""
+                    self.viewLayout.addLayout(self.Layout)
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
 
-                for i in range(len(user_list)):
+                    self.user_cards: List[StatefulItemCard] = []
 
-                    self.user_cards[i].Label.setText(user_list[i][0])
+                def create_user(self, user_list: list):
-                    self.user_cards[i].update_status(user_list[i][1])
+                    """创建用户队列"""
 
-        class LogCard(HeaderCardWidget):
+                    while self.Layout.count() > 0:
+                        item = self.Layout.takeAt(0)
+                        if item.spacerItem():
+                            self.Layout.removeItem(item.spacerItem())
+                        elif item.widget():
+                            item.widget().deleteLater()
 
-            def __init__(self, parent=None):
+                    self.user_cards = []
-                super().__init__(parent)
-                self.setTitle("日志")
 
-                self.text = TextBrowser()
+                    for user in user_list:
-                self.viewLayout.setContentsMargins(3, 0, 3, 3)
-                self.viewLayout.addWidget(self.text)
 
-                self.text.textChanged.connect(self.to_end)
+                        self.user_cards.append(StatefulItemCard(user))
+                        self.Layout.addWidget(self.user_cards[-1])
 
-            def to_end(self):
+                    self.Layout.addStretch(1)
-                """滚动到底部"""
 
-                self.text.moveCursor(QTextCursor.End)
+                def update_user(self, user_list: list):
-                self.text.ensureCursorVisible()
+                    """更新用户队列"""
+
+                    for i in range(len(user_list)):
+
+                        self.user_cards[i].Label.setText(user_list[i][0])
+                        self.user_cards[i].update_status(user_list[i][1])
+
+            class LogCard(HeaderCardWidget):
+
+                def __init__(self, parent=None):
+                    super().__init__(parent)
+                    self.setTitle("日志")
+
+                    self.text = TextBrowser()
+                    self.viewLayout.setContentsMargins(3, 0, 3, 3)
+                    self.viewLayout.addWidget(self.text)
+
+                    self.text.textChanged.connect(self.to_end)
+
+                def to_end(self):
+                    """滚动到底部"""
+
+                    self.text.moveCursor(QTextCursor.End)
+                    self.text.ensureCursorVisible()

app/ui/downloader.py

@@ -21,24 +21,19 @@
 """
 AUTO_MAA
 AUTO_MAA更新器
-v1.2
+v4.3
 作者：DLmaster_361
 """
 
-import sys
-import json
 import zipfile
 import requests
 import subprocess
 import time
 import psutil
-import win32crypt
-import base64
-from packaging import version
 from functools import partial
 from pathlib import Path
 
-from PySide6.QtWidgets import QApplication, QDialog, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QVBoxLayout
 from qfluentwidgets import (
     ProgressBar,
     IndeterminateProgressBar,
@@ -46,7 +41,7 @@ from qfluentwidgets import (
     setTheme,
     Theme,
 )
-from PySide6.QtGui import QIcon, QCloseEvent
+from PySide6.QtGui import QCloseEvent
 from PySide6.QtCore import QThread, Signal, QTimer, QEventLoop
 
 from typing import List, Dict, Union
@@ -237,14 +232,9 @@ class DownloadManager(QDialog):
         self.version = version
         self.config = config
         self.download_path = app_path / "DOWNLOAD_TEMP.zip"  #  临时下载文件的路径
-        self.version_path = app_path / "resources/version.json"
         self.download_process_dict: Dict[str, DownloadProcess] = {}
         self.timer_dict: Dict[str, QTimer] = {}
 
-        self.setWindowTitle("AUTO_MAA更新器")
-        self.setWindowIcon(
-            QIcon(str(app_path / "resources/icons/AUTO_MAA_Updater.ico"))
-        )
         self.resize(700, 70)
 
         setTheme(Theme.AUTO, lazy=True)
@@ -539,41 +529,25 @@ class DownloadManager(QDialog):
         self.zip_extract.start()
         self.zip_loop.exec()
 
-        self.update_info("正在删除已弃用的文件")
-        if (self.app_path / "changes.json").exists():
-
-            with (self.app_path / "changes.json").open(mode="r", encoding="utf-8") as f:
-                info: Dict[str, List[str]] = json.load(f)
-
-            if "deleted" in info:
-                for file_path in info["deleted"]:
-                    if (self.app_path / file_path).exists():
-                        (self.app_path / file_path).unlink()
-
-            (self.app_path / "changes.json").unlink()
-
         self.update_info("正在删除临时文件")
         self.update_progress(0, 0, 0)
+        if (self.app_path / "changes.json").exists():
+            (self.app_path / "changes.json").unlink()
         if self.download_path.exists():
             self.download_path.unlink()
 
-        # 主程序更新完成后打开对应程序
+        # 下载完成后打开对应程序
-        if not self.isInterruptionRequested and self.name == "AUTO_MAA":
+        if not self.isInterruptionRequested and self.name == "MAA":
-            subprocess.Popen(
-                [self.app_path / "AUTO_MAA.exe"],
-                creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
-                | subprocess.DETACHED_PROCESS
-                | subprocess.CREATE_NO_WINDOW,
-            )
-        elif not self.isInterruptionRequested and self.name == "MAA":
             subprocess.Popen(
                 [self.app_path / "MAA.exe"],
                 creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
                 | subprocess.DETACHED_PROCESS
                 | subprocess.CREATE_NO_WINDOW,
             )
-
+        if self.name == "AUTO_MAA":
-        self.update_info(f"{self.name}更新成功！")
+            self.update_info(f"即将安装{self.name}")
+        else:
+            self.update_info(f"{self.name}下载成功！")
         self.update_progress(0, 100, 100)
         self.download_accomplish.emit()
 
@@ -615,142 +589,3 @@ class DownloadManager(QDialog):
         self.requestInterruption()
 
         event.accept()
-
-
-class AUTO_MAA_Downloader(QApplication):
-    def __init__(
-        self, app_path: Path, name: str, main_version: list, config: dict
-    ) -> None:
-        super().__init__()
-
-        self.main = DownloadManager(app_path, name, main_version, config)
-        self.main.show()
-        self.main.run()
-
-
-if __name__ == "__main__":
-
-    # 获取软件自身的路径
-    app_path = Path(sys.argv[0]).resolve().parent
-
-    # 从本地版本信息文件获取当前版本信息
-    if (app_path / "resources/version.json").exists():
-        with (app_path / "resources/version.json").open(
-            mode="r", encoding="utf-8"
-        ) as f:
-            current_version_info = json.load(f)
-        current_version = list(
-            map(int, current_version_info["main_version"].split("."))
-        )
-    else:
-        current_version = [0, 0, 0, 0]
-
-    # 从本地配置文件获取更新信息
-    if (app_path / "config/config.json").exists():
-        with (app_path / "config/config.json").open(mode="r", encoding="utf-8") as f:
-            config = json.load(f)
-        if "Update" in config:
-
-            if "UpdateType" in config["Update"]:
-                update_type = config["Update"]["UpdateType"]
-            else:
-                update_type = "stable"
-            if "ProxyUrlList" in config["Update"]:
-                proxy_list = config["Update"]["ProxyUrlList"]
-            else:
-                proxy_list = []
-            if "ThreadNumb" in config["Update"]:
-                thread_numb = config["Update"]["ThreadNumb"]
-            else:
-                thread_numb = 8
-            if "MirrorChyanCDK" in config["Update"]:
-                mirrorchyan_CDK = (
-                    win32crypt.CryptUnprotectData(
-                        base64.b64decode(config["Update"]["MirrorChyanCDK"]),
-                        None,
-                        None,
-                        None,
-                        0,
-                    )[1].decode("utf-8")
-                    if config["Update"]["MirrorChyanCDK"]
-                    else ""
-                )
-            else:
-                mirrorchyan_CDK = ""
-
-        else:
-            update_type = "stable"
-            proxy_list = []
-            thread_numb = 8
-            mirrorchyan_CDK = ""
-    else:
-        update_type = "stable"
-        proxy_list = []
-        thread_numb = 8
-        mirrorchyan_CDK = ""
-
-    # 从远程服务器获取最新版本信息
-    for _ in range(3):
-        try:
-            response = requests.get(
-                f"https://mirrorchyan.com/api/resources/AUTO_MAA/latest?user_agent=AutoMaaDownloader&current_version={version_text(current_version)}&cdk={mirrorchyan_CDK}&channel={update_type}",
-                timeout=10,
-            )
-            version_info: Dict[str, Union[int, str, Dict[str, str]]] = response.json()
-            break
-        except Exception as e:
-            err = e
-            time.sleep(0.1)
-    else:
-        sys.exit(f"获取版本信息时出错：\n{err}")
-
-    if version_info["code"] == 0:
-
-        if "url" in version_info["data"]:
-            download_config = {
-                "mode": "MirrorChyan",
-                "thread_numb": 1,
-                "url": version_info["data"]["url"],
-            }
-        else:
-
-            download_config = {"mode": "Proxy", "thread_numb": thread_numb}
-    else:
-        sys.exit(f"获取版本信息时出错：{version_info["msg"]}")
-
-    remote_version = list(
-        map(
-            int,
-            version_info["data"]["version_name"][1:].replace("-beta", "").split("."),
-        )
-    )
-
-    if download_config["mode"] == "Proxy":
-        for _ in range(3):
-            try:
-                response = requests.get(
-                    "https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/download_info.json",
-                    timeout=10,
-                )
-                download_info = response.json()
-
-                download_config["proxy_list"] = list(
-                    set(proxy_list + download_info["proxy_list"])
-                )
-                download_config["download_dict"] = download_info["download_dict"]
-                break
-            except Exception as e:
-                err = e
-                time.sleep(0.1)
-        else:
-            sys.exit(f"获取代理信息时出错：{err}")
-
-    if (app_path / "changes.json").exists():
-        (app_path / "changes.json").unlink()
-
-    # 启动更新线程
-    if version.parse(version_text(remote_version)) > version.parse(
-        version_text(current_version)
-    ):
-        app = AUTO_MAA_Downloader(app_path, "AUTO_MAA", remote_version, download_config)
-        sys.exit(app.exec())

app/ui/history.py

@@ -69,6 +69,8 @@ class History(QWidget):
 
         scrollArea = ScrollArea()
         scrollArea.setWidgetResizable(True)
+        scrollArea.setContentsMargins(0, 0, 0, 0)
+        scrollArea.setStyleSheet("background: transparent; border: none;")
         scrollArea.setWidget(content_widget)
         layout = QVBoxLayout()
         layout.addWidget(self.history_top_bar)

app/ui/home.py

@@ -149,6 +149,8 @@ class Home(QWidget):
         layout = QVBoxLayout()
         scrollArea = ScrollArea()
         scrollArea.setWidgetResizable(True)
+        scrollArea.setContentsMargins(0, 0, 0, 0)
+        scrollArea.setStyleSheet("background: transparent; border: none;")
         scrollArea.setWidget(widget)
         layout.addWidget(scrollArea)
         self.setLayout(layout)

app/ui/main_window.py

@@ -28,7 +28,6 @@ v4.3
 from loguru import logger
 from PySide6.QtWidgets import QApplication, QSystemTrayIcon
 from qfluentwidgets import (
-    qconfig,
     Action,
     SystemTrayMenu,
     SplashScreen,
@@ -182,7 +181,7 @@ class AUTO_MAA(MSFluentWindow):
             Action(
                 FluentIcon.POWER_BUTTON,
                 "退出主程序",
-                triggered=lambda: (self.window().close(), QApplication.quit()),
+                triggered=lambda: System.set_power("KillSelf"),
             )
         )
 
@@ -193,6 +192,7 @@ class AUTO_MAA(MSFluentWindow):
         self.set_min_method()
 
         Config.user_info_changed.connect(self.member_manager.refresh_dashboard)
+        Config.power_sign_changed.connect(self.dispatch_center.update_power_sign)
         TaskManager.create_gui.connect(self.dispatch_center.add_board)
         TaskManager.connect_gui.connect(self.dispatch_center.connect_main_board)
         Notify.push_info_bar.connect(MainInfoBar.push_info_bar)
@@ -247,10 +247,10 @@ class AUTO_MAA(MSFluentWindow):
         # 清理旧日志
         self.clean_old_logs()
 
-        # 清理临时更新器
+        # 清理安装包
-        if (Config.app_path / "AUTO_Updater.active.exe").exists():
+        if (Config.app_path / "AUTO_MAA-Setup.exe").exists():
             try:
-                (Config.app_path / "AUTO_Updater.active.exe").unlink()
+                (Config.app_path / "AUTO_MAA-Setup.exe").unlink()
             except Exception:
                 pass
 

app/ui/member_manager.py

@@ -38,7 +38,6 @@ from PySide6.QtWidgets import (
 from PySide6.QtGui import QIcon
 from qfluentwidgets import (
     Action,
-    Pivot,
     ScrollArea,
     FluentIcon,
     MessageBox,
@@ -49,16 +48,17 @@ from qfluentwidgets import (
     TableWidget,
     PrimaryToolButton,
 )
-from PySide6.QtCore import Qt, Signal
+from PySide6.QtCore import Signal
 from datetime import datetime
 from functools import partial
 from pathlib import Path
 from typing import List
 import shutil
+import json
 
 from app.core import Config, MainInfoBar, TaskManager, MaaConfig, MaaUserConfig, Network
 from app.services import Crypto
-from app.utils import DownloadManager
+from .downloader import DownloadManager
 from .Widget import (
     LineEditMessageBox,
     LineEditSettingCard,
@@ -71,6 +71,7 @@ from .Widget import (
     SwitchSettingCard,
     PushAndSwitchButtonSettingCard,
     PushAndComboBoxSettingCard,
+    PivotArea,
 )
 
 
@@ -326,21 +327,41 @@ class MemberManager(QWidget):
             )
             return None
 
+        # 从远程服务器获取应用列表
+        Network.set_info(
+            mode="get",
+            url="https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/apps_info.json",
+        )
+        Network.start()
+        Network.loop.exec()
+        if Network.stutus_code == 200:
+            apps_info = Network.response_json
+        else:
+            logger.warning(f"获取应用列表时出错：{Network.error_message}")
+            MainInfoBar.push_info_bar(
+                "warning",
+                "获取应用列表时出错",
+                f"网络错误：{Network.stutus_code}",
+                5000,
+            )
+            return None
+
         choice = ComboBoxMessageBox(
             self.window(),
             "选择一个脚本类型以下载相应脚本",
             ["选择脚本类型"],
-            [["MAA", "StarRailAssistant"]],
+            [list(apps_info.keys())],
         )
         if choice.exec() and choice.input[0].currentIndex() != -1:
 
             app_name = choice.input[0].currentText()
+            app_rid = apps_info[app_name]["rid"]
 
-            (Config.app_path / f"script/{app_name}").mkdir(parents=True, exist_ok=True)
+            (Config.app_path / f"script/{app_rid}").mkdir(parents=True, exist_ok=True)
             folder = QFileDialog.getExistingDirectory(
                 self,
                 f"选择{app_name}下载目录",
-                str(Config.app_path / f"script/{app_name}"),
+                str(Config.app_path / f"script/{app_rid}"),
             )
             if not folder:
                 logger.warning(f"选择{app_name}下载目录时未选择文件夹")
@@ -349,16 +370,11 @@ class MemberManager(QWidget):
                 )
                 return None
 
-            if app_name in ["MAA"]:
-
-                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"
-
-            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.set_info(
+                mode="get",
+                url=f"https://mirrorchyan.com/api/resources/{app_rid}/latest?user_agent=AutoMaaGui&cdk={Crypto.win_decryptor(Config.get(Config.update_MirrorChyanCDK))}&os={apps_info[app_name]["os"]}&arch={apps_info[app_name]["arch"]}&channel=stable",
+            )
             Network.start()
             Network.loop.exec()
             if Network.stutus_code == 200:
@@ -415,7 +431,7 @@ class MemberManager(QWidget):
 
             self.downloader = DownloadManager(
                 Path(folder),
-                app_name,
+                app_rid,
                 None,
                 {
                     "mode": "MirrorChyan",
@@ -469,13 +485,17 @@ class MemberManager(QWidget):
 
             self.setObjectName("脚本管理页面组")
 
-            self.pivot = Pivot(self)
+            self.pivotArea = PivotArea(self)
+            self.pivot = self.pivotArea.pivot
+
             self.stackedWidget = QStackedWidget(self)
-            self.Layout = QVBoxLayout(self)
+            self.stackedWidget.setContentsMargins(0, 0, 0, 0)
+            self.stackedWidget.setStyleSheet("background: transparent; border: none;")
 
             self.script_list: List[MemberManager.MemberSettingBox.MaaSettingBox] = []
 
-            self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+            self.Layout = QVBoxLayout(self)
+            self.Layout.addWidget(self.pivotArea)
             self.Layout.addWidget(self.stackedWidget)
             self.Layout.setContentsMargins(0, 0, 0, 0)
 
@@ -547,6 +567,8 @@ class MemberManager(QWidget):
 
                 scrollArea = ScrollArea()
                 scrollArea.setWidgetResizable(True)
+                scrollArea.setContentsMargins(0, 0, 0, 0)
+                scrollArea.setStyleSheet("background: transparent; border: none;")
 
                 content_widget = QWidget()
                 content_layout = QVBoxLayout(content_widget)
@@ -995,9 +1017,14 @@ class MemberManager(QWidget):
                         self.setObjectName("用户管理")
                         self.name = name
 
-                        self.pivot = Pivot(self)
+                        self.pivotArea = PivotArea(self)
+                        self.pivot = self.pivotArea.pivot
+
                         self.stackedWidget = QStackedWidget(self)
-                        self.Layout = QVBoxLayout(self)
+                        self.stackedWidget.setContentsMargins(0, 0, 0, 0)
+                        self.stackedWidget.setStyleSheet(
+                            "background: transparent; border: none;"
+                        )
 
                         self.script_list: List[
                             MemberManager.MemberSettingBox.MaaSettingBox.UserManager.UserSettingBox.UserMemberSettingBox
@@ -1008,7 +1035,8 @@ class MemberManager(QWidget):
                         self.stackedWidget.addWidget(self.user_dashboard)
                         self.pivot.addItem(routeKey="用户仪表盘", text="用户仪表盘")
 
-                        self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+                        self.Layout = QVBoxLayout(self)
+                        self.Layout.addWidget(self.pivotArea)
                         self.Layout.addWidget(self.stackedWidget)
                         self.Layout.setContentsMargins(0, 0, 0, 0)
 
@@ -1383,7 +1411,7 @@ class MemberManager(QWidget):
                             self.card_InfrastMode = PushAndComboBoxSettingCard(
                                 icon=FluentIcon.CAFE,
                                 title="基建模式",
-                                content="配置文件仅在自定义基建中生效",
+                                content="自定义基建配置文件未生效",
                                 text="选择配置文件",
                                 texts=[
                                     "常规模式",
@@ -1534,6 +1562,9 @@ class MemberManager(QWidget):
                             self.card_Mode.comboBox.currentIndexChanged.connect(
                                 self.switch_mode
                             )
+                            self.card_InfrastMode.comboBox.currentIndexChanged.connect(
+                                self.switch_infrastructure
+                            )
                             self.card_Annihilation.clicked.connect(
                                 lambda: self.set_maa("Annihilation")
                             )
@@ -1547,6 +1578,7 @@ class MemberManager(QWidget):
                             Config.PASSWORD_refreshed.connect(self.refresh_password)
 
                             self.switch_mode()
+                            self.switch_infrastructure()
 
                         def switch_mode(self) -> None:
 
@@ -1564,6 +1596,27 @@ class MemberManager(QWidget):
                                 self.card_Annihilation.button.setVisible(True)
                                 self.card_Routine.setVisible(True)
 
+                        def switch_infrastructure(self) -> None:
+
+                            if (
+                                self.config.get(self.config.Info_InfrastMode)
+                                == "Custom"
+                            ):
+                                self.card_InfrastMode.button.setVisible(True)
+                                with (
+                                    self.user_path
+                                    / "Infrastructure/infrastructure.json"
+                                ).open(mode="r", encoding="utf-8") as f:
+                                    infrastructure = json.load(f)
+                                self.card_InfrastMode.setContent(
+                                    f"当前基建配置：{infrastructure.get("title","未命名")}"
+                                )
+                            else:
+                                self.card_InfrastMode.button.setVisible(False)
+                                self.card_InfrastMode.setContent(
+                                    "自定义基建配置文件未生效"
+                                )
+
                         def refresh_gameid(self):
 
                             self.card_GameId.reLoadOptions(
@@ -1619,6 +1672,7 @@ class MemberManager(QWidget):
                                     self.user_path
                                     / "Infrastructure/infrastructure.json",
                                 )
+                                self.switch_infrastructure()
                             else:
                                 logger.warning("未选择自定义基建文件")
                                 MainInfoBar.push_info_bar(

app/ui/queue_manager.py

@@ -34,14 +34,12 @@ from PySide6.QtWidgets import (
 )
 from qfluentwidgets import (
     Action,
-    Pivot,
     ScrollArea,
     FluentIcon,
     MessageBox,
     HeaderCardWidget,
     CommandBar,
 )
-from PySide6.QtCore import Qt
 from typing import List
 
 from app.core import QueueConfig, Config, MainInfoBar
@@ -52,6 +50,7 @@ from .Widget import (
     TimeEditSettingCard,
     NoOptionComboBoxSettingCard,
     HistoryCard,
+    PivotArea,
 )
 
 
@@ -305,15 +304,19 @@ class QueueManager(QWidget):
 
             self.setObjectName("调度队列管理")
 
-            self.pivot = Pivot(self)
+            self.pivotArea = PivotArea()
+            self.pivot = self.pivotArea.pivot
+
             self.stackedWidget = QStackedWidget(self)
-            self.Layout = QVBoxLayout(self)
+            self.stackedWidget.setContentsMargins(0, 0, 0, 0)
+            self.stackedWidget.setStyleSheet("background: transparent; border: none;")
 
             self.script_list: List[
                 QueueManager.QueueSettingBox.QueueMemberSettingBox
             ] = []
 
-            self.Layout.addWidget(self.pivot, 0, Qt.AlignHCenter)
+            self.Layout = QVBoxLayout(self)
+            self.Layout.addWidget(self.pivotArea)
             self.Layout.addWidget(self.stackedWidget)
             self.Layout.setContentsMargins(0, 0, 0, 0)
 
@@ -380,6 +383,8 @@ class QueueManager(QWidget):
 
                 scrollArea = ScrollArea()
                 scrollArea.setWidgetResizable(True)
+                scrollArea.setContentsMargins(0, 0, 0, 0)
+                scrollArea.setStyleSheet("background: transparent; border: none;")
 
                 content_widget = QWidget()
                 content_layout = QVBoxLayout(content_widget)

app/ui/setting.py

@@ -26,7 +26,8 @@ v4.3
 """
 
 from loguru import logger
-from PySide6.QtWidgets import QApplication, QWidget, QVBoxLayout
+from PySide6.QtWidgets import QWidget, QVBoxLayout
+from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from qfluentwidgets import (
     ScrollArea,
@@ -50,6 +51,7 @@ from typing import Dict, Union
 
 from app.core import Config, MainInfoBar, Network
 from app.services import Crypto, System, Notify
+from .downloader import DownloadManager
 from .Widget import (
     SwitchSettingCard,
     RangeSettingCard,
@@ -101,6 +103,8 @@ class Setting(QWidget):
 
         scrollArea = ScrollArea()
         scrollArea.setWidgetResizable(True)
+        scrollArea.setContentsMargins(0, 0, 0, 0)
+        scrollArea.setStyleSheet("background: transparent; border: none;")
         scrollArea.setWidget(content_widget)
         layout = QVBoxLayout()
         layout.addWidget(scrollArea)
@@ -378,45 +382,72 @@ class Setting(QWidget):
                     else:
                         all_version_info[key] = value.copy()
 
-            version_info = {
-                "更新总览": f"{main_version_info}\n\n{version_info_markdown(update_version_info)}",
-                "ALL~版本信息": version_info_markdown(all_version_info),
-                **{
-                    version_text(list(map(int, k.split(".")))): version_info_markdown(v)
-                    for k, v in version_info_json.items()
-                },
-            }
-
             # 询问是否开始版本更新
-            choice = NoticeMessageBox(self.window(), "版本更新", version_info)
+            choice = NoticeMessageBox(
+                self.window(),
+                "版本更新",
+                {
+                    "更新总览": f"{main_version_info}\n\n{version_info_markdown(update_version_info)}",
+                    "ALL~版本信息": version_info_markdown(all_version_info),
+                    **{
+                        version_text(
+                            list(map(int, k.split(".")))
+                        ): version_info_markdown(v)
+                        for k, v in version_info_json.items()
+                    },
+                },
+            )
             if choice.exec():
 
-                with Config.version_path.open(mode="r", encoding="utf-8") as f:
+                if "url" in version_info["data"]:
-                    version_info = json.load(f)
+                    download_config = {
-                version_info["main_version"] = Config.VERSION
+                        "mode": "MirrorChyan",
-                with Config.version_path.open(mode="w", encoding="utf-8") as f:
+                        "thread_numb": 1,
-                    json.dump(version_info, f, ensure_ascii=False, indent=4)
+                        "url": version_info["data"]["url"],
-
+                    }
-                if (Config.app_path / "AUTO_Updater.exe").exists():
-                    shutil.copy(
-                        Config.app_path / "AUTO_Updater.exe",
-                        Config.app_path / "AUTO_Updater.active.exe",
-                    )
                 else:
-                    logger.error("更新器文件不存在")
-                    MainInfoBar.push_info_bar(
-                        "error", "更新器不存在", "请手动前往 GitHub 获取最新版本", -1
-                    )
-                    return None
 
-                subprocess.Popen(
+                    # 从远程服务器获取代理信息
-                    [Config.app_path / "AUTO_Updater.active.exe"],
+                    Network.set_info(
-                    creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
+                        mode="get",
-                    | subprocess.DETACHED_PROCESS
+                        url="https://gitee.com/DLmaster_361/AUTO_MAA/raw/server/download_info.json",
-                    | subprocess.CREATE_NO_WINDOW,
+                    )
+                    Network.start()
+                    Network.loop.exec()
+                    if Network.stutus_code == 200:
+                        download_info = Network.response_json
+                    else:
+                        logger.warning(f"获取应用列表时出错：{Network.error_message}")
+                        MainInfoBar.push_info_bar(
+                            "warning",
+                            "获取应用列表时出错",
+                            f"网络错误：{Network.stutus_code}",
+                            5000,
+                        )
+                        return None
+
+                    download_config = {
+                        "mode": "Proxy",
+                        "thread_numb": Config.get(Config.update_ThreadNumb),
+                        "proxy_list": list(
+                            set(
+                                Config.get(Config.update_ProxyUrlList)
+                                + download_info["proxy_list"]
+                            )
+                        ),
+                        "download_dict": download_info["download_dict"],
+                    }
+
+                self.downloader = DownloadManager(
+                    Config.app_path, "AUTO_MAA", remote_version, download_config
                 )
-                self.window().close()
+                self.downloader.setWindowTitle("AUTO_MAA更新器")
-                QApplication.quit()
+                self.downloader.setWindowIcon(
+                    QIcon(str(Config.app_path / "resources/icons/AUTO_MAA_Updater.ico"))
+                )
+                self.downloader.download_accomplish.connect(self.start_setup)
+                self.downloader.show()
+                self.downloader.run()
 
         elif (
             if_show
@@ -437,6 +468,23 @@ class Setting(QWidget):
             else:
                 MainInfoBar.push_info_bar("success", "更新检查", "已是最新版本~", 3000)
 
+    def start_setup(self) -> None:
+        subprocess.Popen(
+            [
+                Config.app_path / "AUTO_MAA-Setup.exe",
+                "/SP-",
+                "/SILENT",
+                "/NOCANCEL",
+                "/FORCECLOSEAPPLICATIONS",
+                "/LANG=Chinese",
+                f"/DIR={Config.app_path}",
+            ],
+            creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
+            | subprocess.DETACHED_PROCESS
+            | subprocess.CREATE_NO_WINDOW,
+        )
+        System.set_power("KillSelf")
+
     def show_notice(self, if_show: bool = False, if_first: bool = False) -> None:
         """显示公告"""
 

app/utils/AUTO_MAA.iss

@@ -51,7 +51,6 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 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
@@ -63,7 +62,7 @@ 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
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
 
 [Code]
 var

app/utils/__init__.py

@@ -29,6 +29,4 @@ __version__ = "4.2.0"
 __author__ = "DLmaster361 <DLmaster_361@163.com>"
 __license__ = "GPL-3.0 license"
 
-from .downloader import DownloadManager
+__all__ = []
-
-__all__ = ["DownloadManager"]

app/utils/package.py

@@ -66,7 +66,6 @@ if __name__ == "__main__":
         version = json.load(f)
 
     main_version_numb = list(map(int, version["main_version"].split(".")))
-    updater_version_numb = list(map(int, version["updater_version"].split(".")))
 
     print("Packaging AUTO_MAA main program ...")
 
@@ -86,35 +85,10 @@ if __name__ == "__main__":
 
     print("AUTO_MAA main program packaging completed !")
 
-    print("Packaging AUTO_MAA update program ...")
+    print("start to create setup program ...")
-
-    shutil.copy(root_path / "app/utils/downloader.py", root_path)
-    os.system(
-        "powershell -Command python -m nuitka --standalone --onefile --mingw64"
-        " --enable-plugins=pyside6 --windows-console-mode=disable"
-        " --onefile-tempdir-spec='{TEMP}\\AUTO_MAA_Updater'"
-        " --windows-icon-from-ico=resources\\icons\\AUTO_MAA_Updater.ico"
-        " --company-name='AUTO_MAA Team' --product-name=AUTO_MAA"
-        f" --file-version={version["updater_version"]}"
-        f" --product-version={version["main_version"]}"
-        " --file-description='AUTO_MAA Component'"
-        " --copyright='Copyright © 2024-2025 DLmaster361'"
-        " --assume-yes-for-downloads --output-filename=AUTO_Updater"
-        " --remove-output downloader.py"
-    )
-    (root_path / "downloader.py").unlink()
-
-    print("AUTO_MAA update program packaging completed !")
 
     (root_path / "AUTO_MAA").mkdir(parents=True, exist_ok=True)
-
-    print("Start to move AUTO_MAA program ...")
-
     shutil.move(root_path / "AUTO_MAA.exe", root_path / "AUTO_MAA/")
-    shutil.move(root_path / "AUTO_Updater.exe", root_path / "AUTO_MAA/")
-
-    print("Start to copy rescourses ...")
-
     shutil.copytree(root_path / "app", root_path / "AUTO_MAA/app")
     shutil.copytree(root_path / "resources", root_path / "AUTO_MAA/resources")
     shutil.copy(root_path / "main.py", root_path / "AUTO_MAA/")
@@ -122,34 +96,8 @@ if __name__ == "__main__":
     shutil.copy(root_path / "README.md", root_path / "AUTO_MAA/")
     shutil.copy(root_path / "LICENSE", root_path / "AUTO_MAA/")
 
-    print("Start to compress ...")
-
-    shutil.make_archive(
-        base_name=root_path / f"AUTO_MAA_{version_text(main_version_numb)}",
-        format="zip",
-        root_dir=root_path / "AUTO_MAA",
-        base_dir=".",
-    )
-    shutil.rmtree(root_path / "AUTO_MAA")
-
-    print("compress completed !")
-
-    all_version_info = {}
-    for v_i in version["version_info"].values():
-        for key, value in v_i.items():
-            if key in all_version_info:
-                all_version_info[key] += value.copy()
-            else:
-                all_version_info[key] = value.copy()
-
-    (root_path / "version_info.txt").write_text(
-        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 ""',
@@ -160,6 +108,36 @@ if __name__ == "__main__":
         )
         .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)
+
+    os.system(f'ISCC "{root_path / "AUTO_MAA.iss"}"')
+
+    (root_path / "AUTO_MAA_Setup").mkdir(parents=True, exist_ok=True)
+    shutil.move(root_path / "AUTO_MAA-Setup.exe", root_path / "AUTO_MAA_Setup")
+
+    shutil.make_archive(
+        base_name=root_path / f"AUTO_MAA_{version_text(main_version_numb)}",
+        format="zip",
+        root_dir=root_path / "AUTO_MAA_Setup",
+        base_dir=".",
+    )
+
+    print("setup program created !")
+
+    (root_path / "AUTO_MAA.iss").unlink(missing_ok=True)
+    shutil.rmtree(root_path / "AUTO_MAA")
+    shutil.rmtree(root_path / "AUTO_MAA_Setup")
+
+    all_version_info = {}
+    for v_i in version["version_info"].values():
+        for key, value in v_i.items():
+            if key in all_version_info:
+                all_version_info[key] += value.copy()
+            else:
+                all_version_info[key] = value.copy()
+
+    (root_path / "version_info.txt").write_text(
+        f"{version_text(main_version_numb)}\n\n<!--{json.dumps(version["version_info"], ensure_ascii=False)}-->\n{version_info_markdown(all_version_info)}",
+        encoding="utf-8",
+    )

main.py

@@ -43,6 +43,7 @@ def main():
 
     window = AUTO_MAA()
     window.show_ui("显示主窗口")
+    window.show_ui("配置托盘")
     window.start_up_task()
     sys.exit(application.exec())
 

resources/version.json

@@ -1,61 +1,26 @@
 {
-    "main_version": "4.3.6.0",
+    "main_version": "4.3.8.1",
-    "updater_version": "1.0.0.0",
-    "announcement": "\n## 新增功能\n- 屏蔽MuMu模拟器开屏广告功能上线\n- 更新器支持多线程下载\n- 添加强制关闭ADB与模拟器等增强任务项\n## 修复BUG\n- 修复统计信息HTML模板公招匹配错误\n- 修复密码显示按钮动画异常\n- 修复`检测到MAA未能实际执行任务`报错被异常屏蔽\n- 修复MAA超时判定异常失效\n## 程序优化\n- 关机等电源操作添加100s倒计时\n- 人工排查弹窗方法优化\n- 人工排查时自动屏蔽静默操作\n- 公告样式优化",
     "version_info": {
-        "4.3.6.0": {
+        "4.3.8.1": {
             "新增功能": [
-                "适配MAA连战次数`AUTO`模式"
+                "自定义基建显示配置名称",
-            ]
+                "主调度台添加仅一次电源任务"
-        },
-        "4.3.6.5": {
-            "新增功能": [
-                "release中添加安装程序"
-            ]
-        },
-        "4.3.6.4": {
-            "修复BUG": [
-                "修复详细模式下非定时自定义基建无法正常换班的问题"
-            ]
-        },
-        "4.3.6.3": {
-            "新增功能": [
-                "下载器仅支持调用Mirror酱"
             ],
-            "修复BUG": [
+            "修复bug": [
-                "修复Mirror酱更新检查报错不显示详细信息的问题"
+                "电源相关选项改为所有任务完成后生效",
-            ]
+                "适配MAAv5.16.3的ADB报错信息更改"
-        },
-        "4.3.6.2": {
-            "新增功能": [
-                "新增`无人值守模式`"
-            ],
-            "修复BUG": [
-                "修复软件窗口最大化异常问题",
-                "修复异常操作导致窗口离开屏幕后难以复原的问题",
-                "修正剩余理智关卡文案",
-                "修复隐藏到托盘时，托盘无法退出主程序的问题",
-                "修复Server酱网络异常导致的卡死问题"
             ],
             "程序优化": [
-                "主窗口显示版本号"
+                "UI样式优化，进一步适配win10主题"
             ]
         },
-        "4.3.6.1": {
+        "4.3.7.0": {
             "新增功能": [
-                "单次自动代理任务中，已完成的子任务在重复执行时不再启用"
+                "下载器支持完整mirrorc列表"
+            ],
+            "程序优化": [
+                "重构更新逻辑，去除独立更新器"
             ]
         }
-    },
-    "proxy_list": [
-        "https://gitproxy.click/",
-        "https://cdn.moran233.xyz/",
-        "https://gh.llkk.cc/",
-        "https://github.akams.cn/",
-        "https://www.ghproxy.cn/",
-        "https://ghfast.top/"
-    ],
-    "download_dict": {
-        "官方下载站-jp": "https://jp-download.fearr.xyz/AUTO_MAA/"
     }
 }