diff --git a/src/MaaWpfGui/Configuration/Factory/ConfigFactory.cs b/src/MaaWpfGui/Configuration/Factory/ConfigFactory.cs index 8fdc236cf6..fba41485fa 100644 --- a/src/MaaWpfGui/Configuration/Factory/ConfigFactory.cs +++ b/src/MaaWpfGui/Configuration/Factory/ConfigFactory.cs @@ -299,7 +299,7 @@ public static class ConfigFactory if (o is BaseTask task) { index = taskQueue.IndexOf(task); - taskName = task.Name; + taskName = task.NameDisplay; } OnPropertyChanged($"{key}[{index}]{taskName}({o?.GetType().Name})." + args.PropertyName, oldValue, newValue); }; diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 4a1376a1d1..8e28e4bfaa 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1076,7 +1076,7 @@ public class AsstProxy var task = taskIndex >= 0 && taskIndex < ConfigFactory.CurrentConfig.TaskQueue.Count ? ConfigFactory.CurrentConfig.TaskQueue[taskIndex] : null; - var taskName = task?.Name ?? $"({LocalizationHelper.GetString(taskChain)})"; + var taskName = task?.NameDisplay ?? $"({LocalizationHelper.GetString(taskChain)})"; Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("StartTask") + taskName, splitMode: TaskQueueViewModel.LogCardSplitMode.Before); _logger.Information("Start Task Chain: {TaskChain}, Task ID: {TaskId}", taskChain, taskId); UpdateTaskStatus(taskId, TaskStatus.InProgress); @@ -1117,7 +1117,7 @@ public class AsstProxy } } - var taskName = task?.Name ?? $"({LocalizationHelper.GetString(taskChain)})"; + var taskName = task?.NameDisplay ?? $"({LocalizationHelper.GetString(taskChain)})"; if (taskChain == "Fight" && FightTask.SanityReport is not null) { var sanityLog = "\n" + string.Format(LocalizationHelper.GetString("CurrentSanity"), FightTask.SanityReport.SanityCurrent, FightTask.SanityReport.SanityMax); diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs index 9af8e4f29a..9474ab5775 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs @@ -224,7 +224,7 @@ public class MallSettingsUserControlModel : TaskSettingsViewModel, MallSettingsU if (mall.IsCreditFightAvailable && fightStageEmpty) { - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetStringFormat("CreditFightWhenOF-1Warning", ConfigFactory.CurrentConfig.TaskQueue[taskIndex].Name, taskIndex + 1, stageIndex + 1), UiLogColor.Warning); + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetStringFormat("CreditFightWhenOF-1Warning", ConfigFactory.CurrentConfig.TaskQueue[taskIndex].NameDisplay, taskIndex + 1, stageIndex + 1), UiLogColor.Warning); } var task = new AsstMallTask() {