fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-15 17:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复一键轮换模式未勾选设施导致功能异常问题

Browse Source 
fix #12542
This commit is contained in:
uye
2025-05-03 13:38:23 +08:00
parent e6549f0bf6
commit cb64ca4b13
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
View File

@@ -171,7 +171,9 @@ public class InfrastSettingsUserControlModel : TaskViewModel
/// <returns>The infrast order list.</returns>
public List<string> 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 绑定的方法

10
src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
View File

@@ -149,8 +149,14 @@
<CheckBox
Margin="0,10"
Content="{DynamicResource DormTrustEnabled}"
IsChecked="{Binding DormTrustEnabled}" />
<CheckBox Margin="0,10" IsChecked="{c:Binding DormFilterNotStationedEnabled}">
IsChecked="{Binding DormTrustEnabled}"
Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" />
<CheckBox
Margin="0,10"
IsChecked="{c:Binding DormFilterNotStationedEnabled}"
Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
<controls:TextBlock
Text="{DynamicResource DormFilterNotStationedEnabled}"
TextWrapping="Wrap"