From d836b58b2de711cb23a4f04e6a2d6a9a50ae9f1d Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Thu, 31 Jul 2025 17:06:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8E=E8=87=AA=E5=8A=A8=E5=A4=8D=E5=8E=9F?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/MAA.py      | 25 ++++++++++++++++++-------
 app/models/general.py  | 32 ++++++++++++++++++++++++++++++++
 resources/version.json |  3 ++-
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/app/models/MAA.py b/app/models/MAA.py
index 8ef3a7a..3df88d5 100644
--- a/app/models/MAA.py
+++ b/app/models/MAA.py
@@ -166,6 +166,15 @@ class MaaManager(QObject):
             )
             return None
 
+        # 记录 MAA 配置文件
+        logger.info(
+            f"记录 MAA 配置文件：{self.maa_set_path}",
+            module=f"MAA调度器-{self.name}",
+        )
+        (self.config_path / "Temp").mkdir(parents=True, exist_ok=True)
+        if self.maa_set_path.exists():
+            shutil.copy(self.maa_set_path, self.config_path / "Temp/gui.json")
+
         # 整理用户数据，筛选需代理的用户
         if "设置MAA" not in self.mode:
 
@@ -941,13 +950,6 @@ class MaaManager(QObject):
                 self.maa_process_manager.kill(if_force=True)
                 System.kill_process(self.maa_exe_path)
 
-            # 复原MAA配置文件
-            logger.info(
-                f"复原MAA配置文件：{self.maa_set_path}",
-                module=f"MAA调度器-{self.name}",
-            )
-            shutil.copy(self.config_path / "Default/gui.json", self.maa_set_path)
-
             # 更新用户数据
             updated_info = {_[2]: self.data[_[2]] for _ in self.user_list}
             self.update_user_info.emit(self.config_path.name, updated_info)
@@ -1000,6 +1002,15 @@ class MaaManager(QObject):
             )
             self.push_notification("代理结果", title, result)
 
+        # 复原 MAA 配置文件
+        logger.info(
+            f"复原 MAA 配置文件：{self.config_path / 'Temp/gui.json'}",
+            module=f"MAA调度器-{self.name}",
+        )
+        if (self.config_path / "Temp/gui.json").exists():
+            shutil.copy(self.config_path / "Temp/gui.json", self.maa_set_path)
+        shutil.rmtree(self.config_path / "Temp")
+
         self.agree_bilibili(False)
         self.log_monitor.deleteLater()
         self.log_monitor_timer.deleteLater()
diff --git a/app/models/general.py b/app/models/general.py
index e5434ad..a17a77e 100644
--- a/app/models/general.py
+++ b/app/models/general.py
@@ -195,6 +195,22 @@ class GeneralManager(QObject):
 
         self.configure()
 
+        # 记录配置文件
+        logger.info(
+            f"记录通用脚本配置文件：{self.script_config_path}",
+            module=f"通用调度器-{self.name}",
+        )
+        (self.config_path / "Temp").mkdir(parents=True, exist_ok=True)
+        if self.set["Script"]["ConfigPathMode"] == "文件夹":
+            if self.script_config_path.exists():
+                shutil.copytree(
+                    self.script_config_path,
+                    self.config_path / "Temp",
+                    dirs_exist_ok=True,
+                )
+        elif self.script_config_path.exists():
+            shutil.copy(self.script_config_path, self.config_path / "Temp/config.temp")
+
         # 整理用户数据，筛选需代理的用户
         if self.mode != "设置通用脚本":
 
@@ -648,6 +664,22 @@ class GeneralManager(QObject):
             )
             self.push_notification("代理结果", title, result)
 
+        # 复原通用脚本配置文件
+        logger.info(
+            f"复原通用脚本配置文件：{self.config_path / 'Temp'}",
+            module=f"通用调度器-{self.name}",
+        )
+        if self.set["Script"]["ConfigPathMode"] == "文件夹":
+            if (self.config_path / "Temp").exists():
+                shutil.copytree(
+                    self.config_path / "Temp",
+                    self.script_config_path,
+                    dirs_exist_ok=True,
+                )
+        elif (self.config_path / "Temp/config.temp").exists():
+            shutil.copy(self.config_path / "Temp/config.temp", self.script_config_path)
+        shutil.rmtree(self.config_path / "Temp")
+
         self.log_monitor.deleteLater()
         self.log_monitor_timer.deleteLater()
         self.accomplish.emit({"Time": begin_time, "History": result_text})
diff --git a/resources/version.json b/resources/version.json
index 3185ea5..93da179 100644
--- a/resources/version.json
+++ b/resources/version.json
@@ -3,7 +3,8 @@
     "version_info": {
         "4.4.1.5": {
             "新增功能": [
-                "适配 MAA 长期开放剿灭关卡"
+                "适配 MAA 长期开放剿灭关卡",
+                "新增完成任务后自动复原脚本配置"
             ],
             "程序优化": [
                 "优化调度队列配置逻辑",