mirror of
https://github.com/wangdage12/Snap.Hutao.git
synced 2026-02-17 15:06:39 +08:00
Compare commits
6 Commits
2f148488f4
...
1.18.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
cb6d728c35 | ||
|
|
f87b80cc9e | ||
|
|
4b313b134e | ||
|
|
0c775a5d3d | ||
|
|
00cd5a8c07 | ||
|
|
d93ae2bb83 |
45
README.md
45
README.md
@@ -4,7 +4,7 @@
|
||||
**中文**
|
||||
胡桃工具箱是一款以 MIT 协议开源的原神工具箱，专为现代化 Windows 平台设计，旨在改善桌面端玩家的游戏体验。
|
||||
|
||||
该版本注入功能暂不可用，并且由于缺失资源和开发能力，不建议长期使用
|
||||
自带的注入功能只有FPS调整，只保证FPS调整长期可用，你可以使用`注入选项`下方的第三方工具来使用更多功能，本项目提供的所有注入功能都不会影响游戏的公平性。
|
||||
|
||||
有条件的话可以加入discord服务器：https://discord.gg/ucH3mgeWpQ
|
||||
|
||||
@@ -15,8 +15,6 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
|
||||
## 🚀 安装 / Installation
|
||||
|
||||
> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包，正常情况下请尽量下载普通包（服务器速度快）
|
||||
|
||||
目前 Sanp.Hutao.Rev 更新了打包方式，并采用了标准现代的 msi 安装，方便程序获取管理员权限和更多的功能设置，不再需要原 Depolyment
|
||||
|
||||
只有`.msi`安装包安装的可以和之前的版本共存，如果通过`.msix`安装包安装则可能出现`0x80073CF3`，备份旧版本数据文件夹后卸载旧版本即可继续安装，将旧版本数据文件夹里面的文件复制到该版本的数据文件夹中即可恢复数据
|
||||
@@ -34,7 +32,7 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
|
||||
**目前元数据的编写进度：**
|
||||
|
||||
| 项目（V6.2） | 是否完成 |
|
||||
| 项目（V6.3） | 是否完成 |
|
||||
| ----------- | ----------- |
|
||||
| 总体数据 | ✔️ |
|
||||
|
||||
@@ -52,40 +50,55 @@ Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao
|
||||
|
||||
https://deepwiki.com/DGP-Studio/Snap.Hutao.Server
|
||||
|
||||
**该项目所需的其他仓库，欢迎贡献或者自部署**
|
||||
|
||||
- 元数据：[Snap.Metadata](https://github.com/wangdage12/Snap.Metadata)
|
||||
- 服务端：[Snap.Server](https://github.com/wangdage12/Snap.Server)
|
||||
- Web管理后台和官网：[Snap.Server.Web](https://github.com/wangdage12/Snap.Server.Web)
|
||||
|
||||
## 打包测试
|
||||
|
||||
由于采用了 wix 进行打包程序，VS 需要安装 **HeatWave for VS2022**（2026兼容）。需要 msi 安装包时，右键选中 Snap.Hutao.Installer 生成后即可在目标目录找到。默认目录：Snap.Hutao.Installer\bin\x64\Release\en-US\Snap.Hutao.Installer.msi
|
||||
|
||||
### 资源
|
||||
## 资源和服务器状态
|
||||
|
||||
> 注意：普通包的资源服务器只能使用ipv6连接，也就是说，你的电脑必须有ipv6，并且建议你手动配置DNS为`223.5.5.5`
|
||||
> 如果你的设备不支持ipv6，请下载末尾带有`ipv4`的压缩包
|
||||
> 由于数据文件夹中有元数据的仓库和图片缓存，才得以恢复资源文件
|
||||
> 如果你发现之前版本可以显示的图片不能显示了，请查找旧数据文件夹
|
||||
> `C:\Users\<用户名>\AppData\Local\Packages\xxxDGPStudio.SnapHutao_xxx\LocalCache\ImageCache`
|
||||
> 并将`ImageCache`文件夹提供给我，我会尽力恢复资源
|
||||
|
||||
[服务器状态页面](http://serverjp.wdg.cloudns.ch:3001/status/hts)
|
||||
<a href="https://uptimerobot.com" target="_blank" rel="noopener">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)"
|
||||
srcset="https://raw.githubusercontent.com/wangdage12/wangdage12/main/assets/uptimerobot-logo.svg">
|
||||
<img alt="logo"
|
||||
src="https://raw.githubusercontent.com/wangdage12/wangdage12/main/assets/uptimerobot-logo-dark.svg" width="300">
|
||||
</picture>
|
||||
</a>
|
||||
|
||||
我们将使用[UptimeRobot](https://uptimerobot.com)赞助的监控服务作为新的服务器状态页面，它有更多的功能
|
||||
|
||||
[新服务器状态页面](https://stats.uptimerobot.com/fHxWxdxK61)
|
||||
|
||||
[旧服务器状态页面](http://serverjp.wdg.cloudns.ch:3001/status/hts)
|
||||
|
||||
---
|
||||
|
||||
**元数据仓库：**
|
||||
https://github.com/wangdage12/Snap.Metadata
|
||||
|
||||
镜像：
|
||||
仓库镜像：
|
||||
|
||||
|
||||
http://htgit.wdg.cloudns.ch/wdg1122/Snap.Metadata
|
||||
|
||||
---
|
||||
|
||||
**临时API：**
|
||||
**API：**
|
||||
|
||||
|
||||
|
||||
https://htserver.wdg.cloudns.ch/api/
|
||||
|
||||
|
||||
---
|
||||
|
||||
**临时资源站：**
|
||||
**图片资源站：**
|
||||
|
||||
https://htserver.wdg.cloudns.ch/
|
||||
|
||||
@@ -4,5 +4,8 @@ This file contains the declaration of all the localizable strings.
|
||||
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
|
||||
|
||||
<String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
|
||||
<String Id="MainAppTitle" Value="Snap.Hutao" />
|
||||
<String Id="DesktopShortcutTitle" Value="Desktop Shortcut" />
|
||||
<String Id="StartMenuShortcutTitle" Value="Start Menu Shortcut" />
|
||||
|
||||
</WixLocalization>
|
||||
|
||||
@@ -1,21 +1,32 @@
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
|
||||
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
|
||||
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
|
||||
<Package
|
||||
Name="Snap.Hutao"
|
||||
Manufacturer="Millennium Science Technology R-D Inst"
|
||||
Version="1.18.2.0"
|
||||
Version="1.18.3.0"
|
||||
UpgradeCode="121203be-60cb-408f-92cc-7080f6598e68"
|
||||
Language="2052"
|
||||
Scope="perMachine">
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<Property Id="ApplicationFolderName" Value="Snap.Hutao" />
|
||||
<Property Id="WixAppFolder" Value="WixPerMachineFolder" />
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="Snap.Hutao" Level="1">
|
||||
<ComponentGroupRef Id="MainAppComponents" />
|
||||
<ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
|
||||
|
||||
<!-- 快捷方式组件 -->
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
<Feature Id="MainApp" Title="!(loc.MainAppTitle)" Level="1">
|
||||
<ComponentGroupRef Id="MainAppComponents" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="DesktopShortcutFeature" Title="!(loc.DesktopShortcutTitle)" Level="1">
|
||||
<ComponentRef Id="DesktopShortcut" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="StartMenuShortcutFeature" Title="!(loc.StartMenuShortcutTitle)" Level="1">
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
</Feature>
|
||||
</Package>
|
||||
|
||||
<!-- 安装目录 -->
|
||||
|
||||
11
src/Snap.Hutao/Snap.Hutao.Installer/Package.zh-cn.wxl
Normal file
11
src/Snap.Hutao/Snap.Hutao.Installer/Package.zh-cn.wxl
Normal file
@@ -0,0 +1,11 @@
|
||||
<!--
|
||||
This file contains the declaration of all the localizable strings.
|
||||
-->
|
||||
<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="zh-CN">
|
||||
|
||||
<String Id="DowngradeError" Value="已安装更新版本的 [ProductName]。" />
|
||||
<String Id="MainAppTitle" Value="Snap.Hutao" />
|
||||
<String Id="DesktopShortcutTitle" Value="桌面快捷方式" />
|
||||
<String Id="StartMenuShortcutTitle" Value="开始菜单快捷方式" />
|
||||
|
||||
</WixLocalization>
|
||||
@@ -4,6 +4,8 @@
|
||||
<Platform>x64</Platform>
|
||||
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
|
||||
<Configuration>Release</Configuration>
|
||||
<DefaultCulture>zh-CN</DefaultCulture>
|
||||
<Cultures>zh-CN;en-US</Cultures>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -19,6 +21,13 @@
|
||||
<SuppressRootDirectory>true</SuppressRootDirectory>
|
||||
</HarvestDirectory>
|
||||
|
||||
<PackageReference Include="WixToolset.Heat" Version="4.0.1" />
|
||||
<PackageReference Include="WixToolset.Heat" Version="6.0.2" />
|
||||
<PackageReference Include="WixToolset.UI.wixext" Version="6.0.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<WixLocalization Include="Package.zh-cn.wxl" />
|
||||
<WixLocalization Include="Package.en-us.wxl" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -33,6 +33,8 @@ internal static class HutaoRuntime
|
||||
|
||||
public static WebView2Version WebView2Version { get; } = InitializeWebView2();
|
||||
|
||||
public static string WebView2UserDataDirectory { get; } = InitializeWebView2UserDataDirectory();
|
||||
|
||||
// ⚠️ 延迟初始化以避免循环依赖
|
||||
private static readonly Lazy<bool> LazyIsProcessElevated = new(GetIsProcessElevated);
|
||||
|
||||
@@ -144,6 +146,13 @@ internal static class HutaoRuntime
|
||||
return cacheDir;
|
||||
}
|
||||
|
||||
private static string InitializeWebView2UserDataDirectory()
|
||||
{
|
||||
string directory = Path.Combine(LocalCacheDirectory, "WebView2");
|
||||
Directory.CreateDirectory(directory);
|
||||
return directory;
|
||||
}
|
||||
|
||||
private static bool CheckAppNotificationEnabled()
|
||||
{
|
||||
try
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<Identity
|
||||
Name="60568DGPStudio.SnapHutao"
|
||||
Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
|
||||
Version="1.18.1.0" />
|
||||
Version="1.18.3.0" />
|
||||
|
||||
<Properties>
|
||||
<DisplayName>Snap Hutao</DisplayName>
|
||||
|
||||
@@ -21,6 +21,8 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
private bool invoked;
|
||||
|
||||
protected ImmutableArray<ILaunchExecutionHandler> Handlers { get; init; }
|
||||
protected virtual bool ShouldWaitForProcessExit { get => true; }
|
||||
protected virtual bool ShouldSpinWaitGameExitAfterInvoke { get => true; }
|
||||
|
||||
public static bool Invoking()
|
||||
{
|
||||
@@ -40,7 +42,7 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
finally
|
||||
{
|
||||
Invokers.TryRemove(this, out _);
|
||||
if (!Invoking())
|
||||
if (!Invoking() && ShouldSpinWaitGameExitAfterInvoke)
|
||||
{
|
||||
await GameLifeCycle.SpinWaitGameExitAsync(taskContext).ConfigureAwait(false);
|
||||
}
|
||||
@@ -132,7 +134,7 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
}
|
||||
|
||||
// 只有在没有启用Island且进程存在时才等待退出
|
||||
if (process is { IsRunning: true })
|
||||
if (ShouldWaitForProcessExit && process is { IsRunning: true })
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
try
|
||||
@@ -148,7 +150,7 @@ internal abstract class AbstractLaunchExecutionInvoker
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
else if (ShouldWaitForProcessExit && beforeContext.LaunchOptions.IsIslandEnabled.Value)
|
||||
{
|
||||
progress.Report(new(SH.ServiceGameLaunchPhaseWaitingProcessExit));
|
||||
await taskContext.SwitchToBackgroundAsync();
|
||||
|
||||
@@ -9,6 +9,9 @@ namespace Snap.Hutao.Service.Game.Launching.Invoker;
|
||||
|
||||
internal sealed class ConvertOnlyLaunchExecutionInvoker : AbstractLaunchExecutionInvoker
|
||||
{
|
||||
protected override bool ShouldWaitForProcessExit { get => false; }
|
||||
protected override bool ShouldSpinWaitGameExitAfterInvoke { get => false; }
|
||||
|
||||
public ConvertOnlyLaunchExecutionInvoker()
|
||||
{
|
||||
Handlers =
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<UseWinUI>true</UseWinUI>
|
||||
<UseWPF>False</UseWPF>
|
||||
<!-- 配置版本号 -->
|
||||
<Version>1.18.2.0</Version>
|
||||
<Version>1.18.3.0</Version>
|
||||
|
||||
<UseWindowsForms>False</UseWindowsForms>
|
||||
<ImplicitUsings>False</ImplicitUsings>
|
||||
|
||||
@@ -20,6 +20,8 @@ internal partial class ScopedPage : Page
|
||||
|
||||
protected ScopedPage()
|
||||
{
|
||||
// Allow a small set of recent pages to be cached to reduce navigation stutter.
|
||||
NavigationCacheMode = NavigationCacheMode.Enabled;
|
||||
// Events/Override Methods order
|
||||
// ----------------------------------------------------------------------
|
||||
// Page Navigation methods:
|
||||
@@ -103,6 +105,13 @@ internal partial class ScopedPage : Page
|
||||
|
||||
private void OnUnloaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
// When navigation cache is enabled, the page instance is reused.
|
||||
// Do not tear down DataContext/scope here to avoid invalid state on return.
|
||||
if (NavigationCacheMode != NavigationCacheMode.Disabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// Cancel all tasks executed by the view model
|
||||
viewCts.Cancel();
|
||||
|
||||
|
||||
@@ -264,7 +264,10 @@
|
||||
<shuxv:UserView x:Name="UserView"/>
|
||||
</NavigationView.PaneFooter>
|
||||
|
||||
<Frame x:Name="ContentFrame" ContentTransitions="{StaticResource NavigationThemeTransitions}"/>
|
||||
<Frame
|
||||
x:Name="ContentFrame"
|
||||
CacheSize="5"
|
||||
ContentTransitions="{StaticResource NavigationThemeTransitions}"/>
|
||||
</NavigationView>
|
||||
</Grid>
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@ using Microsoft.UI.Windowing;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.UI.Xaml.Input;
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Logging;
|
||||
using Snap.Hutao.Core.Setting;
|
||||
using Snap.Hutao.UI.Input.LowLevel;
|
||||
@@ -337,7 +338,8 @@ internal sealed partial class CompactWebView2Window : Microsoft.UI.Xaml.Window,
|
||||
{
|
||||
AdditionalBrowserArguments = "--do-not-de-elevate --autoplay-policy=no-user-gesture-required",
|
||||
};
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, null, options);
|
||||
string userDataFolder = HutaoRuntime.WebView2UserDataDirectory;
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, userDataFolder, options);
|
||||
await WebView.EnsureCoreWebView2Async(environment);
|
||||
}
|
||||
catch (SEHException ex)
|
||||
|
||||
@@ -5,6 +5,7 @@ using Microsoft.UI;
|
||||
using Microsoft.UI.Windowing;
|
||||
using Microsoft.UI.Xaml;
|
||||
using Microsoft.Web.WebView2.Core;
|
||||
using Snap.Hutao.Core;
|
||||
using Snap.Hutao.Core.Logging;
|
||||
using Snap.Hutao.UI.Windowing;
|
||||
using Snap.Hutao.UI.Windowing.Abstraction;
|
||||
@@ -154,7 +155,8 @@ internal sealed partial class WebView2Window : Microsoft.UI.Xaml.Window,
|
||||
{
|
||||
AdditionalBrowserArguments = "--do-not-de-elevate",
|
||||
};
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, null, options);
|
||||
string userDataFolder = HutaoRuntime.WebView2UserDataDirectory;
|
||||
CoreWebView2Environment environment = await CoreWebView2Environment.CreateWithOptionsAsync(null, userDataFolder, options);
|
||||
await WebView.EnsureCoreWebView2Async(environment);
|
||||
}
|
||||
catch (SEHException)
|
||||
|
||||
Reference in New Issue
Block a user