From 2d648bf4cc596a29c98970a8a3b1bcd475333566 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Fri, 21 Feb 2025 20:23:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Wpf=E4=BF=A1=E7=94=A8=E4=BB=BB=E5=8A=A1-?=
 =?UTF-8?q?OF-1=E6=88=98=E6=96=97=20=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=88=B7=E7=90=86=E6=99=BA=E6=97=B6=EF=BC=8C=E4=BB=8D?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=88=B7=E7=90=86=E6=99=BA=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA`=E5=BD=93=E5=89=8D/=E4=B8=8A?=
 =?UTF-8?q?=E6=AC=A1`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

link to #11996
---
 src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index f394c774cd..e2351c3693 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1751,9 +1751,10 @@ namespace MaaWpfGui.ViewModels.UI
                 .Select(s => s.Trim());
 
             blackList = blackList.Union(_blackCharacterListMapping[SettingsViewModel.GameSettings.ClientType]);
+            var fightEnable = TaskItemViewModels.Where(x => x.OriginalName == "Combat").FirstOrDefault().IsCheckedWithNull is not false;
 
             return Instances.AsstProxy.AsstAppendMall(
-                !string.IsNullOrEmpty(FightTask.Stage) && MallTask.CreditFightTaskEnabled,
+                fightEnable ? (!string.IsNullOrEmpty(FightTask.Stage) && MallTask.CreditFightTaskEnabled) : MallTask.CreditFightTaskEnabled,
                 MallTask.CreditFightSelectFormation,
                 MallTask.CreditVisitFriendsEnabled,
                 MallTask.CreditShopping,