mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-18 10:10:45 +08:00
feat: 添加备选关卡与隐藏未开放关卡的鼠标悬停提示
This commit is contained in:
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">Quantity</system:String>
|
||||
<system:String x:Key="StageSelect">Stage</system:String>
|
||||
<system:String x:Key="StageSelect2">alternative</system:String>
|
||||
<system:String x:Key="StageSelectTip">Do not use the function when the primary level is a resource level and "Resource Collection" is open all day</system:String>
|
||||
<system:String x:Key="Amend">Amend</system:String>
|
||||
|
||||
<system:String x:Key="DefaultStage">Cur/Last Stage</system:String>
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">ドロップ数</system:String>
|
||||
<system:String x:Key="StageSelect">ステージ</system:String>
|
||||
<system:String x:Key="StageSelect2">代わり</system:String>
|
||||
<system:String x:Key="StageSelectTip">主選択関門為資源関系且つ「資源収集」終日開放イベント時机能使用不可</system:String>
|
||||
<system:String x:Key="Amend">改定</system:String>
|
||||
|
||||
<!--<system:String x:Key="CurrentStage">現在ステージ</system:String>
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">드롭 수</system:String>
|
||||
<system:String x:Key="StageSelect">스테이지 선택</system:String>
|
||||
<system:String x:Key="StageSelect2">참조</system:String>
|
||||
<system:String x:Key="StageSelectTip">주 선택 레벨은 자원 닫기이며, 자원 수집 활동이 하루 종일 열려 있으면 사용하지 마십시오</system:String>
|
||||
<system:String x:Key="Amend">수정</system:String>
|
||||
|
||||
<!--<system:String x:Key="CurrentStage">현재 수테이지</system:String>
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">🕺🕺🍸</system:String>
|
||||
<system:String x:Key="StageSelect">🍷🍻🍷</system:String>
|
||||
<system:String x:Key="StageSelect2">🕺🍻</system:String>
|
||||
<system:String x:Key="StageSelectTip">🍻🍷🍸🕺🕺🍺🍷🍺🍻🍺🍷🍸🍸🍺🍺🍷🍺🍻🍸🍻</system:String>
|
||||
<system:String x:Key="Amend">🍺🍺</system:String>
|
||||
|
||||
<!--<system:String x:Key="CurrentStage">🕺🍺🍻</system:String>
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">刷取数量</system:String>
|
||||
<system:String x:Key="StageSelect">关卡选择</system:String>
|
||||
<system:String x:Key="StageSelect2">备选</system:String>
|
||||
<system:String x:Key="StageSelectTip">主选关卡为资源关且“资源收集”全天开放活动时请勿使用此功能</system:String>
|
||||
<system:String x:Key="Amend">修改</system:String>
|
||||
|
||||
<!--<system:String x:Key="CurrentStage">当前关卡</system:String>
|
||||
|
||||
@@ -187,6 +187,7 @@
|
||||
<system:String x:Key="Quantity">刷取數量</system:String>
|
||||
<system:String x:Key="StageSelect">關卡選擇</system:String>
|
||||
<system:String x:Key="StageSelect2">備選</system:String>
|
||||
<system:String x:Key="StageSelectTip">主選關卡爲資源關且“資源收集”全天開放活動時請勿使用此功能</system:String>
|
||||
<system:String x:Key="Amend">修改</system:String>
|
||||
|
||||
<!--<system:String x:Key="CurrentStage">當前關卡</system:String>
|
||||
|
||||
@@ -180,6 +180,7 @@
|
||||
ItemsSource="{Binding StageList}"
|
||||
SelectedValue="{Binding Stage2}"
|
||||
SelectedValuePath="Value"
|
||||
ToolTip="{DynamicResource StageSelectTip}"
|
||||
Visibility="{Binding AlternateStageDisplay, Converter={StaticResource Boolean2VisibilityConverter}}" />
|
||||
<ComboBox
|
||||
Height="30"
|
||||
@@ -191,6 +192,7 @@
|
||||
ItemsSource="{Binding StageList}"
|
||||
SelectedValue="{Binding Stage3}"
|
||||
SelectedValuePath="Value"
|
||||
ToolTip="{DynamicResource StageSelectTip}"
|
||||
Visibility="{Binding AlternateStageDisplay, Converter={StaticResource Boolean2VisibilityConverter}}" />
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
x:Class="MeoAsstGui.GUISettingsUserControl"
|
||||
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:hc="https://handyorg.github.io/handycontrol"
|
||||
@@ -31,12 +32,16 @@
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource UseAlternateStage}"
|
||||
IsChecked="{Binding UseAlternateStage}" />
|
||||
IsChecked="{Binding UseAlternateStage}"
|
||||
IsEnabled="{c:Binding !HideUnavailableStage}"
|
||||
ToolTip="{DynamicResource StageSelectTip}" />
|
||||
<CheckBox
|
||||
Margin="10"
|
||||
HorizontalAlignment="Left"
|
||||
Content="{DynamicResource HideUnavailableStage}"
|
||||
IsChecked="{Binding HideUnavailableStage}" />
|
||||
IsChecked="{Binding HideUnavailableStage}"
|
||||
IsEnabled="{c:Binding !UseAlternateStage}"
|
||||
ToolTip="{DynamicResource StageSelectTip}" />
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
HorizontalAlignment="Center"
|
||||
|
||||
Reference in New Issue
Block a user