Skip to content

Commit 4a3d517

Browse files
committed
修复树脂物品相关功能
1 parent 54f5363 commit 4a3d517

File tree

1 file changed

+21
-26
lines changed

1 file changed

+21
-26
lines changed

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/LaunchGamePage.xaml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@
636636
<RowDefinition Height="auto"/>
637637
<RowDefinition Height="auto"/>
638638
<RowDefinition Height="auto"/>
639+
<RowDefinition Height="auto"/>
639640
</Grid.RowDefinitions>
640641

641642
<ToggleSwitch
@@ -860,53 +861,47 @@
860861
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHideGrassHeader}"
861862
IsOn="{Binding LaunchOptions.HideGrass.Value, Mode=TwoWay}"
862863
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHideGrassDescription}"/>
864+
863865
<ToggleSwitch
864866
Grid.Row="5"
865867
Grid.Column="0"
866-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeHeader}"
867-
IsOn="{Binding LaunchOptions.DebugMode.Value, Mode=TwoWay}"
868-
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeDescription}"/>
869-
870-
<!-- Hidden items should be at the end -->
868+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowOriginalResinHeader}"
869+
IsOn="{Binding LaunchOptions.ResinListItemId000106Allowed.Value, Mode=TwoWay}"/>
871870
<ToggleSwitch
872-
Visibility="{Binding IsDeveloperAndLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"
873871
Grid.Row="5"
874872
Grid.Column="1"
875-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoHeader}"
876-
IsOn="{Binding LaunchOptions.HidePlayerInfo.Value, Mode=TwoWay}"
877-
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoDescription}"/>
878-
873+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowPrimogemHeader}"
874+
IsOn="{Binding LaunchOptions.ResinListItemId000201Allowed.Value, Mode=TwoWay}"/>
879875
<ToggleSwitch
880-
Visibility="Collapsed"
881876
Grid.Row="5"
882877
Grid.Column="2"
883-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowOriginalResinHeader}"
884-
IsOn="{Binding LaunchOptions.ResinListItemId000106Allowed.Value, Mode=TwoWay}"/>
878+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowFragileResinHeader}"
879+
IsOn="{Binding LaunchOptions.ResinListItemId107009Allowed.Value, Mode=TwoWay}"/>
885880
<ToggleSwitch
886-
Visibility="Collapsed"
887881
Grid.Row="6"
888882
Grid.Column="0"
889-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowPrimogemHeader}"
890-
IsOn="{Binding LaunchOptions.ResinListItemId000201Allowed.Value, Mode=TwoWay}"/>
883+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowTransientResinHeader}"
884+
IsOn="{Binding LaunchOptions.ResinListItemId107012Allowed.Value, Mode=TwoWay}"/>
891885
<ToggleSwitch
892-
Visibility="Collapsed"
893886
Grid.Row="6"
894887
Grid.Column="1"
895-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowFragileResinHeader}"
896-
IsOn="{Binding LaunchOptions.ResinListItemId107009Allowed.Value, Mode=TwoWay}"/>
897-
888+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowCondensedResinHeader}"
889+
IsOn="{Binding LaunchOptions.ResinListItemId220007Allowed.Value, Mode=TwoWay}"/>
898890
<ToggleSwitch
899-
Visibility="Collapsed"
900891
Grid.Row="6"
901892
Grid.Column="2"
902-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowTransientResinHeader}"
903-
IsOn="{Binding LaunchOptions.ResinListItemId107012Allowed.Value, Mode=TwoWay}"/>
893+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeHeader}"
894+
IsOn="{Binding LaunchOptions.DebugMode.Value, Mode=TwoWay}"
895+
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandDebugModeDescription}"/>
896+
897+
<!-- Hidden items should be at the end -->
904898
<ToggleSwitch
905-
Visibility="Collapsed"
899+
Visibility="{Binding IsDeveloperAndLoggedIn, Converter={StaticResource BoolToVisibilityConverter}}"
906900
Grid.Row="7"
907901
Grid.Column="0"
908-
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandResinListItemAllowCondensedResinHeader}"
909-
IsOn="{Binding LaunchOptions.ResinListItemId220007Allowed.Value, Mode=TwoWay}"/>
902+
Header="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoHeader}"
903+
IsOn="{Binding LaunchOptions.HidePlayerInfo.Value, Mode=TwoWay}"
904+
ToolTipService.ToolTip="{shuxm:ResourceString Name=ViewPageLaunchGameIslandHidePlayerInfoDescription}"/>
910905
</Grid>
911906
</ContentControl>
912907
</ScrollViewer>

0 commit comments

Comments
 (0)