Skip to content

Commit

Permalink
Merge pull request #2352 from DGP-Studio/Cherries-Snow-Laden
Browse files Browse the repository at this point in the history
  • Loading branch information
Lightczx authored Jan 6, 2025
2 parents a41a5fe + b4ca200 commit 91bb707
Show file tree
Hide file tree
Showing 80 changed files with 8 additions and 5 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
Binary file added res/HutaoLogo2/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/MSIX Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/Main logo.psd
Binary file not shown.
Binary file added res/HutaoLogo2/No-padding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/HutaoLogo2/No-padding.psd
Binary file not shown.
3 changes: 3 additions & 0 deletions res/HutaoLogo2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
本文件夹中的所有图片,均由 [DGP Studio](https://github.com/DGP-Studio) 委托 [Bilibili 画画的芦苇](https://space.bilibili.com/274422134) 绘制

Copyright © 2023 DGP Studio, All Rights Reserved.
Binary file added src/Snap.Hutao/Snap.Hutao/Assets/InAppLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/LargeTile.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/LargeTile.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/LargeTile.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/LargeTile.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/LargeTile.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Logo.ico
Binary file not shown.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SmallTile.scale-100.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SmallTile.scale-125.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SmallTile.scale-150.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SmallTile.scale-200.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SmallTile.scale-400.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SplashScreen.scale-100.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SplashScreen.scale-125.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SplashScreen.scale-150.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SplashScreen.scale-200.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/SplashScreen.scale-400.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.scale-100.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.scale-125.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.scale-150.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.scale-200.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.scale-400.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Square44x44Logo.targetsize-48.png
Binary file removed src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.png
Diff not rendered.
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.scale-100.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.scale-125.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.scale-150.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.scale-200.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/StoreLogo.scale-400.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Wide310x150Logo.scale-125.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Wide310x150Logo.scale-150.png
Binary file modified src/Snap.Hutao/Snap.Hutao/Assets/Wide310x150Logo.scale-200.png
4 changes: 2 additions & 2 deletions src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
<None Remove="Assets\Square44x44Logo.targetsize-16.png" />
<None Remove="Assets\Square44x44Logo.targetsize-256.png" />
<None Remove="Assets\Square44x44Logo.targetsize-48.png" />
<None Remove="Assets\StoreLogo.png" />
<None Remove="Assets\StoreLogo.scale-100.png" />
<None Remove="Assets\StoreLogo.scale-200.png" />
<None Remove="Assets\StoreLogo.scale-400.png" />
Expand Down Expand Up @@ -111,6 +110,7 @@
<None Remove="Resource\ItemIcon\UI_QUALITY_PURPLE.png" />
<None Remove="Resource\ItemIcon\UI_QUALITY_RED.png" />
<None Remove="Resource\ItemIcon\UI_QUALITY_WHITE.png" />
<None Remove="Resource\Navigation\Passport.png" />
<None Remove="Resource\Navigation\RoleCombat.png" />
<None Remove="Resource\ThirdParty\Apple.png" />
<None Remove="Resource\ThirdParty\Facebook.png" />
Expand Down Expand Up @@ -207,7 +207,6 @@
<Content Update="Assets\Square44x44Logo.targetsize-16.png" />
<Content Update="Assets\Square44x44Logo.targetsize-256.png" />
<Content Update="Assets\Square44x44Logo.targetsize-48.png" />
<Content Update="Assets\StoreLogo.png" />
<Content Update="Assets\StoreLogo.scale-100.png" />
<Content Update="Assets\StoreLogo.scale-200.png" />
<Content Update="Assets\StoreLogo.scale-400.png" />
Expand Down Expand Up @@ -253,6 +252,7 @@
<Content Include="Resource\Navigation\Feedback.png" />
<Content Include="Resource\Navigation\GachaLog.png" />
<Content Include="Resource\Navigation\LaunchGame.png" />
<Content Include="Resource\Navigation\Passport.png" />
<Content Include="Resource\Navigation\SpiralAbyss.png" />
<Content Include="Resource\Navigation\WikiAvatar.png" />
<Content Include="Resource\Navigation\WikiMonster.png" />
Expand Down
2 changes: 1 addition & 1 deletion src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/GuideView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<Image
Grid.Column="0"
Height="152"
Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
Source="ms-appx:///Assets/InAppLogo.png"/>
<StackPanel
Grid.Column="1"
VerticalAlignment="Center"
Expand Down
2 changes: 1 addition & 1 deletion src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<NavigationViewItem
shuxc:NavigationViewItemHelper.NavigateTo="shuxvp:HutaoPassportPage"
Content="{shuxm:ResourceString Name=ViewHutaoPassportHeader}"
Icon="{shuxm:BitmapIcon Source=ms-appx:///Resource/Navigation/Feedback.png}"/>
Icon="{shuxm:BitmapIcon Source=ms-appx:///Resource/Navigation/Passport.png}"/>
<NavigationViewItem
shuxc:NavigationViewItemHelper.NavigateTo="shuxvp:FeedbackPage"
Content="{shuxm:ResourceString Name=ViewFeedbackHeader}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
MaxWidth="120"
MaxHeight="120"
Margin="48,48"
Source="ms-appx:///Assets/Square44x44Logo.targetsize-256.png"/>
Source="ms-appx:///Assets/InAppLogo.png"/>
<cwc:UniformGrid
Grid.Row="1"
Margin="16"
Expand Down

0 comments on commit 91bb707

Please sign in to comment.