From 5eb6737b0bc6fe64fa38fbc9a7cd4b13c7fbc8bd Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Fri, 17 Jan 2025 10:29:34 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E9=95=BF=E8=8D=89=E4=BB=BB=E5=8A=A1Vi?= =?UTF-8?q?ewModel=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserControl/TaskQueue/AwardSettingsUserControlModel.cs | 4 +--- .../UserControl/TaskQueue/FightSettingsUserControlModel.cs | 7 +------ .../TaskQueue/InfrastSettingsUserControlModel.cs | 4 +--- .../UserControl/TaskQueue/MallSettingsUserControlModel.cs | 4 +--- .../TaskQueue/ReclamationSettingsUserControlModel.cs | 4 +--- .../TaskQueue/RecruitSettingsUserControlModel.cs | 4 +--- .../TaskQueue/RoguelikeSettingsUserControlModel.cs | 4 +--- 7 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs index f91cad12bc..c861094b88 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/AwardSettingsUserControlModel.cs @@ -10,17 +10,15 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Windows; using MaaWpfGui.Constants; using MaaWpfGui.Helper; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; -public class AwardSettingsUserControlModel : PropertyChangedBase +public class AwardSettingsUserControlModel : TaskViewModel { static AwardSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs index a1f5ffa5a8..604998f95b 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs @@ -10,26 +10,21 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; using System.Windows; using MaaWpfGui.Constants; using MaaWpfGui.Helper; -using MaaWpfGui.Services; using MaaWpfGui.Utilities.ValueType; -using MaaWpfGui.ViewModels.UI; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; /// /// 刷理智 /// -public class FightSettingsUserControlModel : PropertyChangedBase +public class FightSettingsUserControlModel : TaskViewModel { static FightSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs index 6394b3c6c4..b941b3534d 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs @@ -10,7 +10,6 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; @@ -23,14 +22,13 @@ using MaaWpfGui.Models; using MaaWpfGui.Utilities.ValueType; using MaaWpfGui.ViewModels.UI; using Microsoft.Win32; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; /// /// 基建任务 /// -public class InfrastSettingsUserControlModel : PropertyChangedBase +public class InfrastSettingsUserControlModel : TaskViewModel { static InfrastSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs index f0dedd55d4..b288af3524 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs @@ -10,7 +10,6 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; @@ -19,14 +18,13 @@ using MaaWpfGui.Constants; using MaaWpfGui.Extensions; using MaaWpfGui.Helper; using MaaWpfGui.Utilities.ValueType; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; /// /// 信用购物 /// -public class MallSettingsUserControlModel : PropertyChangedBase +public class MallSettingsUserControlModel : TaskViewModel { static MallSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/ReclamationSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/ReclamationSettingsUserControlModel.cs index 57452be812..b9f6eec7bd 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/ReclamationSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/ReclamationSettingsUserControlModel.cs @@ -10,7 +10,6 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; @@ -18,11 +17,10 @@ using MaaWpfGui.Constants; using MaaWpfGui.Helper; using MaaWpfGui.Utilities.ValueType; using MaaWpfGui.ViewModels.UI; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; -public class ReclamationSettingsUserControlModel : PropertyChangedBase +public class ReclamationSettingsUserControlModel : TaskViewModel { static ReclamationSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs index dfe51a01ca..e9d599867e 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs @@ -10,7 +10,6 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; @@ -18,11 +17,10 @@ using System.Linq; using MaaWpfGui.Constants; using MaaWpfGui.Helper; using MaaWpfGui.Utilities.ValueType; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; -public class RecruitSettingsUserControlModel : PropertyChangedBase +public class RecruitSettingsUserControlModel : TaskViewModel { static RecruitSettingsUserControlModel() { diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs index a07f94f7e3..8603c49411 100644 --- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs @@ -10,7 +10,6 @@ // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY // - #nullable enable using System; using System.Collections.Generic; @@ -23,11 +22,10 @@ using MaaWpfGui.Utilities.ValueType; using MaaWpfGui.ViewModels.UI; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using Stylet; namespace MaaWpfGui.ViewModels.UserControl.TaskQueue; -public class RoguelikeSettingsUserControlModel : PropertyChangedBase +public class RoguelikeSettingsUserControlModel : TaskViewModel { static RoguelikeSettingsUserControlModel() {