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

fix(wpf): 小工具-公招识别 3~5星选择时间无法修改

Browse Source
This commit is contained in:
status102
2026-02-14 12:54:36 +08:00
parent 63d499816d
commit 910cd47dfa
3 changed files with 105 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MaaWpfGui/Constants/ConfigurationKeys.cs
View File

@@ -113,8 +113,11 @@ public static class ConfigurationKeys
public const string BlockSleepWithScreenOn = "Start.BlockSleepWithScreenOn";
public const string ChooseLevel3 = "Recruit.ChooseLevel3";
public const string ToolBoxChooseLevel3Time = "Toolbox.Recruit.ChooseLevel3.Time";
public const string ChooseLevel4 = "Recruit.ChooseLevel4";
public const string ToolBoxChooseLevel4Time = "Toolbox.Recruit.ChooseLevel4.Time";
public const string ChooseLevel5 = "Recruit.ChooseLevel5";
public const string ToolBoxChooseLevel5Time = "Toolbox.Recruit.ChooseLevel5.Time";
public const string ChooseLevel6 = "Recruit.ChooseLevel6";
public const string AutoSetTime = "Recruit.AutoSetTime";
public const string RecruitmentShowPotential = "Recruit.ShowPotential";

124
src/MaaWpfGui/ViewModels/UI/ToolboxViewModel.cs
View File

@@ -108,24 +108,12 @@ public class ToolboxViewModel : Screen
#region Recruit
private string _recruitInfo = LocalizationHelper.GetString("RecruitmentRecognitionTip");
/// <summary>
/// Gets or sets the recruit info.
/// </summary>
public string RecruitInfo
{
get => _recruitInfo;
set => SetAndNotify(ref _recruitInfo, value);
}
public string RecruitInfo { get => field; set => SetAndNotify(ref field, value); } = LocalizationHelper.GetString("RecruitmentRecognitionTip");
private ObservableCollection<Inline> _recruitResultInlines = [];
public ObservableCollection<Inline> RecruitResultInlines
{
get => _recruitResultInlines;
set => SetAndNotify(ref _recruitResultInlines, value);
}
public ObservableCollection<Inline> RecruitResultInlines { get => field; set => SetAndNotify(ref field, value); } = [];
public void UpdateRecruitResult(JArray? resultArray)
{
@@ -227,47 +215,41 @@ public class ToolboxViewModel : Screen
}
}
private bool _chooseLevel3 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3, bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to choose level 3.
/// </summary>
public bool ChooseLevel3
{
get => _chooseLevel3;
get => field;
set {
SetAndNotify(ref _chooseLevel3, value);
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel3, value.ToString());
}
}
private bool _chooseLevel4 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4, bool.TrueString));
} = ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel3, true);
/// <summary>
/// Gets or sets a value indicating whether to choose level 4.
/// </summary>
public bool ChooseLevel4
{
get => _chooseLevel4;
get => field;
set {
SetAndNotify(ref _chooseLevel4, value);
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel4, value.ToString());
}
}
private bool _chooseLevel5 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5, bool.TrueString));
} = ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel4, true);
/// <summary>
/// Gets or sets a value indicating whether to choose level 5.
/// </summary>
public bool ChooseLevel5
{
get => _chooseLevel5;
get => field;
set {
SetAndNotify(ref _chooseLevel5, value);
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ChooseLevel5, value.ToString());
}
}
} = ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel5, true);
private bool _chooseLevel6 = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.ChooseLevel6, bool.TrueString));
@@ -283,6 +265,90 @@ public class ToolboxViewModel : Screen
}
}
[PropertyDependsOn(nameof(ChooseLevel3Time))]
public int ChooseLevel3Hour
{
get => ChooseLevel3Time / 60;
set => ChooseLevel3Time = (value * 60) + ChooseLevel3Min;
}
[PropertyDependsOn(nameof(ChooseLevel3Time))]
public int ChooseLevel3Min
{
get => (ChooseLevel3Time % 60) / 10 * 10;
set => ChooseLevel3Time = (ChooseLevel3Hour * 60) + value;
}
public int ChooseLevel3Time
{
get => field;
set {
value = value switch {
< 60 => 9 * 60,
> 9 * 60 => 60,
_ => value / 10 * 10,
};
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ToolBoxChooseLevel3Time, value.ToString());
}
} = ConfigurationHelper.GetValue(ConfigurationKeys.ToolBoxChooseLevel3Time, 540);
[PropertyDependsOn(nameof(ChooseLevel4Time))]
public int ChooseLevel4Hour
{
get => ChooseLevel4Time / 60;
set => ChooseLevel4Time = (value * 60) + ChooseLevel4Min;
}
[PropertyDependsOn(nameof(ChooseLevel3Time))]
public int ChooseLevel4Min
{
get => (ChooseLevel4Time % 60) / 10 * 10;
set => ChooseLevel4Time = (ChooseLevel4Hour * 60) + value;
}
public int ChooseLevel4Time
{
get => field;
set {
value = value switch {
< 60 => 9 * 60,
> 9 * 60 => 60,
_ => value / 10 * 10,
};
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ToolBoxChooseLevel4Time, value.ToString());
}
} = ConfigurationHelper.GetValue(ConfigurationKeys.ToolBoxChooseLevel4Time, 540);
[PropertyDependsOn(nameof(ChooseLevel5Time))]
public int ChooseLevel5Hour
{
get => ChooseLevel5Time / 60;
set => ChooseLevel5Time = (value * 60) + ChooseLevel5Min;
}
[PropertyDependsOn(nameof(ChooseLevel5Time))]
public int ChooseLevel5Min
{
get => (ChooseLevel5Time % 60) / 10 * 10;
set => ChooseLevel5Time = (ChooseLevel5Hour * 60) + value;
}
public int ChooseLevel5Time
{
get => field;
set {
value = value switch {
< 60 => 9 * 60,
> 9 * 60 => 60,
_ => value / 10 * 10,
};
SetAndNotify(ref field, value);
ConfigurationHelper.SetValue(ConfigurationKeys.ToolBoxChooseLevel5Time, value.ToString());
}
} = ConfigurationHelper.GetValue(ConfigurationKeys.ToolBoxChooseLevel5Time, 540);
private bool _autoSetTime = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.AutoSetTime, bool.TrueString));
/// <summary>

13
src/MaaWpfGui/Views/UI/ToolboxView.xaml
View File

@@ -11,6 +11,7 @@
xmlns:s="https://github.com/canton7/Stylet"
xmlns:uiBehaviors="clr-namespace:MaaWpfGui.Extensions.UIBehaviors"
xmlns:ui_vms="clr-namespace:MaaWpfGui.ViewModels.UI"
d:Background="White"
d:DataContext="{d:DesignInstance {x:Type ui_vms:ToolboxViewModel}}"
d:DesignHeight="600"
d:DesignWidth="800"
@@ -107,7 +108,7 @@
Maximum="9"
Minimum="1"
ValueFormat="00"
Value="{Binding ChooseLevel3Hour, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel3Hour}" />
<controls:TextBlock Margin="5" Text=":" />
<hc:NumericUpDown
Width="55"
@@ -115,7 +116,7 @@
Maximum="50"
Minimum="0"
ValueFormat="00"
Value="{Binding ChooseLevel3Min, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel3Min}" />
</StackPanel>
</StackPanel>
@@ -132,7 +133,7 @@
Maximum="9"
Minimum="1"
ValueFormat="00"
Value="{Binding ChooseLevel4Hour, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel4Hour}" />
<controls:TextBlock Margin="5" Text=":" />
<hc:NumericUpDown
Width="55"
@@ -140,7 +141,7 @@
Maximum="50"
Minimum="0"
ValueFormat="00"
Value="{Binding ChooseLevel4Min, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel4Min}" />
</StackPanel>
</StackPanel>
@@ -157,7 +158,7 @@
Maximum="9"
Minimum="1"
ValueFormat="00"
Value="{Binding ChooseLevel5Hour, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel5Hour}" />
<controls:TextBlock Margin="5" Text=":" />
<hc:NumericUpDown
Width="55"
@@ -165,7 +166,7 @@
Maximum="50"
Minimum="0"
ValueFormat="00"
Value="{Binding ChooseLevel5Min, Source={x:Static ui_vms:TaskQueueViewModel.RecruitTask}}" />
Value="{Binding ChooseLevel5Min}" />
</StackPanel>
</StackPanel>