From 4c3967e8e65a2f555a4e0a3befedbb840c674d90 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 24 Jun 2026 23:09:05 +0800 Subject: [PATCH] =?UTF-8?q?rft:=20=E5=88=A0=E9=99=A4=20TaskItemViewModel?= =?UTF-8?q?=20=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0=E7=9A=84=20name=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Name getter 已改为从配置动态读取 NameOrTaskType,构造时传入的 name 不再有任何作用,删除该参数及三处调用点的实参。 --- src/MaaWpfGui/ViewModels/TaskItemViewModel.cs | 4 +--- src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/TaskItemViewModel.cs b/src/MaaWpfGui/ViewModels/TaskItemViewModel.cs index 6c2d3aa45f..2995e448a7 100644 --- a/src/MaaWpfGui/ViewModels/TaskItemViewModel.cs +++ b/src/MaaWpfGui/ViewModels/TaskItemViewModel.cs @@ -26,10 +26,8 @@ namespace MaaWpfGui.ViewModels; public class TaskItemViewModel : PropertyChangedBase, IDisposable { - public TaskItemViewModel(string name, bool? isCheckedWithNull = true) + public TaskItemViewModel(bool? isCheckedWithNull = true) { - // name 仅用于兼容旧调用方,显示名始终从配置动态读取(见 Name getter), - // 这样语言切换、任务增删导致 Index 变化时都能拿到最新值。 _isEnable = isCheckedWithNull; Instances.AsstProxy.OnTaskStatusChanged += OnTaskStatusChanged; PropertyDependsOnUtility.InitializePropertyDependencies(this); diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 92c79d41fc..bbef761196 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -1013,7 +1013,7 @@ public class TaskQueueViewModel : Screen var task = ConfigFactory.CurrentConfig.TaskQueue.ElementAt(i); if (task is not null) { - taskqueue.Add(new TaskItemViewModel(task.NameOrTaskType, task.IsEnable) { Index = i }); + taskqueue.Add(new TaskItemViewModel(task.IsEnable) { Index = i }); } } @@ -1374,7 +1374,7 @@ public class TaskQueueViewModel : Screen if (Activator.CreateInstance(taskName) is BaseTask task) { ConfigFactory.CurrentConfig.TaskQueue.Add(task); - TaskItemViewModels.Add(new TaskItemViewModel(task.NameOrTaskType)); + TaskItemViewModels.Add(new TaskItemViewModel()); AchievementTrackerHelper.Instance.Unlock(AchievementIds.QueueExpansion); AchievementTrackerHelper.Instance.TrackManualTaskAddition( task.TaskType.ToString(), @@ -1485,7 +1485,7 @@ public class TaskQueueViewModel : Screen } newTask.Name = newTask.NameOrTaskType + " (2)"; ConfigFactory.CurrentConfig.TaskQueue.Insert(index + 1, newTask); - TaskItemViewModels.Insert(index + 1, new TaskItemViewModel(newTask.NameOrTaskType)); + TaskItemViewModels.Insert(index + 1, new TaskItemViewModel()); AddLog(LocalizationHelper.GetStringFormat("TaskCopied", newTask.NameOrTaskType), UiLogColor.Info); }