From 4debf210bdc4fa8a5205c2cc8aa7548f7a0227d1 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Tue, 6 May 2025 14:27:06 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=BF=9E=E6=88=98=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20-1=20=E8=A1=A8=E7=A4=BA=E7=A6=81=E7=94=A8=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Task/Interface/FightTask.cpp                  | 8 ++++++--
 .../TaskQueue/FightSettingsUserControlModel.cs            | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp
index da462f958e..24d50614b4 100644
--- a/src/MaaCore/Task/Interface/FightTask.cpp
+++ b/src/MaaCore/Task/Interface/FightTask.cpp
@@ -75,12 +75,16 @@ bool asst::FightTask::set_params(const json::value& params)
     const int times = params.get("times", INT_MAX);
     int series = params.get("series", 1);
 
+    // 重置插件状态 1000 表示自动连战，-1 表示禁用连战切换
+    m_fight_times_task_plugin_prt->set_enable(series != -1);
     m_fight_series_adjust_plugin_ptr->set_close_stone_page_next(false);
-    m_fight_series_adjust_plugin_ptr->set_enable(false);
+    m_fight_series_adjust_plugin_ptr->set_enable(series == 1000);
     if (series == 1000) {
-        m_fight_series_adjust_plugin_ptr->set_enable(true);
         series = 6;
     }
+    else if (series == -1) {
+        series = 1;
+    }
     else if (series < 1 || series > 6) {
         Log.error("Invalid series");
         return false;
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
index 1a324dbab6..ba7fcce20f 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
@@ -112,6 +112,7 @@ public class FightSettingsUserControlModel : TaskViewModel
         { "3", 6 },
         { "2", 2 },
         { "1", 1 },
+        { LocalizationHelper.GetString("NotSelected"), -1 },
     };
 
     public string?[] Stages => [Stage1, Stage2, Stage3];