From 7593ef29a905c1ea5fa4fdb36ab7a0644ec9b668 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 30 Aug 2025 01:36:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=82=96=E8=AE=BA=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/CopilotViewModel.cs         | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
index 8b64c8f8f3..a371068bf6 100644
--- a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
@@ -1261,46 +1261,47 @@ namespace MaaWpfGui.ViewModels.UI
             });
 
             bool ret = true;
-            if (ActiveTabIndex == 2)
+            if (UseCopilotList)
             {
                 _copilotIdList.Clear();
 
-                var t = CopilotItemViewModels.Where(i => i.IsChecked).Select(i =>
+                if (ActiveTabIndex == 2)
                 {
-                    _copilotIdList.Add(i.CopilotId);
+                    var t = CopilotItemViewModels.Where(i => i.IsChecked).Select(i =>
+                    {
+                        _copilotIdList.Add(i.CopilotId);
+                        var task = new AsstCopilotTask()
+                        {
+                            MultiTasks = [new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, IsParadox = UseCopilotList }],
+                            Formation = _form,
+                            AddTrust = _addTrust,
+                            IgnoreRequirements = _ignoreRequirements,
+                            UserAdditionals = AddUserAdditional ? userAdditional.ToList() : [],
+                            UseSanityPotion = _useSanityPotion,
+                        };
+                        return Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.Copilot, task);
+                    });
+                    ret = t.All(b => b) && Instances.AsstProxy.AsstStart();
+                }
+                else
+                {
+                    var t = CopilotItemViewModels.Where(i => i.IsChecked).Select(i =>
+                    {
+                        _copilotIdList.Add(i.CopilotId);
+                        return new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, };
+                    });
                     var task = new AsstCopilotTask()
                     {
-                        MultiTasks = [new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, IsParadox = UseCopilotList }],
+                        MultiTasks = t.ToList(),
                         Formation = _form,
                         AddTrust = _addTrust,
                         IgnoreRequirements = _ignoreRequirements,
                         UserAdditionals = AddUserAdditional ? userAdditional.ToList() : [],
                         UseSanityPotion = _useSanityPotion,
                     };
-                    return Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.Copilot, task);
-                });
-                ret = t.All(t => t is true) && Instances.AsstProxy.AsstStart();
-            }
-            else if (UseCopilotList)
-            {
-                _copilotIdList.Clear();
-
-                var t = CopilotItemViewModels.Where(i => i.IsChecked).Select(i =>
-                {
-                    _copilotIdList.Add(i.CopilotId);
-                    return new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, };
-                });
-                var task = new AsstCopilotTask()
-                {
-                    MultiTasks = t.ToList(),
-                    Formation = _form,
-                    AddTrust = _addTrust,
-                    IgnoreRequirements = _ignoreRequirements,
-                    UserAdditionals = AddUserAdditional ? userAdditional.ToList() : [],
-                    UseSanityPotion = _useSanityPotion,
-                };
-                ret = Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.Copilot, task);
-                ret = ret && Instances.AsstProxy.AsstStart();
+                    ret = Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.Copilot, task);
+                    ret = ret && Instances.AsstProxy.AsstStart();
+                }
             }
             else
             {