Merge pull request #2681 from prpjzz/develop

Author: Lightczx

src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml

@@ -51,11 +51,11 @@
             x:Name="NavView"
             Margin="0,0,0,0"
             shuxc:NavigationViewHelper.PaneCornerRadius="0"
-            CompactPaneLength="48"
+            CompactPaneLength="45"
             IsBackEnabled="{x:Bind ContentFrame.CanGoBack, Mode=OneWay}"
             IsEnabled="{Binding ElementName=ContentFrame, Path=Content.DataContext.IsInitialized, Mode=OneWay}"
             IsPaneOpen="True"
-            OpenPaneLength="192"
+            OpenPaneLength="205"
             PaneDisplayMode="Left"
             UseLayoutRounding="False">
 

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

@@ -706,41 +706,6 @@
                     </StackPanel>
                 </ScrollViewer>
             </PivotItem>
-            <PivotItem Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourceHeader}">
-                <Grid>
-                    <ScrollViewer Visibility="{Binding GamePackage, Converter={StaticResource EmptyObjectToBoolConverter}}">
-                        <StackPanel>
-                            <Border Margin="16,16,16,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                                    <shuxvs:LaunchGameResourceExpander
-                                        cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
-                                        DataContext="{Binding GamePackage.PreDownload.Major, Mode=OneWay}"
-                                        Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
-                                        IsEnabled="{Binding FallbackValue=False, Converter={StaticResource EmptyObjectToBoolConverter}}"
-                                        IsExpanded="{Binding FallbackValue=False, Converter={StaticResource EmptyObjectToBoolConverter}, Mode=OneTime}"/>
-                                </Border>
-                            </Border>
-                            <ItemsControl
-                                Margin="0,0,0,0"
-                                ItemTemplate="{StaticResource GameResourceTemplate}"
-                                ItemsSource="{Binding GamePackage.PreDownload.Patches, Mode=OneWay}"/>
-                            <Border Margin="16,16,16,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                                    <shuxvs:LaunchGameResourceExpander
-                                        cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
-                                        DataContext="{Binding GamePackage.Main.Major, Mode=OneWay}"
-                                        Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
-                                </Border>
-                            </Border>
-                            <ItemsControl
-                                Margin="0,0,0,16"
-                                ItemTemplate="{StaticResource GameResourceTemplate}"
-                                ItemsSource="{Binding GamePackage.Main.Patches, Mode=OneWay}"/>
-                        </StackPanel>
-                    </ScrollViewer>
-                    <shuxc:Loading IsLoading="{Binding GamePackage, Converter={StaticResource EmptyObjectToBoolRevertConverter}}" Style="{ThemeResource DefaultLoadingViewStyle}"/>
-                </Grid>
-            </PivotItem>
         </Pivot>
     </shuxc:StandardView>
 </shuxc:ScopedPage>