diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 8e8bb94394..994821e599 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1324,7 +1324,7 @@ namespace MaaWpfGui.Main case "RecruitSpecialTag": { string special = subTaskDetails!["tag"]!.ToString(); - if (special == "支援机械" && Instances.SettingsViewModel.NotChooseLevel1 == false) + if (special == "支援机械" && SettingsViewModel.RecruitTask.NotChooseLevel1 == false) { break; } diff --git a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs index 9bfa108914..d0397260e5 100644 --- a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs @@ -176,8 +176,6 @@ namespace MaaWpfGui.ViewModels.UI } } - public static SettingsViewModel RecruitSettingDataContext => Instances.SettingsViewModel; - private bool _recruitCaught; /// @@ -221,7 +219,7 @@ namespace MaaWpfGui.ViewModels.UI levelList.Add(6); } - Instances.AsstProxy.AsstStartRecruitCalc(levelList.ToArray(), RecruitAutoSetTime, RecruitSettingDataContext.ChooseLevel3Time, RecruitSettingDataContext.ChooseLevel4Time, RecruitSettingDataContext.ChooseLevel5Time); + Instances.AsstProxy.AsstStartRecruitCalc(levelList.ToArray(), RecruitAutoSetTime, SettingsViewModel.RecruitTask.ChooseLevel3Time, SettingsViewModel.RecruitTask.ChooseLevel4Time, SettingsViewModel.RecruitTask.ChooseLevel5Time); } private bool _recruitmentShowPotential = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitmentShowPotential, bool.TrueString)); diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index b4caf4e17f..d81c17627d 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -75,6 +75,11 @@ namespace MaaWpfGui.ViewModels.UI /// public static FightSettingsUserControlModel FightTask { get; } = new(); + /// + /// Gets 招募任务Model + /// + public static RecruitSettingsUserControlModel RecruitTask { get; } = new(); + /// /// Gets 信用及购物任务Model /// @@ -427,360 +432,6 @@ namespace MaaWpfGui.ViewModels.UI #endregion 开始唤醒 - #region 自动公招设置 - - /// - /// Gets the list of auto recruit selecting extra tags. - /// - public List AutoRecruitSelectExtraTagsList { get; } = - [ - new() { Display = LocalizationHelper.GetString("DefaultNoExtraTags"), Value = "0" }, - new() { Display = LocalizationHelper.GetString("SelectExtraTags"), Value = "1" }, - new() { Display = LocalizationHelper.GetString("SelectExtraOnlyRareTags"), Value = "2" }, - ]; - - private static readonly List _autoRecruitTagList = ["近战位", "远程位", "先锋干员", "近卫干员", "狙击干员", "重装干员", "医疗干员", "辅助干员", "术师干员", "治疗", "费用回复", "输出", "生存", "群攻", "防护", "减速",]; - - private static readonly Lazy> _autoRecruitTagShowList = new(() => - _autoRecruitTagList.Select(tag => DataHelper.RecruitTags.TryGetValue(tag, out var value) ? value : null) - .Where(tag => tag is not null) - .Cast<(string Display, string Client)>() - .Select(tag => new CombinedData() { Display = tag.Display, Value = tag.Client }) - .ToList()); - - public static List AutoRecruitTagShowList - { - get => _autoRecruitTagShowList.Value; - } - - private object[] _autoRecruitFirstList = ConfigurationHelper - .GetValue(ConfigurationKeys.AutoRecruitFirstList, string.Empty) - .Split(';') - .Select(tag => _autoRecruitTagShowList.Value.FirstOrDefault(i => i.Value == tag)) - .Where(tag => tag is not null) - .Cast() - .ToArray(); - - public object[] AutoRecruitFirstList - { - get => _autoRecruitFirstList; - set - { - SetAndNotify(ref _autoRecruitFirstList, value); - var config = string.Join(';', value.Cast().Select(i => i.Value)); - ConfigurationHelper.SetValue(ConfigurationKeys.AutoRecruitFirstList, config); - } - } - - private string _recruitMaxTimes = ConfigurationHelper.GetValue(ConfigurationKeys.RecruitMaxTimes, "4"); - - /// - /// Gets or sets the maximum times of recruit. - /// - public string RecruitMaxTimes - { - get => _recruitMaxTimes; - set - { - SetAndNotify(ref _recruitMaxTimes, value); - ConfigurationHelper.SetValue(ConfigurationKeys.RecruitMaxTimes, value); - } - } - - private bool _refreshLevel3 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RefreshLevel3, bool.TrueString)); - - /// - /// Gets or sets a value indicating whether to refresh level 3. - /// - public bool RefreshLevel3 - { - get => _refreshLevel3; - set - { - SetAndNotify(ref _refreshLevel3, value); - ConfigurationHelper.SetValue(ConfigurationKeys.RefreshLevel3, value.ToString()); - } - } - - private bool _forceRefresh = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ForceRefresh, bool.TrueString)); - - /// - /// Gets or Sets a value indicating whether to refresh when recruit permit ran out. - /// - public bool ForceRefresh - { - get => _forceRefresh; - set - { - SetAndNotify(ref _forceRefresh, value); - ConfigurationHelper.SetValue(ConfigurationKeys.ForceRefresh, value.ToString()); - } - } - - private bool _useExpedited; - - /// - /// Gets or sets a value indicating whether to use expedited. - /// - public bool UseExpedited - { - get => _useExpedited; - set => SetAndNotify(ref _useExpedited, value); - } - - private string _selectExtraTags = ConfigurationHelper.GetValue(ConfigurationKeys.SelectExtraTags, "0"); - - /// - /// Gets or sets a value indicating three tags are always selected or select only rare tags as many as possible . - /// - public string SelectExtraTags - { - get - { - if (int.TryParse(_selectExtraTags, out _)) - { - return _selectExtraTags; - } - - var value = "0"; - if (bool.TryParse(_selectExtraTags, out bool boolValue)) - { - value = boolValue ? "1" : "0"; - } - - SetAndNotify(ref _selectExtraTags, value); - ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value); - return value; - } - - set - { - SetAndNotify(ref _selectExtraTags, value); - ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value); - } - } - - private bool _notChooseLevel1 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.NotChooseLevel1, bool.TrueString)); - - /// - /// Gets or sets a value indicating whether not to choose level 1. - /// - public bool NotChooseLevel1 - { - get => _notChooseLevel1; - set - { - SetAndNotify(ref _notChooseLevel1, value); - ConfigurationHelper.SetValue(ConfigurationKeys.NotChooseLevel1, value.ToString()); - } - } - - private bool _chooseLevel3 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel3, bool.TrueString)); - - /// - /// Gets or sets a value indicating whether to choose level 3. - /// - public bool ChooseLevel3 - { - get => _chooseLevel3; - set - { - SetAndNotify(ref _chooseLevel3, value); - ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel3, value.ToString()); - } - } - - private bool _chooseLevel4 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel4, bool.TrueString)); - - /// - /// Gets or sets a value indicating whether to choose level 4. - /// - public bool ChooseLevel4 - { - get => _chooseLevel4; - set - { - SetAndNotify(ref _chooseLevel4, value); - ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel4, value.ToString()); - } - } - - private bool _chooseLevel5 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel5, bool.FalseString)); - - /// - /// Gets or sets a value indicating whether to choose level 5. - /// - public bool ChooseLevel5 - { - get => _chooseLevel5; - set - { - SetAndNotify(ref _chooseLevel5, value); - ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel5, value.ToString()); - } - } - - private int _chooseLevel3Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")) / 60; - - public int ChooseLevel3Hour - { - get => _chooseLevel3Hour; - set - { - if (!SetAndNotify(ref _chooseLevel3Hour, value)) - { - return; - } - - ChooseLevel3Time = (value * 60) + ChooseLevel3Min; - } - } - - private int _chooseLevel3Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")) % 60) / 10 * 10; - - public int ChooseLevel3Min - { - get => _chooseLevel3Min; - set - { - if (!SetAndNotify(ref _chooseLevel3Min, value)) - { - return; - } - - ChooseLevel3Time = (ChooseLevel3Hour * 60) + value; - } - } - - private int _chooseLevel3Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")); - - public int ChooseLevel3Time - { - get => _chooseLevel3Time; - set - { - value = value switch - { - < 60 => 540, - > 540 => 60, - _ => value / 10 * 10, - }; - - SetAndNotify(ref _chooseLevel3Time, value); - ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel3Time, value.ToString()); - SetAndNotify(ref _chooseLevel3Hour, value / 60, nameof(ChooseLevel3Hour)); - SetAndNotify(ref _chooseLevel3Min, value % 60, nameof(ChooseLevel3Min)); - } - } - - private int _chooseLevel4Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")) / 60; - - public int ChooseLevel4Hour - { - get => _chooseLevel4Hour; - set - { - if (!SetAndNotify(ref _chooseLevel4Hour, value)) - { - return; - } - - ChooseLevel4Time = (value * 60) + ChooseLevel4Min; - } - } - - private int _chooseLevel4Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")) % 60) / 10 * 10; - - public int ChooseLevel4Min - { - get => _chooseLevel4Min; - set - { - if (!SetAndNotify(ref _chooseLevel4Min, value)) - { - return; - } - - ChooseLevel4Time = (ChooseLevel4Hour * 60) + value; - } - } - - private int _chooseLevel4Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")); - - public int ChooseLevel4Time - { - get => _chooseLevel4Time; - set - { - value = value switch - { - < 60 => 540, - > 540 => 60, - _ => value / 10 * 10, - }; - - SetAndNotify(ref _chooseLevel4Time, value); - ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel4Time, value.ToString()); - SetAndNotify(ref _chooseLevel4Hour, value / 60, nameof(ChooseLevel4Hour)); - SetAndNotify(ref _chooseLevel4Min, value % 60, nameof(ChooseLevel4Min)); - } - } - - private int _chooseLevel5Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")) / 60; - - public int ChooseLevel5Hour - { - get => _chooseLevel5Hour; - set - { - if (!SetAndNotify(ref _chooseLevel5Hour, value)) - { - return; - } - - ChooseLevel5Time = (value * 60) + ChooseLevel5Min; - } - } - - private int _chooseLevel5Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")) % 60) / 10 * 10; - - public int ChooseLevel5Min - { - get => _chooseLevel5Min; - set - { - if (!SetAndNotify(ref _chooseLevel5Min, value)) - { - return; - } - - ChooseLevel5Time = (ChooseLevel5Hour * 60) + value; - } - } - - private int _chooseLevel5Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")); - - public int ChooseLevel5Time - { - get => _chooseLevel5Time; - set - { - value = value switch - { - < 60 => 540, - > 540 => 60, - _ => value / 10 * 10, - }; - - SetAndNotify(ref _chooseLevel5Time, value); - ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel5Time, value.ToString()); - SetAndNotify(ref _chooseLevel5Hour, value / 60, nameof(ChooseLevel5Hour)); - SetAndNotify(ref _chooseLevel5Min, value % 60, nameof(ChooseLevel5Min)); - } - } - - #endregion 自动公招设置 - #region HotKey /// diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 8afe4ea507..d682da1615 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -1718,49 +1718,49 @@ namespace MaaWpfGui.ViewModels.UI private static bool AppendRecruit() { // for debug - if (!int.TryParse(Instances.SettingsViewModel.RecruitMaxTimes, out var maxTimes)) + if (!int.TryParse(SettingsViewModel.RecruitTask.RecruitMaxTimes, out var maxTimes)) { maxTimes = 0; } - var firstList = Instances.SettingsViewModel.AutoRecruitFirstList; + var firstList = SettingsViewModel.RecruitTask.AutoRecruitFirstList; var reqList = new List(); var cfmList = new List(); - if (Instances.SettingsViewModel.ChooseLevel3) + if (SettingsViewModel.RecruitTask.ChooseLevel3) { cfmList.Add(3); } - if (Instances.SettingsViewModel.ChooseLevel4) + if (SettingsViewModel.RecruitTask.ChooseLevel4) { reqList.Add(4); cfmList.Add(4); } // ReSharper disable once InvertIf - if (Instances.SettingsViewModel.ChooseLevel5) + if (SettingsViewModel.RecruitTask.ChooseLevel5) { reqList.Add(5); cfmList.Add(5); } - _ = int.TryParse(Instances.SettingsViewModel.SelectExtraTags, out var selectExtra); + _ = int.TryParse(SettingsViewModel.RecruitTask.SelectExtraTags, out var selectExtra); return Instances.AsstProxy.AsstAppendRecruit( maxTimes, firstList.Cast().Select(i => i.Value).ToArray(), [.. reqList], [.. cfmList], - Instances.SettingsViewModel.RefreshLevel3, - Instances.SettingsViewModel.ForceRefresh, - Instances.SettingsViewModel.UseExpedited, + SettingsViewModel.RecruitTask.RefreshLevel3, + SettingsViewModel.RecruitTask.ForceRefresh, + SettingsViewModel.RecruitTask.UseExpedited, selectExtra, - Instances.SettingsViewModel.NotChooseLevel1, - Instances.SettingsViewModel.ChooseLevel3Time, - Instances.SettingsViewModel.ChooseLevel4Time, - Instances.SettingsViewModel.ChooseLevel5Time); + SettingsViewModel.RecruitTask.NotChooseLevel1, + SettingsViewModel.RecruitTask.ChooseLevel3Time, + SettingsViewModel.RecruitTask.ChooseLevel4Time, + SettingsViewModel.RecruitTask.ChooseLevel5Time); } private static bool AppendRoguelike() diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs new file mode 100644 index 0000000000..3991928c63 --- /dev/null +++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs @@ -0,0 +1,382 @@ +// +// MaaWpfGui - A part of the MaaCoreArknights project +// Copyright (C) 2021 MistEO and Contributors +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License v3.0 only as published by +// the Free Software Foundation, either version 3 of the License, or +// any later version. +// +// 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.Linq; +using MaaWpfGui.Constants; +using MaaWpfGui.Helper; +using MaaWpfGui.Utilities.ValueType; +using Stylet; + +namespace MaaWpfGui.ViewModels.UserControl.TaskQueue +{ + public class RecruitSettingsUserControlModel : PropertyChangedBase + { + /// + /// Gets the list of auto recruit selecting extra tags. + /// + public List AutoRecruitSelectExtraTagsList { get; } = + [ + new() { Display = LocalizationHelper.GetString("DefaultNoExtraTags"), Value = "0" }, + new() { Display = LocalizationHelper.GetString("SelectExtraTags"), Value = "1" }, + new() { Display = LocalizationHelper.GetString("SelectExtraOnlyRareTags"), Value = "2" }, + ]; + + private static readonly List _autoRecruitTagList = ["近战位", "远程位", "先锋干员", "近卫干员", "狙击干员", "重装干员", "医疗干员", "辅助干员", "术师干员", "治疗", "费用回复", "输出", "生存", "群攻", "防护", "减速",]; + + private static readonly Lazy> _autoRecruitTagShowList = new(() => + _autoRecruitTagList.Select(tag => DataHelper.RecruitTags.TryGetValue(tag, out var value) ? value : null) + .Where(tag => tag is not null) + .Cast<(string Display, string Client)>() + .Select(tag => new CombinedData() { Display = tag.Display, Value = tag.Client }) + .ToList()); + + public static List AutoRecruitTagShowList + { + get => _autoRecruitTagShowList.Value; + } + + private object[] _autoRecruitFirstList = ConfigurationHelper + .GetValue(ConfigurationKeys.AutoRecruitFirstList, string.Empty) + .Split(';') + .Select(tag => _autoRecruitTagShowList.Value.FirstOrDefault(i => i.Value == tag)) + .Where(tag => tag is not null) + .Cast() + .ToArray(); + + public object[] AutoRecruitFirstList + { + get => _autoRecruitFirstList; + set + { + SetAndNotify(ref _autoRecruitFirstList, value); + var config = string.Join(';', value.Cast().Select(i => i.Value)); + ConfigurationHelper.SetValue(ConfigurationKeys.AutoRecruitFirstList, config); + } + } + + private string _recruitMaxTimes = ConfigurationHelper.GetValue(ConfigurationKeys.RecruitMaxTimes, "4"); + + /// + /// Gets or sets the maximum times of recruit. + /// + public string RecruitMaxTimes + { + get => _recruitMaxTimes; + set + { + SetAndNotify(ref _recruitMaxTimes, value); + ConfigurationHelper.SetValue(ConfigurationKeys.RecruitMaxTimes, value); + } + } + + private bool _refreshLevel3 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RefreshLevel3, bool.TrueString)); + + /// + /// Gets or sets a value indicating whether to refresh level 3. + /// + public bool RefreshLevel3 + { + get => _refreshLevel3; + set + { + SetAndNotify(ref _refreshLevel3, value); + ConfigurationHelper.SetValue(ConfigurationKeys.RefreshLevel3, value.ToString()); + } + } + + private bool _forceRefresh = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ForceRefresh, bool.TrueString)); + + /// + /// Gets or Sets a value indicating whether to refresh when recruit permit ran out. + /// + public bool ForceRefresh + { + get => _forceRefresh; + set + { + SetAndNotify(ref _forceRefresh, value); + ConfigurationHelper.SetValue(ConfigurationKeys.ForceRefresh, value.ToString()); + } + } + + private bool _useExpedited; + + /// + /// Gets or sets a value indicating whether to use expedited. + /// + public bool UseExpedited + { + get => _useExpedited; + set => SetAndNotify(ref _useExpedited, value); + } + + private string _selectExtraTags = ConfigurationHelper.GetValue(ConfigurationKeys.SelectExtraTags, "0"); + + /// + /// Gets or sets a value indicating three tags are always selected or select only rare tags as many as possible . + /// + public string SelectExtraTags + { + get + { + if (int.TryParse(_selectExtraTags, out _)) + { + return _selectExtraTags; + } + + ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, "0"); + return "0"; + + // v4.28.0迁移，不再支持bool类型 + /* + var value = "0"; + if (bool.TryParse(_selectExtraTags, out bool boolValue)) + { + value = boolValue ? "1" : "0"; + } + + SetAndNotify(ref _selectExtraTags, value); + ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value); + return value;*/ + } + + set + { + SetAndNotify(ref _selectExtraTags, value); + ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value); + } + } + + private bool _notChooseLevel1 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.NotChooseLevel1, bool.TrueString)); + + /// + /// Gets or sets a value indicating whether not to choose level 1. + /// + public bool NotChooseLevel1 + { + get => _notChooseLevel1; + set + { + SetAndNotify(ref _notChooseLevel1, value); + ConfigurationHelper.SetValue(ConfigurationKeys.NotChooseLevel1, value.ToString()); + } + } + + private bool _chooseLevel3 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel3, bool.TrueString)); + + /// + /// Gets or sets a value indicating whether to choose level 3. + /// + public bool ChooseLevel3 + { + get => _chooseLevel3; + set + { + SetAndNotify(ref _chooseLevel3, value); + ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel3, value.ToString()); + } + } + + private bool _chooseLevel4 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel4, bool.TrueString)); + + /// + /// Gets or sets a value indicating whether to choose level 4. + /// + public bool ChooseLevel4 + { + get => _chooseLevel4; + set + { + SetAndNotify(ref _chooseLevel4, value); + ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel4, value.ToString()); + } + } + + private bool _chooseLevel5 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitChooseLevel5, bool.FalseString)); + + /// + /// Gets or sets a value indicating whether to choose level 5. + /// + public bool ChooseLevel5 + { + get => _chooseLevel5; + set + { + SetAndNotify(ref _chooseLevel5, value); + ConfigurationHelper.SetValue(ConfigurationKeys.RecruitChooseLevel5, value.ToString()); + } + } + + private int _chooseLevel3Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")) / 60; + + public int ChooseLevel3Hour + { + get => _chooseLevel3Hour; + set + { + if (!SetAndNotify(ref _chooseLevel3Hour, value)) + { + return; + } + + ChooseLevel3Time = (value * 60) + ChooseLevel3Min; + } + } + + private int _chooseLevel3Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")) % 60) / 10 * 10; + + public int ChooseLevel3Min + { + get => _chooseLevel3Min; + set + { + if (!SetAndNotify(ref _chooseLevel3Min, value)) + { + return; + } + + ChooseLevel3Time = (ChooseLevel3Hour * 60) + value; + } + } + + private int _chooseLevel3Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3Time, "540")); + + public int ChooseLevel3Time + { + get => _chooseLevel3Time; + set + { + value = value switch + { + < 60 => 540, + > 540 => 60, + _ => value / 10 * 10, + }; + + SetAndNotify(ref _chooseLevel3Time, value); + ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel3Time, value.ToString()); + SetAndNotify(ref _chooseLevel3Hour, value / 60, nameof(ChooseLevel3Hour)); + SetAndNotify(ref _chooseLevel3Min, value % 60, nameof(ChooseLevel3Min)); + } + } + + private int _chooseLevel4Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")) / 60; + + public int ChooseLevel4Hour + { + get => _chooseLevel4Hour; + set + { + if (!SetAndNotify(ref _chooseLevel4Hour, value)) + { + return; + } + + ChooseLevel4Time = (value * 60) + ChooseLevel4Min; + } + } + + private int _chooseLevel4Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")) % 60) / 10 * 10; + + public int ChooseLevel4Min + { + get => _chooseLevel4Min; + set + { + if (!SetAndNotify(ref _chooseLevel4Min, value)) + { + return; + } + + ChooseLevel4Time = (ChooseLevel4Hour * 60) + value; + } + } + + private int _chooseLevel4Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4Time, "540")); + + public int ChooseLevel4Time + { + get => _chooseLevel4Time; + set + { + value = value switch + { + < 60 => 540, + > 540 => 60, + _ => value / 10 * 10, + }; + + SetAndNotify(ref _chooseLevel4Time, value); + ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel4Time, value.ToString()); + SetAndNotify(ref _chooseLevel4Hour, value / 60, nameof(ChooseLevel4Hour)); + SetAndNotify(ref _chooseLevel4Min, value % 60, nameof(ChooseLevel4Min)); + } + } + + private int _chooseLevel5Hour = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")) / 60; + + public int ChooseLevel5Hour + { + get => _chooseLevel5Hour; + set + { + if (!SetAndNotify(ref _chooseLevel5Hour, value)) + { + return; + } + + ChooseLevel5Time = (value * 60) + ChooseLevel5Min; + } + } + + private int _chooseLevel5Min = (Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")) % 60) / 10 * 10; + + public int ChooseLevel5Min + { + get => _chooseLevel5Min; + set + { + if (!SetAndNotify(ref _chooseLevel5Min, value)) + { + return; + } + + ChooseLevel5Time = (ChooseLevel5Hour * 60) + value; + } + } + + private int _chooseLevel5Time = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5Time, "540")); + + public int ChooseLevel5Time + { + get => _chooseLevel5Time; + set + { + value = value switch + { + < 60 => 540, + > 540 => 60, + _ => value / 10 * 10, + }; + + SetAndNotify(ref _chooseLevel5Time, value); + ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel5Time, value.ToString()); + SetAndNotify(ref _chooseLevel5Hour, value / 60, nameof(ChooseLevel5Hour)); + SetAndNotify(ref _chooseLevel5Min, value % 60, nameof(ChooseLevel5Min)); + } + } + } +} diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml index 895f819662..7d15fff396 100644 --- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml +++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml @@ -15,6 +15,7 @@ xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI" xmlns:userControl="clr-namespace:MaaWpfGui.Views.UserControl" MinWidth="720" + d:Background="White" d:DataContext="{d:DesignInstance {x:Type ui:TaskQueueViewModel}}" d:DesignHeight="495" d:DesignWidth="800" @@ -241,11 +242,12 @@ VerticalScrollBarVisibility="Auto"> - + - + - - + +// // MaaWpfGui - A part of the MaaCoreArknights project // Copyright (C) 2021 MistEO and Contributors // @@ -13,17 +13,17 @@ using System.Reflection; -namespace MaaWpfGui.Views.UserControl +namespace MaaWpfGui.Views.UserControl.TaskQueue { /// - /// AutoRecruitSettingsUserControl.xaml 的交互逻辑 + /// RecruitSettingsUserControl.xaml 的交互逻辑 /// - public partial class AutoRecruitSettingsUserControl : System.Windows.Controls.UserControl + public partial class RecruitSettingsUserControl : System.Windows.Controls.UserControl { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// - public AutoRecruitSettingsUserControl() + public RecruitSettingsUserControl() { InitializeComponent(); }