From d8f7c74de446bf2af1e89e348a9ef4fe282f3350 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Mon, 19 Jan 2026 03:50:54 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=20OF-1=20=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskQueue/MallSettingsUserControlModel.cs            | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs
index 71f582662a..6e289234ce 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs
@@ -194,9 +194,12 @@ public class MallSettingsUserControlModel : TaskSettingsViewModel
     [Obsolete("使用SerializeTask作为代替")]
     public override (AsstTaskType Type, JObject Params) Serialize()
     {
-        var fightEnable = ConfigFactory.CurrentConfig.TaskQueue.FirstOrDefault(x => x is FightTask)?.IsEnable is not false;
+        var fightStageEmpty = ConfigFactory.CurrentConfig.TaskQueue
+            .OfType<FightTask>()
+            .Where(task => task.IsEnable is not false)
+            .Any(task => string.IsNullOrEmpty(FightSettingsUserControlModel.GetFightStage(task.StagePlan)));
         var task = new AsstMallTask() {
-            // CreditFight = fightEnable ? (!string.IsNullOrEmpty(FightSettingsUserControlModel.Instance.Stage) && CreditFightTaskEnabled) : CreditFightTaskEnabled,
+            CreditFight = CreditFightTaskEnabled && !fightStageEmpty,
             FormationIndex = CreditFightSelectFormation,
             VisitFriends = CreditVisitFriendsEnabled,
             WithShopping = CreditShopping,
@@ -218,7 +221,7 @@ public class MallSettingsUserControlModel : TaskSettingsViewModel
 
         var fightStageEmpty = ConfigFactory.CurrentConfig.TaskQueue
             .OfType<FightTask>()
-            .Where(task => task.IsEnable == true)
+            .Where(task => task.IsEnable is not false)
             .Any(task => string.IsNullOrEmpty(FightSettingsUserControlModel.GetFightStage(task.StagePlan)));
         var creditFight = mall.IsCreditFightAvailable;
         var visitFriends = mall.IsVisitFriendsAvailable;