diff --git a/src/MaaWpfGui/Configuration/Single/MaaTask/InfrastTask.cs b/src/MaaWpfGui/Configuration/Single/MaaTask/InfrastTask.cs index 82fb9f2357..9d7da558fe 100644 --- a/src/MaaWpfGui/Configuration/Single/MaaTask/InfrastTask.cs +++ b/src/MaaWpfGui/Configuration/Single/MaaTask/InfrastTask.cs @@ -12,7 +12,6 @@ // #nullable enable -using MaaWpfGui.ViewModels.UserControl.TaskQueue; using static MaaWpfGui.Main.AsstProxy; namespace MaaWpfGui.Configuration.Single.MaaTask; @@ -25,5 +24,66 @@ public class InfrastTask : BaseTask /// public InfrastMode Mode { get; set; } = InfrastMode.Normal; + /// + /// Gets or sets 基建无人机用法 + /// + public string UsesOfDrones { get; set; } = "Money"; + /// + /// Gets or sets 基建心情阈值 + /// + public int DormThreshold { get; set; } = 30; + + /// + /// Gets or sets a value indicating whether 宿舍空位补信赖 + /// + public bool DormTrustEnabled { get; set; } = true; + + /// + /// Gets or sets a value indicating whether 制造站搓玉是否补货 + /// + public bool OriginiumShardAutoReplenishment { get; set; } = true; + + /// + /// Gets or sets a value indicating whether 不将已进驻干员放入宿舍 + /// + public bool DormFilterNotStationed { get; set; } = true; + + /// + /// Gets or sets a value indicating whether 会客室板子领取信用 + /// + public bool ReceptionMessageBoard { get; set; } = true; + + /// + /// Gets or sets a value indicating whether 继续专精 + /// + public bool ContinueTraining { get; set; } = false; + + /// + /// Gets or sets 自定义配置文件路径 + /// + public string Filename { get; set; } = string.Empty; + + /// + /// Gets or sets 自定义配置计划编号 + /// + public int PlanIndex { get; set; } +} + +public enum InfrastMode +{ + /// + /// 普通 + /// + Normal, + + /// + /// 自定义 + /// + Custom = 10000, + + /// + /// 轮换 + /// + Rotation = 20000, } diff --git a/src/MaaWpfGui/Configuration/Single/MaaTask/ReclamationTask.cs b/src/MaaWpfGui/Configuration/Single/MaaTask/ReclamationTask.cs index b358f43c3a..6a658c834e 100644 --- a/src/MaaWpfGui/Configuration/Single/MaaTask/ReclamationTask.cs +++ b/src/MaaWpfGui/Configuration/Single/MaaTask/ReclamationTask.cs @@ -38,6 +38,11 @@ public class ReclamationTask : BaseTask /// Gets or sets 单次最大制造轮数 /// public int MaxCraftCountPerRound { get; set; } = 16; + + /// + /// Gets or sets a value indicating whether 商店购物 + /// + public bool ClearStore { get; set; } = true; } public enum ReclamationTheme diff --git a/src/MaaWpfGui/Configuration/Single/SpecificConfig.cs b/src/MaaWpfGui/Configuration/Single/SpecificConfig.cs index a0254b937e..c985c30585 100644 --- a/src/MaaWpfGui/Configuration/Single/SpecificConfig.cs +++ b/src/MaaWpfGui/Configuration/Single/SpecificConfig.cs @@ -12,19 +12,22 @@ // using System.Text.Json.Serialization; +using MaaWpfGui.Configuration.Single.MaaTask; using ObservableCollections; -namespace MaaWpfGui.Configuration.Single +namespace MaaWpfGui.Configuration.Single; + +public class SpecificConfig { - public class SpecificConfig - { - [JsonInclude] - public ObservableDictionary InfrastOrder { get; private set; } = new ObservableDictionary(); + [JsonInclude] + public ObservableDictionary InfrastOrder { get; private set; } = []; - [JsonInclude] - public ObservableDictionary TaskQueueOrder { get; private set; } = new ObservableDictionary(); + [JsonInclude] + public ObservableDictionary TaskQueueOrder { get; private set; } = []; - [JsonInclude] - public ObservableDictionary DragItemIsChecked { get; private set; } = new ObservableDictionary(); - } + [JsonInclude] + public ObservableList TaskQueue { get; private set; } = []; + + [JsonInclude] + public ObservableDictionary DragItemIsChecked { get; private set; } = []; }