diff --git a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs index da3b9906b3..ae4637fab3 100644 --- a/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs +++ b/src/MaaWpfGui/Models/TaskSettingVisibilityInfo.cs @@ -57,7 +57,7 @@ namespace MaaWpfGui.Models public bool Custom { get => _custom; set => SetAndNotify(ref _custom, value); } - public static TaskSettingVisibilityInfo Current { get; } = new(); + public static TaskSettingVisibilityInfo Instance { get; } = new(); // 长草任务当前选中 public int CurrentIndex { get; set; } diff --git a/src/MaaWpfGui/ViewModels/DragItemViewModel.cs b/src/MaaWpfGui/ViewModels/DragItemViewModel.cs index fdaef527d8..756df48ce2 100644 --- a/src/MaaWpfGui/ViewModels/DragItemViewModel.cs +++ b/src/MaaWpfGui/ViewModels/DragItemViewModel.cs @@ -150,7 +150,7 @@ namespace MaaWpfGui.ViewModels set { SetAndNotify(ref _enableSetting, value); - TaskSettingVisibilityInfo.Current.Set(OriginalName, value); + TaskSettingVisibilityInfo.Instance.Set(OriginalName, value); } } } diff --git a/src/MaaWpfGui/ViewModels/TaskViewModel.cs b/src/MaaWpfGui/ViewModels/TaskViewModel.cs index e449f4c276..f46309e2f6 100644 --- a/src/MaaWpfGui/ViewModels/TaskViewModel.cs +++ b/src/MaaWpfGui/ViewModels/TaskViewModel.cs @@ -87,13 +87,13 @@ public abstract class TaskViewModel : PropertyChangedBase protected T? GetTaskConfig() where T : BaseTask { - return ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Current.CurrentIndex] as T; + return ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Instance.CurrentIndex] as T; } protected bool SetTaskConfig(Func isEqual, Action @setValue, [CallerMemberName] string propertyName = "") where T : BaseTask { - if (ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Current.CurrentIndex] is T task) + if (ConfigFactory.CurrentConfig.TaskQueue[TaskSettingVisibilityInfo.Instance.CurrentIndex] is T task) { if (!isEqual(task)) { diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index c76f1c597b..70f985ce09 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -52,7 +52,7 @@ namespace MaaWpfGui.ViewModels.UI /// /// Gets the visibility of task setting views. /// - public TaskSettingVisibilityInfo TaskSettingVisibilities { get; } = TaskSettingVisibilityInfo.Current; + public TaskSettingVisibilityInfo TaskSettingVisibilities { get; } = TaskSettingVisibilityInfo.Instance; #region 设置界面Model diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 501ca98949..3e8f4b305f 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -70,7 +70,7 @@ namespace MaaWpfGui.ViewModels.UI /// /// Gets the visibility of task setting views. /// - public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Current; + public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Instance; public static SettingsViewModel TaskSettingDataContext => Instances.SettingsViewModel; @@ -167,7 +167,7 @@ namespace MaaWpfGui.ViewModels.UI set { SetAndNotify(ref _enableAfterActionSetting, value); - TaskSettingVisibilityInfo.Current.Set("AfterAction", value); + TaskSettingVisibilityInfo.Instance.Set("AfterAction", value); } } diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs index c944d9bf4c..bc88d69400 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs @@ -52,7 +52,7 @@ public class InfrastSettingsUserControlModel : TaskViewModel /// /// Gets the visibility of task setting views. /// - public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Current; + public static TaskSettingVisibilityInfo TaskSettingVisibilities => TaskSettingVisibilityInfo.Instance; public void InitInfrast() {