From cb64ca4b13e5944e9504c239009249e596be2466 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sat, 3 May 2025 13:38:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E8=BD=AE=E6=8D=A2=E6=A8=A1=E5=BC=8F=E6=9C=AA=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E5=AF=BC=E8=87=B4=E5=8A=9F=E8=83=BD=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #12542 --- .../TaskQueue/InfrastSettingsUserControlModel.cs | 4 +++- .../TaskQueue/InfrastSettingsUserControl.xaml | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs index 851d06b96d..71ee8aa6cc 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs @@ -171,7 +171,9 @@ public class InfrastSettingsUserControlModel : TaskViewModel /// The infrast order list. public List GetInfrastOrderList() { - return (from item in InfrastItemViewModels where item.IsChecked select item.OriginalName).ToList(); + return InfrastMode == Mode.Rotation + ? (from item in InfrastItemViewModels select item.OriginalName).ToList() + : (from item in InfrastItemViewModels where item.IsChecked select item.OriginalName).ToList(); } // UI 绑定的方法 diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml index 5dcccad36f..afdf5dbd49 100644 --- a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml @@ -149,8 +149,14 @@ - + IsChecked="{Binding DormTrustEnabled}" + Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation', + Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" /> +