mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-15 17:30:27 +08:00
feat: 调整部分选项所在位置
This commit is contained in:
@@ -103,8 +103,6 @@
|
||||
<system:String x:Key="AlgorithmFinish">演算结束</system:String>
|
||||
<system:String x:Key="AlgorithmBadge">繁荣证章</system:String>
|
||||
<system:String x:Key="AlgorithmConstructionPoint">建造点数</system:String>
|
||||
|
||||
|
||||
|
||||
<system:String x:Key="NotSelected">不选择</system:String>
|
||||
<system:String x:Key="Official">官服</system:String>
|
||||
@@ -221,7 +219,7 @@
|
||||
<system:String x:Key="SystemNotification">重要信息弹出系统通知</system:String>
|
||||
<system:String x:Key="UseAlternateStage">使用备选关卡</system:String>
|
||||
<system:String x:Key="UseRemainingSanityStage">使用剩余理智</system:String>
|
||||
<system:String x:Key="HideUnavailableStage">关卡选择隐藏当日不开放关卡</system:String>
|
||||
<system:String x:Key="HideUnavailableStage">隐藏当日不开放关卡</system:String>
|
||||
<system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
|
||||
<system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
|
||||
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主线关卡名与原列表的关卡名(如4-10、AP-5、H10-1-Hard)
可在关卡结尾输入"Normal/Hard"表示需要切换标准与磨难难度</system:String>
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
<system:String x:Key="MinimizeToTray">最小化時隱藏至托盤</system:String>
|
||||
<system:String x:Key="SystemNotification">重要訊息彈出系統通知</system:String>
|
||||
<system:String x:Key="UseAlternateStage">使用備選關卡</system:String>
|
||||
<system:String x:Key="HideUnavailableStage">關卡選擇隱藏當日不開放關卡</system:String>
|
||||
<system:String x:Key="HideUnavailableStage">隱藏當日不開放關卡</system:String>
|
||||
<system:String x:Key="MainViewButtonFeature">主介面可選擇按鈕功能</system:String>
|
||||
<system:String x:Key="CustomStageCode">手動輸入關卡代名</system:String>
|
||||
<system:String x:Key="CustomStageCodeTip" xml:space="preserve">支持大部分主線關卡名與原列表的關卡名(如4-10、AP-5、H10-1-Hard)
可在關卡結尾輸入"Normal/Hard"表示需要切換標準與磨難難度</system:String>
|
||||
|
||||
@@ -28,29 +28,6 @@
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource SystemNotification}"
|
||||
IsChecked="{Binding UseNotify}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource CustomStageCode}"
|
||||
IsChecked="{Binding CustomStageCode}"
|
||||
ToolTip="{DynamicResource CustomStageCodeTip}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource UseAlternateStage}"
|
||||
IsChecked="{Binding UseAlternateStage}"
|
||||
IsEnabled="{c:Binding !CustomStageCode}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource UseRemainingSanityStage}"
|
||||
IsChecked="{Binding UseRemainingSanityStage}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource HideUnavailableStage}"
|
||||
IsChecked="{Binding HideUnavailableStage}"
|
||||
IsEnabled="{c:Binding !CustomStageCode}" />
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
HorizontalAlignment="Center"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
x:Class="MaaWpfGui.PenguinReportSettingsUserControl"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:dd="urn:gong-wpf-dragdrop"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
@@ -15,12 +16,51 @@
|
||||
<RowDefinition Height="Auto" />
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
<StackPanel
|
||||
Grid.Row="0"
|
||||
HorizontalAlignment="Center"
|
||||
Content="{DynamicResource DrGrandet}"
|
||||
IsChecked="{Binding IsDrGrandet}"
|
||||
ToolTip="{DynamicResource DrGrandetTip}" />
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<StackPanel
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical">
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource DrGrandet}"
|
||||
IsChecked="{Binding IsDrGrandet}"
|
||||
ToolTip="{DynamicResource DrGrandetTip}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource CustomStageCode}"
|
||||
IsChecked="{Binding CustomStageCode}"
|
||||
ToolTip="{DynamicResource CustomStageCodeTip}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource UseAlternateStage}"
|
||||
IsChecked="{Binding UseAlternateStage}"
|
||||
IsEnabled="{c:Binding !CustomStageCode}" />
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Vertical">
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource UseRemainingSanityStage}"
|
||||
IsChecked="{Binding UseRemainingSanityStage}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource HideUnavailableStage}"
|
||||
IsChecked="{Binding HideUnavailableStage}"
|
||||
IsEnabled="{c:Binding !CustomStageCode}" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
Grid.Row="1"
|
||||
HorizontalAlignment="Center"
|
||||
|
||||
Reference in New Issue
Block a user