diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml index e2cba04..ab9c615 100644 --- a/.github/workflows/alpha.yml +++ b/.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' }} diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index ab30f08..d4a0667 100644 --- a/.github/workflows/canary.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 268eb8c..103ba00 100644 --- a/.gitignore +++ b/.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 diff --git a/README.md b/README.md index 8b80da2..ac73ed1 100644 --- a/README.md +++ b/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/ diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx index 722f620..3f188c1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx @@ -1181,6 +1181,9 @@ Space Available: {2} Waiting for game data + + Background task + Additional Property Recommendation @@ -3989,4 +3992,7 @@ Space Available: {2} Monitor ID + + Invert Theme + \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 1e8ff0f..93e79fe 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -4020,4 +4020,7 @@ 显示器编号 + + 主题切换 + \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Uri.xaml index f0c5a20..caecc23 100644 --- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Uri.xaml +++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/Control/Theme/Uri.xaml @@ -1,45 +1,44 @@ - - - https://hut.ao/statements/bug-report.html - https://hut.ao - https://hut.ao/features/mhy-account-switch.html - https://translate.hut.ao - https://hut.ao/advanced/loopback.html - https://hut.ao/support-us.html - - - https://github.com/HolographicHat/GetToken/releases/latest - https://hut.ao/zh/support-us.html - https://launcher-webstatic.mihoyo.com/launcher-public/2024/04/15/9ebf1bc5af2d83ca5fca21adb49cf341_2571779162329842818.png - - - https://api.snapgenshin.com/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png - - - https://api.snapgenshin.com/static/raw/Bg/UI_ItemIcon_None.png - - - https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Proce.png - https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Events_Start.png - https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Proce.png - https://api.snapgenshin.com/static/raw/Mark/UI_MarkQuest_Main_Start.png - https://api.snapgenshin.com/static/raw/Mark/UI_MarkTower.png - - - https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_106.png - https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_204.png - https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_210.png - https://api.snapgenshin.com/static/raw/ItemIcon/UI_ItemIcon_220021.png - - - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon52.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon71.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon89.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon271.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon433.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png - https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon585.png - + + + https://hut.ao/statements/bug-report.html + https://hut.ao + https://hut.ao/features/mhy-account-switch.html + https://translate.hut.ao + https://hut.ao/advanced/loopback.html + https://hut.ao/support-us.html + + + https://github.com/HolographicHat/GetToken/releases/latest + https://hut.ao/zh/support-us.html + https://launcher-webstatic.mihoyo.com/launcher-public/2024/04/15/9ebf1bc5af2d83ca5fca21adb49cf341_2571779162329842818.png + + + http://serverjp.wdg.cloudns.ch:8001/static/raw/AvatarCard/UI_AvatarIcon_Costume_Card.png + + + http://serverjp.wdg.cloudns.ch:8001/static/raw/Bg/UI_ItemIcon_None.png + + + http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Proce.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Events_Start.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Proce.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkQuest_Main_Start.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/Mark/UI_MarkTower.png + + http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_106.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_204.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_210.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/ItemIcon/UI_ItemIcon_220021.png + + + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon52.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon71.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon89.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon250.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon271.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon272.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon293.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon433.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon445.png + http://serverjp.wdg.cloudns.ch:8001/static/raw/EmotionIcon/UI_EmotionIcon585.png + diff --git a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml index 2a445ad..2ab72fb 100644 --- a/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml @@ -79,9 +79,8 @@