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

fix: 任务开始/完成 无法显示任务名

Browse Source
This commit is contained in:
uye
2026-03-25 21:06:39 +08:00
parent 944be15f66
commit f1d1569a3d
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Configuration/Factory/ConfigFactory.cs
View File

@@ -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);
};

4
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -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);

2
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs
View File

@@ -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() {