Merge branch 'main' into main

.github/workflows/alpha.yml

@@ -73,7 +73,7 @@ jobs:
     runs-on: ${{ needs.select-runner.outputs.runner }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup .NET (self-hosted)
         if: ${{ needs.select-runner.outputs.runner == 'sjc1' }}

.github/workflows/canary.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: develop
           fetch-depth: 0

.gitignore

@@ -1,4 +1,4 @@
-desktop.ini
+desktop.ini
 
 *.csproj.user
 *.DotSettings.user
@@ -27,3 +27,4 @@ tools/
 src/Snap.Hutao/Snap.Hutao/AppPackages
 /src/Snap.Hutao/Snap.Hutao.Installer/obj
 /src/Snap.Hutao/Snap.Hutao.Installer/bin/x64/Release/en-US
+/src/Snap.Hutao/Snap.Hutao.Installer/bin

README.md

@@ -13,6 +13,8 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
 
 ## 🚀 安装 / Installation
 
+> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包，正常情况下请尽量下载普通包（服务器速度快）
+
 前往[releases](https://github.com/wangdage12/Snap.Hutao/releases/tag/1.17.1.0)中下载zip，解压后右键`Add-AppDevPackage.ps1`，点击`使用PowerShell运行`来安装  
 可以和之前的版本共存，将之前版本的数据文件夹里面的文件复制到该版本的数据文件夹中即可恢复数据
 
@@ -37,7 +39,8 @@ https://deepwiki.com/DGP-Studio/Snap.Hutao.Server
 
 ### 资源
 
-> 注意：资源服务器只能使用ipv6连接，也就是说，你的电脑必须有ipv6，并且建议你手动配置DNS为`223.5.5.5`  
+> 注意：普通包的资源服务器只能使用ipv6连接，也就是说，你的电脑必须有ipv6，并且建议你手动配置DNS为`223.5.5.5`  
+> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包  
 > 由于数据文件夹中有元数据的仓库和图片缓存，才得以恢复资源文件  
 > 如果你发现之前版本可以显示的图片不能显示了，请查找旧数据文件夹  
 > `C:\Users\<用户名>\AppData\Local\Packages\xxxDGPStudio.SnapHutao_xxx\LocalCache\ImageCache`  
@@ -49,12 +52,18 @@ https://github.com/wangdage12/Snap.Metadata
 镜像：  
 http://server.wdg.cloudns.ch:3000/wdg1122/Snap.Metadata
 
+http://serverjp.wdg.cloudns.ch:3000/wdg1122/Snap.Metadata
+
 ---
 
 **临时API：**  
 http://server.wdg.cloudns.ch:5222/
 
+http://serverjp.wdg.cloudns.ch:5222/
+
 ---
 
 **临时资源站：**  
 http://server.wdg.cloudns.ch:8007/
+
+http://serverjp.wdg.cloudns.ch:8001/

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx

@@ -1181,6 +1181,9 @@ Space Available: {2}</value>
   <data name="ServiceYaeWaitForGameResponseMessage" xml:space="preserve">
     <value>Waiting for game data</value>
   </data>
+  <data name="UIViewMainTitleBarBackgroundActivityAction" xml:space="preserve">
+    <value>Background task</value>
+  </data>
   <data name="UIViewPageAvatarPropertyRecommendedAppendProperties" xml:space="preserve">
     <value>Additional Property Recommendation</value>
   </data>
@@ -3989,4 +3992,7 @@ Space Available: {2}</value>
   <data name="WindowIdentifyMonitorHeader" xml:space="preserve">
     <value>Monitor ID</value>
   </data>
+  <data name="UIViewMainTitleBarInvertTheme" xml:space="preserve">
+    <value>Invert Theme</value>
+  </data>
 </root>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -4020,4 +4020,7 @@
   <data name="WindowIdentifyMonitorHeader" xml:space="preserve">
     <value>显示器编号</value>
   </data>
+  <data name="UIViewMainTitleBarInvertTheme" xml:space="preserve">
+    <value>主题切换</value>
+  </data>
 </root>

src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Uri.xaml

@@ -1,45 +1,44 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--  DocumentLink  -->
-    <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
-    <x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
-    <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
-    <x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
-    <x:String x:Key="DocumentLink_Loopback">https://hut.ao/advanced/loopback.html</x:String>
-    <x:String x:Key="DocumentLink_Sponsor">https://hut.ao/support-us.html</x:String>
-
-    <!--  Other  -->
-    <x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
-    <x:String x:Key="Sponsor_Afadian">https://hut.ao/zh/support-us.html</x:String>
-    <x:String x:Key="IconGame">https://launcher-webstatic.mihoyo.com/launcher-public/2024/04/15/9ebf1bc5af2d83ca5fca21adb49cf341_2571779162329842818.png</x:String>
-
-    <!--  AvatarCard  -->
-    <x:String x:Key="UI_AvatarIcon_Costume_Card">https://api.snapgenshin.com/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
-
-    <!--  Bg  -->
-    <x:String x:Key="UI_ItemIcon_None">https://api.snapgenshin.com/static/raw/Bg/UI_ItemIcon_None.png</x:String>
-
-    <!--  Mark  -->
-    <x:String x:Key="UI_MarkQuest_Events_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
-    <x:String x:Key="UI_MarkQuest_Events_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
-    <x:String x:Key="UI_MarkQuest_Main_Proce">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
-    <x:String x:Key="UI_MarkQuest_Main_Start">https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
-    <x:String x:Key="UI_MarkTower">https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png</x:String>
-
-    <!--  ItemIcon  -->
-    <x:String x:Key="UI_ItemIcon_106">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_106.png</x:String>
-    <x:String x:Key="UI_ItemIcon_204">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_204.png</x:String>
-    <x:String x:Key="UI_ItemIcon_210">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_210.png</x:String>
-    <x:String x:Key="UI_ItemIcon_220021">https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_220021.png</x:String>
-
-    <!--  EmotionIcon  -->
-    <x:String x:Key="UI_EmotionIcon52">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
-    <x:String x:Key="UI_EmotionIcon71">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
-    <x:String x:Key="UI_EmotionIcon89">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
-    <x:String x:Key="UI_EmotionIcon250">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
-    <x:String x:Key="UI_EmotionIcon271">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
-    <x:String x:Key="UI_EmotionIcon272">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
-    <x:String x:Key="UI_EmotionIcon293">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
-    <x:String x:Key="UI_EmotionIcon433">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
-    <x:String x:Key="UI_EmotionIcon445">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
-    <x:String x:Key="UI_EmotionIcon585">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon585.png</x:String>
-</ResourceDictionary>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  DocumentLink  -->
+    <x:String x:Key="DocumentLink_BugReport">https://hut.ao/statements/bug-report.html</x:String>
+    <x:String x:Key="DocumentLink_Home">https://hut.ao</x:String>
+    <x:String x:Key="DocumentLink_MhyAccountSwitch">https://hut.ao/features/mhy-account-switch.html</x:String>
+    <x:String x:Key="DocumentLink_Translate">https://translate.hut.ao</x:String>
+    <x:String x:Key="DocumentLink_Loopback">https://hut.ao/advanced/loopback.html</x:String>
+    <x:String x:Key="DocumentLink_Sponsor">https://hut.ao/support-us.html</x:String>
+
+    <!--  Other  -->
+    <x:String x:Key="HolographicHat_GetToken_Release">https://github.com/HolographicHat/GetToken/releases/latest</x:String>
+    <x:String x:Key="Sponsor_Afadian">https://hut.ao/zh/support-us.html</x:String>
+    <x:String x:Key="IconGame">https://launcher-webstatic.mihoyo.com/launcher-public/2024/04/15/9ebf1bc5af2d83ca5fca21adb49cf341_2571779162329842818.png</x:String>
+
+    <!--  AvatarCard  -->
+    <x:String x:Key="UI_AvatarIcon_Costume_Card">http://serverjp.wdg.cloudns.ch:8001/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png</x:String>
+
+    <!--  Bg  -->
+    <x:String x:Key="UI_ItemIcon_None">http://serverjp.wdg.cloudns.ch:8001/static/raw/Bg/UI_ItemIcon_None.png</x:String>
+
+    <!--  Mark  -->
+    <x:String x:Key="UI_MarkQuest_Events_Proce">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Events_Start">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Start.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Proce">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Proce.png</x:String>
+    <x:String x:Key="UI_MarkQuest_Main_Start">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Start.png</x:String>
+    <x:String x:Key="UI_MarkTower">http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkTower.png</x:String>
+    <!--  ItemIcon  -->
+    <x:String x:Key="UI_ItemIcon_106">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_106.png</x:String>
+    <x:String x:Key="UI_ItemIcon_204">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_204.png</x:String>
+    <x:String x:Key="UI_ItemIcon_210">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_210.png</x:String>
+    <x:String x:Key="UI_ItemIcon_220021">http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_220021.png</x:String>
+
+    <!--  EmotionIcon  -->
+    <x:String x:Key="UI_EmotionIcon52">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon52.png</x:String>
+    <x:String x:Key="UI_EmotionIcon71">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon71.png</x:String>
+    <x:String x:Key="UI_EmotionIcon89">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon89.png</x:String>
+    <x:String x:Key="UI_EmotionIcon250">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon250.png</x:String>
+    <x:String x:Key="UI_EmotionIcon271">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon271.png</x:String>
+    <x:String x:Key="UI_EmotionIcon272">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon272.png</x:String>
+    <x:String x:Key="UI_EmotionIcon293">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon293.png</x:String>
+    <x:String x:Key="UI_EmotionIcon433">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon433.png</x:String>
+    <x:String x:Key="UI_EmotionIcon445">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon445.png</x:String>
+    <x:String x:Key="UI_EmotionIcon585">http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon585.png</x:String>
+</ResourceDictionary>

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

@@ -79,9 +79,8 @@
                         <Button
                             Padding="6"
                             Command="{Binding InvertAppThemeCommand}"
-                            Content="[Dev] Invert Theme"
-                            Style="{ThemeResource SettingButtonStyle}"
-                            Visibility="{Binding IsDebug}"/>
+                            Content="{shuxm:ResourceString Name=UIViewMainTitleBarInvertTheme}"
+                            Style="{ThemeResource SettingButtonStyle}"/>
 
                         <Button
                             Padding="0"