fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 10:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: InvertNullFunction method

Browse Source
This commit is contained in:
Constrat
2025-01-11 14:47:07 +01:00
parent f6c0627e32
commit caa7fac662
4 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -1103,7 +1103,7 @@ namespace MaaWpfGui.ViewModels.UI
{
if (item.IsCheckedWithNull == null)
{
item.IsChecked = false;
item.IsChecked = GuiSettingsUserControlModel.Instance.InvertNullFunction;
}
}
}
@@ -1292,7 +1292,7 @@ namespace MaaWpfGui.ViewModels.UI
int count = 0;
foreach (var item in TaskItemViewModels)
{
if (item.IsChecked == false)
if (item.IsChecked == false || (GuiSettingsUserControlModel.Instance.InvertNullFunction && item.IsCheckedWithNull == null))
{
continue;
}
@@ -1354,6 +1354,10 @@ namespace MaaWpfGui.ViewModels.UI
_runningState.SetIdle(true);
Instances.AsstProxy.AsstStop();
SetStopped();
if (GuiSettingsUserControlModel.Instance.InvertNullFunction)
{
ResetTaskSelection();
}
return;
}
@@ -1845,8 +1849,7 @@ namespace MaaWpfGui.ViewModels.UI
{
var toolToCraft = ReclamationTask.ReclamationToolToCraft.Split(';', '；').Select(s => s.Trim());
_ = int.TryParse(ReclamationTask.ReclamationMode, out var mode);
_ = int.TryParse(SettingsViewModel.ReclamationTask.ReclamationMode, out var mode);
return Instances.AsstProxy.AsstAppendReclamation(
toolToCraft.ToArray(),