diff --git a/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs b/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs index 90c36f5e..f27c9416 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs @@ -1,7 +1,6 @@ // Copyright (c) DGP Studio. All rights reserved. // Licensed under the MIT license. -using Snap.Hutao.Core.Buffer; using Snap.Hutao.Core.Diagnostics; using System.Buffers; using System.IO; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs index b84fedf3..beb3f261 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs @@ -116,15 +116,15 @@ internal sealed partial class Activation : IActivation // If it's the first time launch, we show the guide window anyway. // Otherwise, we check if there's any unfulfilled resource category present. - if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin) + if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin) { if (StaticResource.IsAnyUnfulfilledCategoryPresent()) { - UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin); + UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin); } } - if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed) + if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed) { await taskContext.SwitchToMainThreadAsync(); serviceProvider.GetRequiredService(); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs index 9071073e..0e2e2b6d 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs @@ -20,7 +20,7 @@ internal static class SettingKeys #region Application public const string LaunchTimes = "LaunchTimes"; public const string DataFolderPath = "DataFolderPath"; - public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState"; + public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState1"; public const string StaticResourceImageQuality = "StaticResourceImageQuality"; public const string StaticResourceUseTrimmedArchive = "StaticResourceUseTrimmedArchive"; public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever"; diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index e7ec6e09..3c149bcf 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -1397,6 +1397,12 @@ 用户使用协议与法律声明 + + 基础设置 + + + 稍后可以在设置中修改 + 文档 @@ -1407,7 +1413,7 @@ 安装完成后重启胡桃以查看是否正常生效 - 如果上方的图标中存在乱码,请前往 + 如果上方的图标中存在乱码或方块字,请前往 下载并自行安装图标字体 @@ -1424,6 +1430,24 @@ 资源 + + 图像资源设置 + + + * 除非你卸载并重新安装胡桃,否则你将无法更改这些设置 + + + 图片资源包体 + + + 全部资源(节省 0% 磁盘空间占用) + + + 部分资源(节省 13.5% 磁盘空间占用) + + + 图片资源质量 + 深渊统计 @@ -1613,6 +1637,12 @@ 下载资源文件中,请稍候 + + 高质量(节省 72.8% 磁盘空间占用) + + + 原图(节省 0% 磁盘空间占用) + 请输入正确的邮箱 diff --git a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml index 2ef8d89f..09ab6d59 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml @@ -6,6 +6,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mxi="using:Microsoft.Xaml.Interactivity" + xmlns:shc="using:Snap.Hutao.Control" xmlns:shcb="using:Snap.Hutao.Control.Behavior" xmlns:shcm="using:Snap.Hutao.Control.Markup" xmlns:shvg="using:Snap.Hutao.ViewModel.Guide" @@ -49,7 +50,7 @@ - + + VerticalAlignment="Center" + Spacing="{ThemeResource SettingsCardSpacing}"> - + @@ -169,6 +174,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +