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

feat: 备选关卡与手动输入关卡名兼容

Browse Source 
fix #3837
This commit is contained in:
uye
2023-03-11 16:29:48 +08:00
parent 0997c0d181
commit 98cb5eaec8
4 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Main/SettingsViewModel.cs
View File

@@ -2298,7 +2298,7 @@ namespace MaaWpfGui
set
{
SetAndNotify(ref _useAlternateStage, value);
_taskQueueViewModel.AlternateStageDisplay = value;
_taskQueueViewModel.UseAlternateStage = value;
ViewStatusStorage.Set("GUI.UseAlternateStage", value.ToString());
if (value)
{

10
src/MaaWpfGui/Main/TaskQueueViewModel.cs
View File

@@ -1526,16 +1526,15 @@ namespace MaaWpfGui
}
}
private bool _alternateStageDisplay = !Convert.ToBoolean(ViewStatusStorage.Get("GUI.CustomStageCode", bool.FalseString))
&& Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString));
private bool _useAlternateStage = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to use alternate stage.
/// </summary>
public bool AlternateStageDisplay
public bool UseAlternateStage
{
get => _alternateStageDisplay;
set => SetAndNotify(ref _alternateStageDisplay, value);
get => _useAlternateStage;
set => SetAndNotify(ref _useAlternateStage, value);
}
private bool _useRemainingSanityStage = Convert.ToBoolean(ViewStatusStorage.Get("Fight.UseRemainingSanityStage", bool.TrueString));
@@ -1557,7 +1556,6 @@ namespace MaaWpfGui
set
{
SetAndNotify(ref _customStageCode, value);
AlternateStageDisplay = !value && _settingsViewModel.UseAlternateStage;
}
}

48
src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
View File

@@ -149,7 +149,7 @@
TextAlignment="Center"
TextWrapping="Wrap" />
</Grid>
<Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
<Grid Height="42" Visibility="{c:Binding UseAlternateStage}">
<maa:TextBlock
Margin="10,6"
HorizontalAlignment="Center"
@@ -158,7 +158,7 @@
TextAlignment="Center"
TextWrapping="Wrap" />
</Grid>
<Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
<Grid Height="42" Visibility="{c:Binding UseAlternateStage}">
<!-- a placeholder -->
<maa:TextBlock
Margin="10,6"
@@ -193,15 +193,6 @@
SelectedValue="{Binding Stage1}"
SelectedValuePath="Value"
Visibility="{c:Binding !CustomStageCode}" />
<TextBox
Height="30"
Margin="0,6"
Padding="6,0,0,0"
VerticalContentAlignment="Center"
IsHitTestVisible="{c:Binding !FightTaskRunning}"
Text="{Binding Stage1, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource CustomStageCodeTip}"
Visibility="{c:Binding CustomStageCode}" />
<ComboBox
Height="30"
Margin="0,6"
@@ -212,7 +203,7 @@
ItemsSource="{Binding StageList}"
SelectedValue="{Binding Stage2}"
SelectedValuePath="Value"
Visibility="{c:Binding AlternateStageDisplay}" />
Visibility="{c:Binding !CustomStageCode and UseAlternateStage}" />
<ComboBox
Height="30"
Margin="0,6"
@@ -223,7 +214,7 @@
ItemsSource="{Binding StageList}"
SelectedValue="{Binding Stage3}"
SelectedValuePath="Value"
Visibility="{c:Binding AlternateStageDisplay}" />
Visibility="{c:Binding !CustomStageCode and UseAlternateStage}" />
<ComboBox
Height="30"
Margin="0,6"
@@ -235,7 +226,34 @@
SelectedValue="{Binding RemainingSanityStage}"
SelectedValuePath="Value"
ToolTip="{DynamicResource UseRemainingSanityStageTip}"
Visibility="{c:Binding UseRemainingSanityStage and !CustomStageCode}" />
Visibility="{c:Binding !CustomStageCode and UseRemainingSanityStage}" />
<TextBox
Height="30"
Margin="0,6"
Padding="6,0,0,0"
VerticalContentAlignment="Center"
IsHitTestVisible="{c:Binding !FightTaskRunning}"
Text="{Binding Stage1, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource CustomStageCodeTip}"
Visibility="{c:Binding CustomStageCode}" />
<TextBox
Height="30"
Margin="0,6"
Padding="6,0,0,0"
VerticalContentAlignment="Center"
IsHitTestVisible="{c:Binding !FightTaskRunning}"
Text="{Binding Stage2, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource CustomStageCodeTip}"
Visibility="{c:Binding CustomStageCode and UseAlternateStage}" />
<TextBox
Height="30"
Margin="0,6"
Padding="6,0,0,0"
VerticalContentAlignment="Center"
IsHitTestVisible="{c:Binding !FightTaskRunning}"
Text="{Binding Stage3, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource CustomStageCodeTip}"
Visibility="{c:Binding CustomStageCode and UseAlternateStage}" />
<TextBox
Height="30"
Margin="0,6"
@@ -244,7 +262,7 @@
IsHitTestVisible="{c:Binding !FightTaskRunning}"
Text="{Binding RemainingSanityStage, UpdateSourceTrigger=PropertyChanged}"
ToolTip="{DynamicResource UseRemainingSanityStageTip}"
Visibility="{c:Binding UseRemainingSanityStage and CustomStageCode}" />
Visibility="{c:Binding CustomStageCode and UseRemainingSanityStage}" />
</StackPanel>
</Grid>
<Grid Grid.Row="3">

3
src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
View File

@@ -42,8 +42,7 @@
Margin="10"
HorizontalAlignment="Left"
Content="{DynamicResource UseAlternateStage}"
IsChecked="{Binding UseAlternateStage}"
IsEnabled="{c:Binding !CustomStageCode}" />
IsChecked="{Binding UseAlternateStage}" />
</StackPanel>
<StackPanel
HorizontalAlignment="Center"