From fad7705d04a36f45fe22d915ca448bb2aba3e0c1 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Thu, 8 May 2025 10:02:46 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=87=8F=E5=B0=91=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E8=BF=9E=E6=88=98=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp | 7 ++-----
 src/MaaCore/Task/Fight/FightTimesTaskPlugin.h   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp
index 2498f36f0e..5da7fdeb48 100644
--- a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp
+++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.cpp
@@ -144,11 +144,8 @@ std::optional<int> asst::FightTimesTaskPlugin::change_series(int sanity_current,
     }
 
     auto ret = select_series(true);
-    if (!ret) {
-        select_series(1);
-        if (m_is_medicine_exhausted) { // 药品用完, 且没有次数可用, 刷理智结束
-            m_task_ptr->set_enable(false);
-        }
+    if (!ret && m_is_medicine_exhausted) { // 药品用完, 且没有次数可用, 刷理智结束
+        m_task_ptr->set_enable(false);
     }
 
     return ret;
diff --git a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h
index 2e6fd1e8b4..460aa453ad 100644
--- a/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h
+++ b/src/MaaCore/Task/Fight/FightTimesTaskPlugin.h
@@ -66,6 +66,6 @@ private:
     int m_series = -1;                            // 连续战斗次数
     int m_series_current = 1;                     // 当前连战次数
     mutable bool m_has_used_medicine = false;     // 是否使用过药品
-    mutable bool m_is_medicine_exhausted = false; // 是否药品用完
+    mutable bool m_is_medicine_exhausted = false; // 是否药品、石头用完
 };
 }