impl #1487

2025-11-19 21:02:53 +08:00 · 2024-03-16 18:31:05 +08:00
378 changed files with 4316 additions and 11310 deletions
--- a/.github/ISSUE_TEMPLATE/CHS-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/CHS-bug-report.yml
@@ -40,7 +40,7 @@ body:
    attributes:
      label: Snap Hutao 版本
      description: 在应用标题，应用程序的反馈中心界面中可以找到
-      placeholder: 例：1.9.9.0
+      placeholder: 例：1.4.15.0
    validations:
      required: true

@@ -62,19 +62,20 @@ body:
      description: 请设置一个你认为合适的分类，这将帮助我们快速定位问题
      options:
        - 安装和环境
-        - 游戏启动器
-        - 祈愿记录
        - 成就管理
-        - 我的角色
+        - 角色信息面板
+        - 游戏启动器
        - 实时便笺
        - 养成计算
-        - 深境螺旋/胡桃数据库
-        - Wiki
-        - 米游社账号面板
-        - 每日签到奖励
-        - 胡桃通行证/胡桃云
-        - 用户界面
        - 文件缓存
+        - 祈愿记录
+        - 玩家查询
+        - 胡桃数据库
+        - 用户界面
+        - 胡桃云
+        - 胡桃帐号
+        - 签到
+        - Wiki
        - 公告
        - 其它
    validations:
--- a/.github/ISSUE_TEMPLATE/ENG-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/ENG-bug-report.yml
@@ -40,7 +40,7 @@ body:
    attributes:
      label: Snap Hutao Version
      description: You can find the version in application's title bar
-      placeholder: e.g. 1.9.9.0
+      placeholder: e.g. 1.4.15.0
    validations:
      required: true

@@ -62,19 +62,20 @@ body:
      description: Please select the most associated category of your issue
      options:
        - Installation and Environment
-        - Game Launcher
-        - Wish Export
        - Achievement
        - My Character
+        - Game Launcher
        - Realtime Note
        - Develop Plan
-        - Spiral Abyss
-        - Wiki
-        - MiHoYo Account Panel
-        - Daily Checkin Reward
-        - Hutao Passport/Hutao Cloud
-        - User Interface
        - File Cache
+        - Wish Export
+        - Game Record
+        - Hutao Database
+        - User Interface
+        - Snap Hutao Cloud
+        - Snap Hutao Account
+        - Checkin
+        - Wiki
        - Announcement
        - Other
    validations:
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,15 +0,0 @@
-<!--- Hi, thanks for considering make a PR contribution to Snap Hutao, we appreciate your work. -->
-<!--- Before you create this PR, please fill the following form and checklist -->
-
-## Description
-
-<!--- Describe your changes -->
-
-## Related Issue
-
-<!--- If there's an associated issue, please use [GitHub Keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests) to link it -->
-<!-- e.g. fix #999, resolve #999, close #999 -->
-
-## Checklist
-
- [ ] The target PR branch is `develop` branch
--- a/README.md
+++ b/README.md
@@ -1,36 +1,42 @@
-![HutaoRepoBanner3-en](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/7289da68-59cf-409b-bd85-4b5a01d0c091)
+![HutaoRepoBanner2-20231222](https://github.com/DGP-Studio/Snap.Hutao/assets/10614984/2d178de1-95bc-44a1-a95e-20c5f11a8628)


-胡桃工具箱是一款以 MIT 协议开源的原神工具箱，专为现代化 Windows 平台设计，旨在改善桌面端玩家的游戏体验。通过将既有的官方资源与开发团队设计的全新功能相结合，提供了一套完整且实用的工具集，且无需依赖任何移动设备。它不对游戏客户端进行任何破坏性修改以确保工具箱的安全性
+胡桃工具箱是一款以 MIT 协议开源的原神工具箱，专为现代化 Windows 平台设计，旨在改善桌面端玩家的游戏体验。通过将既有的官方资源与开发团队设计的全新 功能相结合，它提供了一套完整且实用的工具集，且无需依赖任何移动设备。它不对游戏客户端进行任何破坏性修改以确保工具箱的安全性

 Snap Hutao is an open-source Genshin Impact toolkit under MIT license, designed for modern Windows platform to improve the gaming experience for desktop players. By combining existing official resources with new features designed by the development team, it provides a complete and useful set of tools without the need to rely on mobile devices. Snap Hutao does not take any destructive modification to the game client to ensure the security of the toolkit.

-## 安装 / Installation
+## 下载使用 / Download

 ![](https://ci.appveyor.com/api/projects/status/n4s40t9llru4si9y?svg=true) [![GitHub Release](https://img.shields.io/github/release/DGP-Studio/Snap.Hutao?style=flat)](https://github.com/DGP-Studio/Snap.Hutao/releases/latest) [![Github All Releases](https://img.shields.io/github/downloads/DGP-Studio/Snap.Hutao/total.svg?style=flat)]() 

 ---

-你可以按照[快速开始](https://hut.ao/zh/quick-start.html)文档中提供的流程安装并设置 Snap Hutao。
+#### 使用安装器安装 / Install with Snap.Hutao.Depolyment Installer

-You can follow the instructions in the [Quick Start](https://hut.ao/en/quick-start.html) document to install and set up Snap Hutao.
+Snap.Hutao.Depolyment 是一个由 DGP-Studio 重新包装的 Windows 应用安装器，适用于缺少专业计算机知识的一般用户，可以在安装时同时解决缺少必要系统环境的问题。

-## 本地化翻译 / Localization
+Snap.Hutao.Depolyment is a Windows application installer repackaged by DGP-Studio for the users who lacks computer knowledge and can solve the problem of missing necessary system environment at the same time as the installation.

-[![zh-TW translation](https://img.shields.io/badge/dynamic/json?color=blue&label=zh-TW&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27zh-TW%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![en translation](https://img.shields.io/badge/dynamic/json?color=blue&label=en&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27en%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![id translation](https://img.shields.io/badge/dynamic/json?color=blue&label=id&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27id%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ja translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ja&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ja%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ko translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ko&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ko%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![pt-PT translation](https://img.shields.io/badge/dynamic/json?color=blue&label=pt-PT&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27pt-PT%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao) [![ru translation](https://img.shields.io/badge/dynamic/json?color=blue&label=ru&style=flat&logo=crowdin&query=%24.progress[?(@.data.languageId==%27ru%27)].data.translationProgress&url=https%3A%2F%2Fbadges.awesome-crowdin.com%2Fstats-15670597-565845.json)](https://crowdin.com/project/snap-hutao)
+[从 GitHub 发布页获取 / Download from GitHub release](https://github.com/DGP-Studio/Snap.Hutao.Deployment/releases/latest) 

-Snap Hutao 使用 [Crowdin](https://translate.hut.ao/) 作为客户端文本翻译平台，在该平台上你可以为你熟悉的语言提交翻译文本。我们感谢每一个为 Snap Hutao 做出贡献的社区成员，并且欢迎更多的朋友能参与到这个项目中。
+[从极狐Lab 发布页获取 / Download from Jihu Gitlab release](https://jihulab.com/DGP-Studio/Snap.Hutao.Deployment/-/releases)

-Snap Hutao uses [Crowdin](https://translate.hut.ao/) as a client text translation platform where you can submit translated text for languages you are familiar with. We are grateful to every community member who has contributed to Snap Hutao and welcome more friends to participate in this project.
+#### 使用 MSIX 包安装 / Install with MSIX Package

-## 社区 / Community
+直接使用 Snap Hutao MSIX 安装包，使用 Windows 内置的 App Installer 即可安装。如在安装中出现问题，请查阅我们的[常见问题](https://hut.ao/zh/advanced/FAQ.html)文档

-[![Discord](https://img.shields.io/discord/952488447753465916?color=5865f2&label=%20Discord)](https://discord.gg/CcH5XtDtvR) [![QQ](https://img.shields.io/badge/QQ-EB1923?logo=tencent-qq&logoColor=white&label=567908135)](https://qm.qq.com/q/WJKykrY9W)
+Install with Snap Hutao MSIX package, can be installed with Windows built-in App Installer. If you faced any issue, please check our [FAQ](https://hut.ao/en/advanced/FAQ.html) document.
+
+[从 GitHub 发布页获取 / Download from GitHub release](https://github.com/DGP-Studio/Snap.Hutao/releases/latest) 
+
+[从极狐Lab 发布页获取 / Download from Jihu Gitlab release](https://jihulab.com/DGP-Studio/Snap.Hutao/-/releases)

 ## 贡献 / Contribute

-* [向我们提交 PR / Make Pull Requests](https://hut.ao/development/contribute.html)
+* [向我们提交 PR / Make Pull Requests](https://github.com/DGP-Studio/Snap.Hutao/pulls)
+* [在 Crowdin 上进行本地化 / Translate Project on Crowdin](https://translate.hut.ao/)
 * [为我们更新文档 / Enhance our Document](https://github.com/DGP-Studio/Snap.Hutao.Docs)
+* [帮助我们测试程序 / Test Binary Package](https://hut.ao/development/contribute.html)

 ## 特别感谢 / Special Thanks

--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@

 | Version | Supported          |
 | ------- | ------------------ |
-| >=1.9.0   | :white_check_mark: |
-| <1.9.0   | :x:                |
+| >=1.6.0   | :white_check_mark: |
+| <1.6.0   | :x:                |

 ## Reporting a Vulnerability

--- a/res/Banner3-large-cn.psd
+++ b/res/Banner3-large-cn.psd
--- a/res/Banner3-large.psd
+++ b/res/Banner3-large.psd
--- a/res/Store/chs/abyss.psd
+++ b/res/Store/chs/abyss.psd
--- a/res/Store/chs/achievement.psd
+++ b/res/Store/chs/achievement.psd
--- a/res/Store/chs/character-data.psd
+++ b/res/Store/chs/character-data.psd
--- a/res/Store/chs/lancher.psd
+++ b/res/Store/chs/lancher.psd
--- a/res/Store/chs/realtime-notes.psd
+++ b/res/Store/chs/realtime-notes.psd
--- a/res/Store/chs/wish.psd
+++ b/res/Store/chs/wish.psd
--- a/res/Store/en/abyss.psd
+++ b/res/Store/en/abyss.psd
--- a/res/Store/en/achievement.psd
+++ b/res/Store/en/achievement.psd
--- a/res/Store/en/character-data.psd
+++ b/res/Store/en/character-data.psd
--- a/res/Store/en/lancher.psd
+++ b/res/Store/en/lancher.psd
--- a/res/Store/en/realtime-notes.psd
+++ b/res/Store/en/realtime-notes.psd
--- a/res/Store/en/wish.psd
+++ b/res/Store/en/wish.psd
--- a/src/Snap.Hutao/.editorconfig
+++ b/src/Snap.Hutao/.editorconfig
@@ -110,6 +110,7 @@ dotnet_diagnostic.SA1642.severity = none

 dotnet_diagnostic.IDE0005.severity = warning
 dotnet_diagnostic.IDE0060.severity = none
+dotnet_diagnostic.IDE0290.severity = none

 # SA1208: System using directives should be placed before other using directives
 dotnet_diagnostic.SA1208.severity = none
@@ -320,8 +321,7 @@ dotnet_diagnostic.CA2227.severity = suggestion

 # CA2251: 使用 “string.Equals”
 dotnet_diagnostic.CA2251.severity = suggestion
-
-csharp_style_prefer_primary_constructors = false:none
+csharp_style_prefer_primary_constructors = true:suggestion

 [*.vb]
 #### 命名样式 ####
--- a/src/Snap.Hutao/Snap.Hutao.Test/PlatformExtensions/DependencyInjectionTest.cs
+++ b/src/Snap.Hutao/Snap.Hutao.Test/PlatformExtensions/DependencyInjectionTest.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using System;

 namespace Snap.Hutao.Test.PlatformExtensions;
@@ -12,7 +11,6 @@ public sealed class DependencyInjectionTest
        .AddSingleton<IService, ServiceB>()
        .AddScoped<IScopedService, ServiceA>()
        .AddTransient(typeof(IGenericService<>), typeof(GenericService<>))
-        .AddLogging(builder => builder.AddConsole())
        .BuildServiceProvider();

    [TestMethod]
@@ -43,13 +41,6 @@ public sealed class DependencyInjectionTest
        }
    }

-    [TestMethod]
-    public void LoggerWithInterfaceTypeCanBeResolved()
-    {
-        Assert.IsNotNull(services.GetService<ILogger<IScopedService>>());
-        Assert.IsNotNull(services.GetRequiredService<ILoggerFactory>().CreateLogger(nameof(IScopedService)));
-    }
-
    private interface IService
    {
        Guid Id { get; }
--- a/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj
+++ b/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj
@@ -12,11 +12,10 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml.cs
@@ -7,7 +7,6 @@ using Snap.Hutao.Core;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.LifeCycle.InterProcess;
-using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Core.Shell;
 using System.Diagnostics;

@@ -22,17 +21,17 @@ namespace Snap.Hutao;
 [SuppressMessage("", "SH001")]
 public sealed partial class App : Application
 {
-    private const string ConsoleBanner = $"""
+    private const string ConsoleBanner = """
        ----------------------------------------------------------------
-          _____                         _    _         _ 
-         / ____|                       | |  | |       | |
-        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___
-         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \
+          _____                         _    _         _                
+         / ____|                       | |  | |       | |               
+        | (___   _ __    __ _  _ __    | |__| | _   _ | |_  __ _   ___  
+         \___ \ | '_ \  / _` || '_ \   |  __  || | | || __|/ _` | / _ \ 
         ____) || | | || (_| || |_) |_ | |  | || |_| || |_| (_| || (_) |
-        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/
-                              | |
-                              |_|
-        
+        |_____/ |_| |_| \__,_|| .__/(_)|_|  |_| \__,_| \__|\__,_| \___/ 
+                              | |                                       
+                              |_| 
+                              
        Snap.Hutao is a open source software developed by DGP Studio.
        Copyright (C) 2022 - 2024 DGP Studio, All Rights Reserved.
        ----------------------------------------------------------------
@@ -70,7 +69,7 @@ public sealed partial class App : Application
                return;
            }

-            logger.LogColorizedInformation((ConsoleBanner, ConsoleColor.DarkYellow));
+            logger.LogInformation(ConsoleBanner);
            LogDiagnosticInformation();

            // manually invoke
@@ -90,8 +89,8 @@ public sealed partial class App : Application
    {
        RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();

-        logger.LogColorizedInformation(("FamilyName: {Name}", ConsoleColor.Blue), (runtimeOptions.FamilyName, ConsoleColor.Cyan));
-        logger.LogColorizedInformation(("Version: {Version}", ConsoleColor.Blue), (runtimeOptions.Version, ConsoleColor.Cyan));
-        logger.LogColorizedInformation(("LocalCache: {Path}", ConsoleColor.Blue), (runtimeOptions.LocalCache, ConsoleColor.Cyan));
+        logger.LogInformation("FamilyName: {name}", runtimeOptions.FamilyName);
+        logger.LogInformation("Version: {version}", runtimeOptions.Version);
+        logger.LogInformation("LocalCache: {folder}", runtimeOptions.LocalCache);
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/AutoSuggestTokenBox.cs
@@ -7,7 +7,6 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Snap.Hutao.Control.Extension;
-using System.Collections;

 namespace Snap.Hutao.Control.AutoSuggestBox;

@@ -22,8 +21,8 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
        TextChanged += OnFilterSuggestionRequested;
        QuerySubmitted += OnQuerySubmitted;
        TokenItemAdding += OnTokenItemAdding;
-        TokenItemAdded += OnTokenItemCollectionChanged;
-        TokenItemRemoved += OnTokenItemCollectionChanged;
+        TokenItemAdded += OnTokenItemModified;
+        TokenItemRemoved += OnTokenItemModified;
        Loaded += OnLoaded;
    }

@@ -31,15 +30,34 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
    {
        if (this.FindDescendant("SuggestionsPopup") is Popup { Child: Border { Child: ListView listView } border })
        {
-            IAppResourceProvider appResourceProvider = this.ServiceProvider().GetRequiredService<IAppResourceProvider>();
-
+            IAppResourceProvider appResourceProvider = Ioc.Default.GetRequiredService<IAppResourceProvider>();
            listView.Background = null;
            listView.Margin = appResourceProvider.GetResource<Thickness>("AutoSuggestListPadding");

            border.Background = appResourceProvider.GetResource<Microsoft.UI.Xaml.Media.Brush>("AutoSuggestBoxSuggestionsListBackground");
-            CornerRadius overlayCornerRadius = appResourceProvider.GetResource<CornerRadius>("OverlayCornerRadius");
-            CornerRadiusFilterConverter cornerRadiusFilterConverter = new() { Filter = CornerRadiusFilterKind.Bottom };
-            border.CornerRadius = (CornerRadius)cornerRadiusFilterConverter.Convert(overlayCornerRadius, typeof(CornerRadius), default, default);
+            border.CornerRadius = new(0, 0, 8, 8);
+        }
+
+        if (this.FindDescendant("PART_AutoSuggestBox") is Microsoft.UI.Xaml.Controls.AutoSuggestBox autoSuggestBox)
+        {
+            autoSuggestBox.GotFocus += OnSuggestBoxFocusGot;
+            autoSuggestBox.LosingFocus += OnSuggestBoxFocusLosing;
+        }
+    }
+
+    private void OnSuggestBoxFocusGot(object sender, RoutedEventArgs e)
+    {
+        if (sender is Microsoft.UI.Xaml.Controls.AutoSuggestBox autoSuggestBox)
+        {
+            autoSuggestBox.ItemsSource = AvailableTokens.Values;
+        }
+    }
+
+    private void OnSuggestBoxFocusLosing(object sender, RoutedEventArgs e)
+    {
+        if (sender is Microsoft.UI.Xaml.Controls.AutoSuggestBox autoSuggestBox)
+        {
+            autoSuggestBox.ItemsSource = null;
        }
    }

@@ -47,19 +65,12 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
    {
        if (string.IsNullOrWhiteSpace(Text))
        {
-            sender.ItemsSource = AvailableTokens
-                .OrderBy(kvp => kvp.Value.Kind)
-                .Select(kvp => kvp.Value);
+            return;
        }

        if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
        {
-            sender.ItemsSource = AvailableTokens
-                .Where(kvp => kvp.Value.Value.Contains(Text, StringComparison.OrdinalIgnoreCase))
-                .OrderBy(kvp => kvp.Value.Kind)
-                .ThenBy(kvp => kvp.Value.Order)
-                .Select(kvp => kvp.Value)
-                .DefaultIfEmpty(SearchToken.NotFound);
+            sender.ItemsSource = AvailableTokens.Values.Where(q => q.Value.Contains(Text, StringComparison.OrdinalIgnoreCase));
        }
    }

@@ -80,23 +91,11 @@ internal sealed partial class AutoSuggestTokenBox : TokenizingTextBox
            return;
        }

-        if (AvailableTokens.GetValueOrDefault(args.TokenText) is { } token)
-        {
-            args.Item = token;
-        }
-        else
-        {
-            args.Cancel = true;
-        }
+        args.Item = AvailableTokens.GetValueOrDefault(args.TokenText) ?? new SearchToken(SearchTokenKind.None, args.TokenText);
    }

-    private void OnTokenItemCollectionChanged(TokenizingTextBox sender, object args)
+    private void OnTokenItemModified(TokenizingTextBox sender, object args)
    {
-        if (args is SearchToken { Kind: SearchTokenKind.None } token)
-        {
-            ((IList)sender.ItemsSource).Remove(token);
-        }
-
-        FilterCommand.TryExecute(FilterCommandParameter);
+        CommandInvocation.TryExecute(FilterCommand, FilterCommandParameter);
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchToken.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchToken.cs
@@ -7,16 +7,13 @@ namespace Snap.Hutao.Control.AutoSuggestBox;

 internal sealed class SearchToken
 {
-    public static readonly SearchToken NotFound = new(SearchTokenKind.None, SH.ControlAutoSuggestBoxNotFoundValue, 0);
-
-    public SearchToken(SearchTokenKind kind, string value, int order, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
+    public SearchToken(SearchTokenKind kind, string value, Uri? iconUri = null, Uri? sideIconUri = null, Color? quality = null)
    {
        Value = value;
        Kind = kind;
        IconUri = iconUri;
        SideIconUri = sideIconUri;
        Quality = quality;
-        Order = order;
    }

    public SearchTokenKind Kind { get; }
@@ -29,8 +26,6 @@ internal sealed class SearchToken

    public Color? Quality { get; }

-    public int Order { get; }
-
    public override string ToString()
    {
        return Value;
--- a/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchTokenKind.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/AutoSuggestBox/SearchTokenKind.cs
@@ -6,12 +6,12 @@ namespace Snap.Hutao.Control.AutoSuggestBox;
 internal enum SearchTokenKind
 {
    None,
-    ItemQuality,
-    WeaponType,
-    FightProperty,
-    ElementName,
    AssociationType,
-    BodyType,
    Avatar,
+    BodyType,
+    ElementName,
+    FightProperty,
+    ItemQuality,
    Weapon,
+    WeaponType,
 }
--- a/src/Snap.Hutao/Snap.Hutao/Control/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Behavior/PeriodicInvokeCommandOrOnActualThemeChangedBehavior.cs
@@ -33,7 +33,6 @@ internal sealed partial class PeriodicInvokeCommandOrOnActualThemeChangedBehavio

    protected override bool Uninitialize()
    {
-        periodicTimerCancellationTokenSource.Cancel();
        AssociatedObject.ActualThemeChanged -= OnActualThemeChanged;
        return true;
    }
--- a/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/BindingProxy.cs
@@ -13,4 +13,6 @@ namespace Snap.Hutao.Control;
 /// </summary>
 [HighQuality]
 [DependencyProperty("DataContext", typeof(object))]
-internal sealed partial class BindingProxy : DependencyObject;
+internal sealed partial class BindingProxy : DependencyObject
+{
+}
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilder.cs
@@ -1,10 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal class ButtonBaseBuilder<TButton> : IButtonBaseBuilder<TButton>
-    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase, new()
-{
-    public TButton Button { get; } = new();
-}
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBaseBuilderExtension.cs
@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal static class ButtonBaseBuilderExtension
-{
-    public static TBuilder SetContent<TBuilder, TButton>(this TBuilder builder, object? content)
-        where TBuilder : IButtonBaseBuilder<TButton>
-        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-    {
-        builder.Configure(builder => builder.Button.Content = content);
-        return builder;
-    }
-
-    public static TBuilder SetCommand<TBuilder, TButton>(this TBuilder builder, ICommand command)
-        where TBuilder : IButtonBaseBuilder<TButton>
-        where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-    {
-        builder.Configure(builder => builder.Button.Command = command);
-        return builder;
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilder.cs
@@ -1,8 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal sealed class ButtonBuilder : ButtonBaseBuilder<Button>;
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/ButtonBuilderExtension.cs
@@ -1,19 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal static class ButtonBuilderExtension
-{
-    public static ButtonBuilder SetContent(this ButtonBuilder builder, object? content)
-    {
-        return builder.SetContent<ButtonBuilder, Button>(content);
-    }
-
-    public static ButtonBuilder SetCommand(this ButtonBuilder builder, ICommand command)
-    {
-        return builder.SetCommand<ButtonBuilder, Button>(command);
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Builder/ButtonBase/IButtonBaseBuilder.cs
@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-
-namespace Snap.Hutao.Control.Builder.ButtonBase;
-
-internal interface IButtonBaseBuilder<TButton> : IBuilder
-    where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
-{
-    TButton Button { get; }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Collection/AdvancedCollectionView/AdvancedCollectionView.cs
@@ -30,7 +30,7 @@ internal sealed class AdvancedCollectionView<T> : IAdvancedCollectionView<T>, IN
    private WeakEventListener<AdvancedCollectionView<T>, object?, NotifyCollectionChangedEventArgs>? sourceWeakEventListener;

    public AdvancedCollectionView()
-        : this([])
+        : this(new List<T>(0))
    {
    }

--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/AlternatingItemsControl.cs
@@ -6,7 +6,6 @@ using Windows.Foundation.Collections;

 namespace Snap.Hutao.Control.Collection.Alternating;

-[Obsolete("Use SettingsCard instead")]
 [DependencyProperty("ItemAlternateBackground", typeof(Microsoft.UI.Xaml.Media.Brush))]
 internal sealed partial class AlternatingItemsControl : ItemsControl
 {
--- a/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Collection/Alternating/IAlternatingItem.cs
@@ -3,7 +3,6 @@

 namespace Snap.Hutao.Control.Collection.Alternating;

-[Obsolete("Use SettingsCard instead")]
 internal interface IAlternatingItem
 {
    public Microsoft.UI.Xaml.Media.Brush? Background { get; set; }
--- a/src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Extension/FrameworkElementExtension.cs
@@ -28,21 +28,4 @@ internal static class FrameworkElementExtension
        frameworkElement.IsRightTapEnabled = false;
        frameworkElement.IsTabStop = false;
    }
-
-    public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
-        where TDataContext : class
-    {
-        IServiceProvider service = serviceProvider ?? Ioc.Default;
-        try
-        {
-            frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
-        }
-        catch (Exception ex)
-        {
-
-            ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
-            logger?.LogError(ex, "Failed to initialize DataContext");
-            throw;
-        }
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CachedImage.cs
@@ -21,9 +21,6 @@ internal sealed class CachedImage : Implementation.ImageEx
    /// </summary>
    public CachedImage()
    {
-        DefaultStyleKey = typeof(CachedImage);
-        DefaultStyleResourceUri = "ms-appx:///Control/Image/CachedImage.xaml".ToUri();
-
        IsCacheEnabled = true;
        EnableLazyLoading = false;
    }
@@ -35,7 +32,7 @@ internal sealed class CachedImage : Implementation.ImageEx

        try
        {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
            string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
            token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
            return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.
--- a/src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Windows.Foundation;

--- a/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Loading.cs
@@ -17,7 +17,7 @@ internal class Loading : Microsoft.UI.Xaml.Controls.ContentControl
    public Loading()
    {
        DefaultStyleKey = typeof(Loading);
-        DefaultStyleResourceUri = "ms-appx:///Control/Loading.xaml".ToUri();
+        DefaultStyleResourceUri = new("ms-appx:///Control/Loading.xaml");
    }

    public bool IsLoading
--- a/src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.

 using Microsoft.UI.Xaml;
-using System.Runtime.InteropServices;
 using Windows.Foundation;

 namespace Snap.Hutao.Control.Panel;
@@ -19,14 +18,13 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel

    protected override Size MeasureOverride(Size availableSize)
    {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
        {
            // ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
            double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
-            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
            double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
        }

        return base.MeasureOverride(availableSize);
@@ -34,14 +32,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel

    protected override Size ArrangeOverride(Size finalSize)
    {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
+        int itemCount = Children.Count;
+        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
        double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);

        double offset = 0;
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
        {
-            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
            offset += actualItemWidth + Spacing;
        }

@@ -51,8 +49,7 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
    private static void OnLoaded(object sender, RoutedEventArgs e)
    {
        HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
-        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
+        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
    }

    private static void OnSizeChanged(object sender, SizeChangedEventArgs e)
--- a/src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs
@@ -1,53 +1,21 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

-using Microsoft.UI.Xaml;
-using Windows.Foundation;
+using CommunityToolkit.WinUI.Controls;

 namespace Snap.Hutao.Control.Panel;

 [DependencyProperty("MinItemWidth", typeof(double))]
-[DependencyProperty("ColumnSpacing", typeof(double))]
-[DependencyProperty("RowSpacing", typeof(double))]
-internal sealed partial class UniformPanel : Microsoft.UI.Xaml.Controls.Panel
+internal sealed partial class UniformPanel : UniformGrid
 {
-    private int columns;
-
-    protected override Size MeasureOverride(Size availableSize)
+    public UniformPanel()
    {
-        columns = (int)((availableSize.Width + ColumnSpacing) / (MinItemWidth + ColumnSpacing));
-        double availableItemWidth = ((availableSize.Width + ColumnSpacing) / columns) - ColumnSpacing;
-
-        double maxDesiredHeight = 0;
-        foreach (UIElement child in Children)
-        {
-            child.Measure(new Size(availableItemWidth, availableSize.Height));
-            maxDesiredHeight = Math.Max(maxDesiredHeight, child.DesiredSize.Height);
-        }
-
-        int desiredRows = (int)Math.Ceiling(Children.Count / (double)columns);
-        double desiredHeight = ((maxDesiredHeight + RowSpacing) * desiredRows) - RowSpacing;
-
-        return new Size(availableSize.Width, desiredHeight);
+        Columns = 1;
+        SizeChanged += OnSizeChanged;
    }

-    protected override Size ArrangeOverride(Size finalSize)
+    private void OnSizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
    {
-        double itemWidth = ((finalSize.Width + ColumnSpacing) / columns) - ColumnSpacing;
-
-        for (int index = 0; index < Children.Count; index++)
-        {
-            UIElement child = Children[index];
-
-            int row = index / columns;
-            int column = index % columns;
-
-            double x = column * (itemWidth + ColumnSpacing);
-            double y = row * (child.DesiredSize.Height + RowSpacing);
-
-            child.Arrange(new Rect(x, y, itemWidth, child.DesiredSize.Height));
-        }
-
-        return finalSize;
+        Columns = (int)((e.NewSize.Width + ColumnSpacing) / (MinItemWidth + ColumnSpacing));
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs
@@ -15,7 +15,7 @@ internal class ScopedPage : Page
 {
    private readonly RoutedEventHandler unloadEventHandler;
    private readonly CancellationTokenSource viewCancellationTokenSource = new();
-    private readonly IServiceScope pageScope;
+    private readonly IServiceScope currentScope;

    private bool inFrame = true;

@@ -23,7 +23,7 @@ internal class ScopedPage : Page
    {
        unloadEventHandler = OnUnloaded;
        Unloaded += unloadEventHandler;
-        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
    }

    public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -44,17 +44,9 @@ internal class ScopedPage : Page
    protected void InitializeWith<TViewModel>()
        where TViewModel : class, IViewModel
    {
-        try
-        {
-            IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
-            viewModel.CancellationToken = viewCancellationTokenSource.Token;
-            DataContext = viewModel;
-        }
-        catch (Exception ex)
-        {
-            pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
-            throw;
-        }
+        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
+        viewModel.CancellationToken = viewCancellationTokenSource.Token;
+        DataContext = viewModel;
    }

    /// <inheritdoc/>
@@ -103,8 +95,7 @@ internal class ScopedPage : Page
                viewModel.IsViewDisposed = true;

                // Dispose the scope
-                pageScope.Dispose();
-                GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
+                currentScope.Dispose();
            }
        }
    }
--- a/src/Snap.Hutao/Snap.Hutao/Control/ScopedPageScopeReferenceTracker.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/ScopedPageScopeReferenceTracker.cs
@@ -22,6 +22,7 @@ internal sealed partial class ScopedPageScopeReferenceTracker : IScopedPageScope

    public IServiceScope CreateScope()
    {
+        GC.Collect(GC.MaxGeneration, GCCollectionMode.Aggressive, true);
        IServiceScope currentScope = serviceProvider.CreateScope();

        // In case previous one is not disposed.
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
@@ -45,7 +45,15 @@ internal sealed partial class DescriptionTextBlock : ContentControl
    private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
    {
        TextBlock textBlock = (TextBlock)((DescriptionTextBlock)d).Content;
-        UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
+
+        try
+        {
+            UpdateDescription(textBlock, MiHoYoSyntaxTree.Parse(SpecialNameHandler.Handle((string)e.NewValue)));
+        }
+        catch (Exception ex)
+        {
+            _ = ex;
+        }
    }

    private static void OnTextStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/HtmlDescriptionTextBlock.cs
@@ -14,7 +14,6 @@ using Windows.UI;

 namespace Snap.Hutao.Control.Text;

-// TODO: change the parsing to syntax tree
 [DependencyProperty("Description", typeof(string), "", nameof(OnDescriptionChanged))]
 [DependencyProperty("TextStyle", typeof(Style), default(Style), nameof(OnTextStyleChanged))]
 internal sealed partial class HtmlDescriptionTextBlock : ContentControl
--- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml
@@ -30,7 +30,6 @@
    <x:String x:Key="UI_EmotionIcon25">https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon25.png</x:String>
    <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>
--- a/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Abstraction/ICloneable.cs
@@ -0,0 +1,18 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Abstraction;
+
+/// <summary>
+/// 可克隆
+/// </summary>
+/// <typeparam name="TSelf">自身类型</typeparam>
+[HighQuality]
+internal interface ICloneable<out TSelf>
+{
+    /// <summary>
+    /// 克隆
+    /// </summary>
+    /// <returns>新的克隆</returns>
+    TSelf Clone();
+}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs
@@ -1,19 +1,15 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

-using Microsoft.Extensions.Caching.Memory;
 using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.IO;
-using Snap.Hutao.Core.IO.Hashing;
-using Snap.Hutao.Core.Logging;
-using Snap.Hutao.ViewModel.Guide;
-using Snap.Hutao.Web.Request.Builder;
-using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.IO;
 using System.Net;
 using System.Net.Http;
+using System.Security.Cryptography;
+using System.Text;

 namespace Snap.Hutao.Core.Caching;

@@ -29,7 +25,6 @@ namespace Snap.Hutao.Core.Caching;
 internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOperation
 {
    private const string CacheFolderName = nameof(ImageCache);
-    private const string CacheFailedDownloadTasksName = $"{nameof(ImageCache)}.FailedDownloadTasks";

    private readonly FrozenDictionary<int, TimeSpan> retryCountToDelay = FrozenDictionary.ToFrozenDictionary(
    [
@@ -40,11 +35,9 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera

    private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();

-    private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
    private readonly IHttpClientFactory httpClientFactory;
    private readonly IServiceProvider serviceProvider;
    private readonly ILogger<ImageCache> logger;
-    private readonly IMemoryCache memoryCache;

    private string? baseFolder;
    private string? cacheFolder;
@@ -111,12 +104,12 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
        {
            if (concurrentTasks.TryAdd(fileName, taskCompletionSource.Task))
            {
-                logger.LogColorizedInformation("Begin to download file from '{Uri}' to '{File}'", (uri, ConsoleColor.Cyan), (filePath, ConsoleColor.Cyan));
+                logger.LogDebug("Begin downloading image file from '{Uri}' to '{File}'", uri, filePath);
                await DownloadFileAsync(uri, filePath).ConfigureAwait(false);
            }
            else if (concurrentTasks.TryGetValue(fileName, out Task? task))
            {
-                logger.LogDebug("Waiting for a queued image download task to complete for '{Uri}'", (uri, ConsoleColor.Cyan));
+                logger.LogDebug("Waiting for a queued image download task to complete for '{Uri}'", uri);
                await task.ConfigureAwait(false);
            }

@@ -139,7 +132,10 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera

    private static string GetCacheFileName(Uri uri)
    {
-        return Hash.SHA1HexString(uri.ToString());
+        string url = uri.ToString();
+        byte[] chars = Encoding.UTF8.GetBytes(url);
+        byte[] hash = SHA1.HashData(chars);
+        return System.Convert.ToHexString(hash);
    }

    private static bool IsFileInvalid(string file, bool treatNullFileAsInvalid = true)
@@ -176,76 +172,40 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
        HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
        while (retryCount < 3)
        {
-            HttpRequestMessageBuilder requestMessageBuilder = httpRequestMessageBuilderFactory
-                .Create()
-                .SetRequestUri(uri)
-
-                // These headers are only available for our own api
-                .SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
-                .Get();
-
-            using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
+            using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
            {
-                using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
                {
-                    if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
-                    {
-                        logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
-                    }
+                    logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
+                }

-                    if (responseMessage.IsSuccessStatusCode)
+                if (message.IsSuccessStatusCode)
+                {
+                    using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
                    {
-                        if (responseMessage.Content.Headers.ContentType?.MediaType is "application/json")
+                        using (FileStream fileStream = File.Create(baseFile))
                        {
-#if DEBUG
-                            DebugTrack(uri);
-#endif
-                            string raw = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            logger.LogColorizedCritical("Failed to download '{Uri}' with unexpected body '{Raw}'", (uri, ConsoleColor.Red), (raw, ConsoleColor.DarkYellow));
+                            await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
                            return;
                        }
+                    }
+                }

-                        using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                switch (message.StatusCode)
+                {
+                    case HttpStatusCode.TooManyRequests:
                        {
-                            using (FileStream fileStream = File.Create(baseFile))
-                            {
-                                await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
-                                return;
-                            }
+                            retryCount++;
+                            TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
+                            logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
+                            await Task.Delay(delay).ConfigureAwait(false);
+                            break;
                        }
-                    }

-                    switch (responseMessage.StatusCode)
-                    {
-                        case HttpStatusCode.TooManyRequests:
-                            {
-                                retryCount++;
-                                TimeSpan delay = responseMessage.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
-                                logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
-                                await Task.Delay(delay).ConfigureAwait(false);
-                                break;
-                            }
-
-                        default:
-#if DEBUG
-                            DebugTrack(uri);
-#endif
-                            logger.LogColorizedCritical("Failed to download '{Uri}' with status code '{StatusCode}'", (uri, ConsoleColor.Red), (responseMessage.StatusCode, ConsoleColor.DarkYellow));
-                            return;
-                    }
+                    default:
+                        return;
                }
            }
        }
    }
-}
-
-#if DEBUG
-internal partial class ImageCache
-{
-    private void DebugTrack(Uri uri)
-    {
-        HashSet<string>? set = memoryCache.GetOrCreate(CacheFailedDownloadTasksName, entry => entry.Value ??= new HashSet<string>()) as HashSet<string>;
-        set?.Add(uri.ToString());
-    }
-}
-#endif
+}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Collection/TwoEnumerbleEnumerator.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Collection/TwoEnumerbleEnumerator.cs
@@ -1,32 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Collection;
-
-internal sealed class TwoEnumerbleEnumerator<TFirst, TSecond> : IDisposable
-{
-    private readonly IEnumerator<TFirst> firstEnumerator;
-    private readonly IEnumerator<TSecond> secondEnumerator;
-
-    public TwoEnumerbleEnumerator(IEnumerable<TFirst> firstEnumerable, IEnumerable<TSecond> secondEnumerable)
-    {
-        firstEnumerator = firstEnumerable.GetEnumerator();
-        secondEnumerator = secondEnumerable.GetEnumerator();
-    }
-
-    public (TFirst First, TSecond Second) Current { get => (firstEnumerator.Current, secondEnumerator.Current); }
-
-    public bool MoveNext(ref bool moveFirst, ref bool moveSecond)
-    {
-        moveFirst = moveFirst && firstEnumerator.MoveNext();
-        moveSecond = moveSecond && secondEnumerator.MoveNext();
-
-        return moveFirst || moveSecond;
-    }
-
-    public void Dispose()
-    {
-        firstEnumerator.Dispose();
-        secondEnumerator.Dispose();
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Database/DbSetExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Database/DbSetExtension.cs
@@ -13,6 +13,13 @@ namespace Snap.Hutao.Core.Database;
 [HighQuality]
 internal static class DbSetExtension
 {
+    /// <summary>
+    /// 添加并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
    public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
@@ -20,13 +27,27 @@ internal static class DbSetExtension
        return dbSet.SaveChangesAndClearChangeTracker();
    }

-    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步添加并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
        dbSet.Add(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
    }

+    /// <summary>
+    /// 添加列表并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entities">实体</param>
+    /// <returns>影响条数</returns>
    public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
        where TEntity : class
    {
@@ -34,13 +55,27 @@ internal static class DbSetExtension
        return dbSet.SaveChangesAndClearChangeTracker();
    }

-    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
+    /// <summary>
+    /// 异步添加列表并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entities">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
        where TEntity : class
    {
        dbSet.AddRange(entities);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
    }

+    /// <summary>
+    /// 移除并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
    public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
@@ -48,13 +83,27 @@ internal static class DbSetExtension
        return dbSet.SaveChangesAndClearChangeTracker();
    }

-    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步移除并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
        dbSet.Remove(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
    }

+    /// <summary>
+    /// 更新并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
    public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
@@ -62,11 +111,18 @@ internal static class DbSetExtension
        return dbSet.SaveChangesAndClearChangeTracker();
    }

-    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步更新并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
        where TEntity : class
    {
        dbSet.Update(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
    }

    [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -80,11 +136,11 @@ internal static class DbSetExtension
    }

    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
+    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
        where TEntity : class
    {
        DbContext dbContext = dbSet.Context();
-        int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
+        int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
        dbContext.ChangeTracker.Clear();
        return count;
    }
--- a/src/Snap.Hutao/Snap.Hutao/Core/Database/ScopedDbCurrent.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Database/ScopedDbCurrent.cs
@@ -38,7 +38,7 @@ internal sealed partial class ScopedDbCurrent<TEntity, TMessage>
                return;
            }

-            if (serviceProvider.IsDisposed())
+            if (serviceProvider.IsDisposedSlow())
            {
                return;
            }
@@ -96,7 +96,7 @@ internal sealed partial class ScopedDbCurrent<TEntityOnly, TEntity, TMessage>
                return;
            }

-            if (serviceProvider.IsDisposed())
+            if (serviceProvider.IsDisposedSlow())
            {
                return;
            }
--- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/DependencyInjection.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/DependencyInjection.cs
@@ -24,13 +24,7 @@ internal static class DependencyInjection
        ServiceProvider serviceProvider = new ServiceCollection()

            // Microsoft extension
-            .AddLogging(builder =>
-            {
-                builder
-                    .SetMinimumLevel(LogLevel.Trace)
-                    .AddDebug()
-                    .AddConsoleWindow();
-            })
+            .AddLogging(builder => builder.AddDebug().AddConsoleWindow())
            .AddMemoryCache()

            // Hutao extensions
--- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs
@@ -33,17 +33,17 @@ internal static class IocConfiguration
        return services
            .AddTransient(typeof(Database.ScopedDbCurrent<,>))
            .AddTransient(typeof(Database.ScopedDbCurrent<,,>))
-            .AddDbContextPool<AppDbContext>(AddDbContextCore);
+            .AddDbContext<AppDbContext>(AddDbContextCore);
    }

-    private static void AddDbContextCore(IServiceProvider serviceProvider, DbContextOptionsBuilder builder)
+    private static void AddDbContextCore(IServiceProvider provider, DbContextOptionsBuilder builder)
    {
-        RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
+        RuntimeOptions runtimeOptions = provider.GetRequiredService<RuntimeOptions>();
        string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
        string sqlConnectionString = $"Data Source={dbFile}";

        // Temporarily create a context
-        using (AppDbContext context = AppDbContext.Create(serviceProvider, sqlConnectionString))
+        using (AppDbContext context = AppDbContext.Create(sqlConnectionString))
        {
            if (context.Database.GetPendingMigrations().Any())
            {
--- a/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/ServiceProviderExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/ServiceProviderExtension.cs
@@ -18,22 +18,13 @@ internal static class ServiceProviderExtension
    }

    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static bool IsDisposed(this IServiceProvider? serviceProvider)
+    public static bool IsDisposedSlow(this IServiceProvider? serviceProvider)
    {
        if (serviceProvider is null)
        {
            return true;
        }

-        if (serviceProvider is ServiceProvider serviceProviderImpl)
-        {
-            return GetPrivateDisposed(serviceProviderImpl);
-        }
-
        return serviceProvider.GetType().GetField("_disposed")?.GetValue(serviceProvider) is true;
    }
-
-    // private bool _disposed;
-    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
-    private static extern ref bool GetPrivateDisposed(ServiceProvider serviceProvider);
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/Diagnostics/MeasureExecutionToken.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Diagnostics/MeasureExecutionToken.cs
@@ -1,7 +1,5 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
-using Snap.Hutao.Core.Logging;
-
 namespace Snap.Hutao.Core.Diagnostics;

 internal readonly struct MeasureExecutionToken : IDisposable
@@ -19,6 +17,6 @@ internal readonly struct MeasureExecutionToken : IDisposable

    public void Dispose()
    {
-        logger.LogColorizedDebug(("{Caller} toke {Time} ms", ConsoleColor.Gray), (callerName, ConsoleColor.Yellow), (stopwatch.GetElapsedTime().TotalMilliseconds, ConsoleColor.DarkGreen));
+        logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs
@@ -5,61 +5,50 @@ namespace Snap.Hutao.Core.ExceptionService;

 internal sealed class HutaoException : Exception
 {
-    public HutaoException(string message, Exception? innerException)
+    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
+        : this(message, innerException)
+    {
+        Kind = kind;
+    }
+
+    private HutaoException(string message, Exception? innerException)
        : base($"{message}\n{innerException?.Message}", innerException)
    {
    }

+    public HutaoExceptionKind Kind { get; private set; }
+
    [DoesNotReturn]
-    public static HutaoException Throw(string message, Exception? innerException = default)
+    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
    {
-        throw new HutaoException(message, innerException);
+        throw new HutaoException(kind, message, innerException);
    }

-    public static void ThrowIf([DoesNotReturnIf(true)] bool condition, string message, Exception? innerException = default)
+    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
    {
        if (condition)
        {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
        }
    }

-    public static void ThrowIfNot([DoesNotReturnIf(false)] bool condition, string message, Exception? innerException = default)
+    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
    {
        if (!condition)
        {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
        }
    }

-    [DoesNotReturn]
-    public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
-    {
-        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
-    }
-
-    [DoesNotReturn]
-    public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
-    {
-        throw new HutaoException(message, innerException);
-    }
-
-    [DoesNotReturn]
-    public static InvalidCastException InvalidCast<TFrom, TTo>(string name, Exception? innerException = default)
+    public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
    {
        string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
-        throw new InvalidCastException(message, innerException);
+        throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
    }

-    [DoesNotReturn]
-    public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
+    public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
    {
-        throw new NotSupportedException(message, innerException);
-    }
-
-    [DoesNotReturn]
-    public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
-    {
-        throw new OperationCanceledException(message, innerException);
+        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
+        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoExceptionKind.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoExceptionKind.cs
@@ -0,0 +1,21 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.ExceptionService;
+
+internal enum HutaoExceptionKind
+{
+    None,
+
+    // Foundation
+    ServiceTypeCastFailed,
+    ImageCacheInvalidUri,
+
+    // IO
+    FileSystemCreateFileInsufficientPermissions,
+    PrivateNamedPipeContentHashIncorrect,
+
+    // Service
+    GachaStatisticsInvalidItemId,
+    GameFpsUnlockingFailed,
+}
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/FileOperation.cs
@@ -1,13 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

-using Snap.Hutao.Win32.Foundation;
-using Snap.Hutao.Win32.System.Com;
-using Snap.Hutao.Win32.UI.Shell;
 using System.IO;
-using static Snap.Hutao.Win32.Macros;
-using static Snap.Hutao.Win32.Ole32;
-using static Snap.Hutao.Win32.Shell32;

 namespace Snap.Hutao.Core.IO;

@@ -45,57 +39,4 @@ internal static class FileOperation
        File.Move(sourceFileName, destFileName, false);
        return true;
    }
-
-    public static unsafe bool UnsafeMove(string sourceFileName, string destFileName)
-    {
-        bool result = false;
-
-        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
-        {
-            if (SUCCEEDED(SHCreateItemFromParsingName(sourceFileName, default, in IShellItem.IID, out IShellItem* pSourceShellItem)))
-            {
-                if (SUCCEEDED(SHCreateItemFromParsingName(destFileName, default, in IShellItem.IID, out IShellItem* pDestShellItem)))
-                {
-                    pFileOperation->MoveItem(pSourceShellItem, pDestShellItem, default, default);
-
-                    if (SUCCEEDED(pFileOperation->PerformOperations()))
-                    {
-                        result = true;
-                    }
-
-                    pDestShellItem->Release();
-                }
-
-                pSourceShellItem->Release();
-            }
-
-            pFileOperation->Release();
-        }
-
-        return result;
-    }
-
-    public static unsafe bool UnsafeDelete(string path)
-    {
-        bool result = false;
-
-        if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
-        {
-            if (SUCCEEDED(SHCreateItemFromParsingName(path, default, in IShellItem.IID, out IShellItem* pShellItem)))
-            {
-                pFileOperation->DeleteItem(pShellItem, default);
-
-                if (SUCCEEDED(pFileOperation->PerformOperations()))
-                {
-                    result = true;
-                }
-
-                pShellItem->Release();
-            }
-
-            pFileOperation->Release();
-        }
-
-        return result;
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/Hash.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Hashing/Hash.cs
@@ -1,20 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Snap.Hutao.Core.IO.Hashing;
-
-internal static class Hash
-{
-    public static string SHA1HexString(string input)
-    {
-        return HashCore(System.Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
-    }
-
-    private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
-    {
-        return resultConverter(hashMethod(bytesConverter(input)));
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Sharding/HttpShardCopyWorker.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Sharding/HttpShardCopyWorker.cs
@@ -3,7 +3,6 @@

 using Microsoft.Win32.SafeHandles;
 using Snap.Hutao.Core.Diagnostics;
-using System.Buffers;
 using System.IO;
 using System.Net.Http;

@@ -78,36 +77,34 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
                {
                    response.EnsureSuccessStatusCode();
-                    using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent())
+
+                    Memory<byte> buffer = new byte[bufferSize];
+                    using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
                    {
-                        Memory<byte> buffer = memoryOwner.Memory;
-                        using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
+                        int totalBytesRead = 0;
+                        int bytesReadAfterPreviousReport = 0;
+                        do
                        {
-                            int totalBytesRead = 0;
-                            int bytesReadAfterPreviousReport = 0;
-                            do
+                            int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
+                            if (bytesRead <= 0)
                            {
-                                int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
-                                if (bytesRead <= 0)
-                                {
-                                    progress.Report(new(bytesReadAfterPreviousReport));
-                                    bytesReadAfterPreviousReport = 0;
-                                    break;
-                                }
-
-                                await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
-
-                                totalBytesRead += bytesRead;
-                                bytesReadAfterPreviousReport += bytesRead;
-                                if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
-                                {
-                                    progress.Report(new(bytesReadAfterPreviousReport));
-                                    bytesReadAfterPreviousReport = 0;
-                                    stopwatch = ValueStopwatch.StartNew();
-                                }
+                                progress.Report(new(bytesReadAfterPreviousReport));
+                                bytesReadAfterPreviousReport = 0;
+                                break;
+                            }
+
+                            await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
+
+                            totalBytesRead += bytesRead;
+                            bytesReadAfterPreviousReport += bytesRead;
+                            if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
+                            {
+                                progress.Report(new(bytesReadAfterPreviousReport));
+                                bytesReadAfterPreviousReport = 0;
+                                stopwatch = ValueStopwatch.StartNew();
                            }
-                            while (true);
                        }
+                        while (true);
                    }
                }
            }
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamCopyWorker.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.

 using Snap.Hutao.Core.Diagnostics;
-using System.Buffers;
 using System.IO;

 namespace Snap.Hutao.Core.IO;
@@ -52,30 +51,26 @@ internal class StreamCopyWorker<TStatus>

        long totalBytesRead = 0;
        int bytesRead;
+        Memory<byte> buffer = new byte[bufferSize];

-        using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
+        do
        {
-            Memory<byte> buffer = memoryOwner.Memory;
-
-            do
+            bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
+            if (bytesRead == 0)
            {
-                bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
-                if (bytesRead is 0)
-                {
-                    progress.Report(statusFactory(totalBytesRead));
-                    break;
-                }
-
-                await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
-
-                totalBytesRead += bytesRead;
-                if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
-                {
-                    progress.Report(statusFactory(totalBytesRead));
-                    stopwatch = ValueStopwatch.StartNew();
-                }
+                progress.Report(statusFactory(totalBytesRead));
+                break;
+            }
+
+            await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
+
+            totalBytesRead += bytesRead;
+            if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
+            {
+                progress.Report(statusFactory(totalBytesRead));
+                stopwatch = ValueStopwatch.StartNew();
            }
-            while (bytesRead > 0);
        }
+        while (bytesRead > 0);
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs
@@ -1,40 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.IO;
-
-namespace Snap.Hutao.Core.IO;
-
-internal sealed class StreamReaderWriter : IDisposable
-{
-    private readonly StreamReader reader;
-    private readonly StreamWriter writer;
-
-    public StreamReaderWriter(StreamReader reader, StreamWriter writer)
-    {
-        this.reader = reader;
-        this.writer = writer;
-    }
-
-    public StreamReader Reader { get => reader; }
-
-    public StreamWriter Writer { get => writer; }
-
-    /// <inheritdoc cref="StreamReader.ReadLineAsync(CancellationToken)"/>
-    public ValueTask<string?> ReadLineAsync(CancellationToken token)
-    {
-        return reader.ReadLineAsync(token);
-    }
-
-    /// <inheritdoc cref="StreamWriter.WriteAsync(string?)"/>
-    public Task WriteAsync(string value)
-    {
-        return writer.WriteAsync(value);
-    }
-
-    public void Dispose()
-    {
-        writer.Dispose();
-        reader.Dispose();
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/IO/TempFile.cs
@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
        }
        catch (UnauthorizedAccessException ex)
        {
-            HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
+            HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
        }

        if (delete)
--- a/src/Snap.Hutao/Snap.Hutao/Core/LazySlim.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/LazySlim.cs
@@ -1,21 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core;
-
-internal sealed class LazySlim<T>
-{
-    private readonly Func<T> valueFactory;
-
-    [MaybeNull]
-    private T value;
-    private bool initialized;
-    private object? syncRoot;
-
-    public LazySlim(Func<T> valueFactory)
-    {
-        this.valueFactory = valueFactory;
-    }
-
-    public T Value { get => LazyInitializer.EnsureInitialized(ref value, ref initialized, ref syncRoot, valueFactory); }
-}
--- 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.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
        {
            if (StaticResource.IsAnyUnfulfilledCategoryPresent())
            {
-                UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin);
+                UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin);
            }
        }

-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed)
        {
            await taskContext.SwitchToMainThreadAsync();
            serviceProvider.GetRequiredService<GuideWindow>();
--- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeServer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeServer.cs
@@ -49,7 +49,7 @@ internal sealed partial class PrivateNamedPipeServer : IDisposable
    {
        byte[] content = new byte[header->ContentLength];
        serverStream.ReadAtLeast(content, header->ContentLength, false);
-        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
        return content;
    }

--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleVirtualTerminalSequences.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleVirtualTerminalSequences.cs
@@ -1,114 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Logging;
-
-internal static class ConsoleVirtualTerminalSequences
-{
-    public const string Default = "\u001b[0m";
-    public const string Bold = "\u001b[1m";
-
-    public const string Underline = "\u001b[4m";
-
-    public const string Negative = "\u001b[7m";
-
-    public const string NoBold = "\u001b[22m";
-
-    public const string NoUnderline = "\u001b[24m";
-
-    public const string Positive = "\u001b[27m";
-
-    public const string ForegroundBlack = "\u001b[30m";
-    public const string ForegroundRed = "\u001b[31m";
-    public const string ForegroundGreen = "\u001b[32m";
-    public const string ForegroundYellow = "\u001b[33m";
-    public const string ForegroundBlue = "\u001b[34m";
-    public const string ForegroundMagenta = "\u001b[35m";
-    public const string ForegroundCyan = "\u001b[36m";
-    public const string ForegroundWhite = "\u001b[37m";
-    public const string ForegroundExtended = "\u001b[38m";
-    public const string ForegroundDefault = "\u001b[39m";
-    public const string BackgroundBlack = "\u001b[40m";
-    public const string BackgroundRed = "\u001b[41m";
-    public const string BackgroundGreen = "\u001b[42m";
-    public const string BackgroundYellow = "\u001b[43m";
-    public const string BackgroundBlue = "\u001b[44m";
-    public const string BackgroundMagenta = "\u001b[45m";
-    public const string BackgroundCyan = "\u001b[46m";
-    public const string BackgroundWhite = "\u001b[47m";
-    public const string BackgroundExtended = "\u001b[48m";
-    public const string BackgroundDefault = "\u001b[49m";
-
-    public const string BrightForegroundBlack = "\u001b[1m\u001b[30m";
-    public const string BrightForegroundRed = "\u001b[1m\u001b[31m";
-    public const string BrightForegroundGreen = "\u001b[1m\u001b[32m";
-    public const string BrightForegroundYellow = "\u001b[1m\u001b[33m";
-    public const string BrightForegroundBlue = "\u001b[1m\u001b[34m";
-    public const string BrightForegroundMagenta = "\u001b[1m\u001b[35m";
-    public const string BrightForegroundCyan = "\u001b[1m\u001b[36m";
-    public const string BrightForegroundWhite = "\u001b[1m\u001b[37m";
-    public const string BrightBackgroundBlack = "\u001b[1m\u001b[40m";
-    public const string BrightBackgroundRed = "\u001b[1m\u001b[41m";
-    public const string BrightBackgroundGreen = "\u001b[1m\u001b[42m";
-    public const string BrightBackgroundYellow = "\u001b[1m\u001b[43m";
-    public const string BrightBackgroundBlue = "\u001b[1m\u001b[44m";
-    public const string BrightBackgroundMagenta = "\u001b[1m\u001b[45m";
-    public const string BrightBackgroundCyan = "\u001b[1m\u001b[46m";
-    public const string BrightBackgroundWhite = "\u001b[1m\u001b[47m";
-
-    public const string Dim = "\u001b[2m";
-    public const string Italic = "\u001b[3m";
-
-    public const string Blink = "\u001b[5m";
-
-    public const string Hidden = "\u001b[8m";
-    public const string StrikeThrough = "\u001b[9m";
-    public const string DoubleUnderline = "\u001b[21m";
-
-    public const string NoItalic = "\u001b[23m";
-
-    public const string NoBlink = "\u001b[25m";
-
-    public const string NoHidden = "\u001b[28m";
-    public const string NoStrikeThrough = "\u001b[29m";
-
-    public static string FromConsoleColor(ConsoleColor color, bool foreground)
-    {
-        return (foreground, color) switch
-        {
-            (true, ConsoleColor.Black) => ForegroundBlack,
-            (true, ConsoleColor.DarkBlue) => ForegroundBlue,
-            (true, ConsoleColor.DarkGreen) => ForegroundGreen,
-            (true, ConsoleColor.DarkCyan) => ForegroundCyan,
-            (true, ConsoleColor.DarkRed) => ForegroundRed,
-            (true, ConsoleColor.DarkMagenta) => ForegroundMagenta,
-            (true, ConsoleColor.DarkYellow) => ForegroundYellow,
-            (true, ConsoleColor.DarkGray) => BrightForegroundBlack,
-            (true, ConsoleColor.Gray) => ForegroundWhite,
-            (true, ConsoleColor.Blue) => BrightForegroundBlue,
-            (true, ConsoleColor.Green) => BrightForegroundGreen,
-            (true, ConsoleColor.Cyan) => BrightForegroundCyan,
-            (true, ConsoleColor.Red) => BrightForegroundRed,
-            (true, ConsoleColor.Magenta) => BrightForegroundMagenta,
-            (true, ConsoleColor.Yellow) => BrightForegroundYellow,
-            (true, ConsoleColor.White) => BrightForegroundWhite,
-            (false, ConsoleColor.Black) => BackgroundBlack,
-            (false, ConsoleColor.DarkBlue) => BackgroundBlue,
-            (false, ConsoleColor.DarkGreen) => BackgroundGreen,
-            (false, ConsoleColor.DarkCyan) => BackgroundCyan,
-            (false, ConsoleColor.DarkRed) => BackgroundRed,
-            (false, ConsoleColor.DarkMagenta) => BackgroundMagenta,
-            (false, ConsoleColor.DarkYellow) => BackgroundYellow,
-            (false, ConsoleColor.DarkGray) => BrightBackgroundBlack,
-            (false, ConsoleColor.Gray) => BackgroundWhite,
-            (false, ConsoleColor.Blue) => BrightBackgroundBlue,
-            (false, ConsoleColor.Green) => BrightBackgroundGreen,
-            (false, ConsoleColor.Cyan) => BrightBackgroundCyan,
-            (false, ConsoleColor.Red) => BrightBackgroundRed,
-            (false, ConsoleColor.Magenta) => BrightBackgroundMagenta,
-            (false, ConsoleColor.Yellow) => BrightBackgroundYellow,
-            (false, ConsoleColor.White) => BrightBackgroundWhite,
-            _ => string.Empty,
-        };
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/ConsoleWindowLifeTime.cs
@@ -22,7 +22,7 @@ internal sealed class ConsoleWindowLifeTime : IDisposable
                HANDLE inputHandle = GetStdHandle(STD_HANDLE.STD_INPUT_HANDLE);
                if (GetConsoleMode(inputHandle, out CONSOLE_MODE mode))
                {
-                    mode &= ~CONSOLE_MODE.ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+                    mode &= ~CONSOLE_MODE.ENABLE_QUICK_EDIT_MODE;
                    SetConsoleMode(inputHandle, mode);
                }

@@ -38,4 +38,4 @@ internal sealed class ConsoleWindowLifeTime : IDisposable
            FreeConsole();
        }
    }
-}
+}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogArgument.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogArgument.cs
@@ -1,33 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Logging;
-
-internal readonly struct LogArgument
-{
-    public readonly object? Argument;
-    public readonly ConsoleColor? ForegroundColor;
-    public readonly ConsoleColor? BackgroundColor;
-
-    public LogArgument(object? argument, ConsoleColor? foreground = default, ConsoleColor? background = default)
-    {
-        Argument = argument;
-        ForegroundColor = foreground;
-        BackgroundColor = background;
-    }
-
-    public static implicit operator LogArgument(string argument)
-    {
-        return new(argument);
-    }
-
-    public static implicit operator LogArgument(double argument)
-    {
-        return new(argument);
-    }
-
-    public static implicit operator LogArgument((object? Argument, ConsoleColor Foreground) tuple)
-    {
-        return new(tuple.Argument, tuple.Foreground);
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogMessage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LogMessage.cs
@@ -1,28 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Logging;
-
-internal readonly struct LogMessage
-{
-    public readonly string Message;
-    public readonly ConsoleColor? ForegroundColor;
-    public readonly ConsoleColor? BackgroundColor;
-
-    public LogMessage(string message, ConsoleColor? foreground = default, ConsoleColor? background = default)
-    {
-        Message = message;
-        ForegroundColor = foreground;
-        BackgroundColor = background;
-    }
-
-    public static implicit operator LogMessage(string value)
-    {
-        return new(value);
-    }
-
-    public static implicit operator LogMessage((string Value, ConsoleColor? Foreground) tuple)
-    {
-        return new(tuple.Value, tuple.Foreground);
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerExtension.cs
@@ -1,172 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using System.Text;
-
-namespace Snap.Hutao.Core.Logging;
-
-[SuppressMessage("", "SH002")]
-internal static class LoggerExtension
-{
-    public static void LogColorizedDebug(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Debug, exception, message, args);
-    }
-
-    public static void LogColorizedDebug(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Debug, message, args);
-    }
-
-    public static void LogColorizedTrace(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Trace, exception, message, args);
-    }
-
-    public static void LogColorizedTrace(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Trace, message, args);
-    }
-
-    public static void LogColorizedInformation(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Information, exception, message, args);
-    }
-
-    public static void LogColorizedInformation(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Information, message, args);
-    }
-
-    public static void LogColorizedWarning(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Warning, exception, message, args);
-    }
-
-    public static void LogColorizedWarning(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Warning, message, args);
-    }
-
-    public static void LogColorizedError(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Error, exception, message, args);
-    }
-
-    public static void LogColorizedError(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Error, message, args);
-    }
-
-    public static void LogColorizedCritical(this ILogger logger, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Critical, exception, message, args);
-    }
-
-    public static void LogColorizedCritical(this ILogger logger, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(LogLevel.Critical, message, args);
-    }
-
-    public static void LogColorized(this ILogger logger, LogLevel logLevel, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(logLevel, 0, null, message, args);
-    }
-
-    public static void LogColorized(this ILogger logger, LogLevel logLevel, EventId eventId, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(logLevel, eventId, null, message, args);
-    }
-
-    public static void LogColorized(this ILogger logger, LogLevel logLevel, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        logger.LogColorized(logLevel, 0, exception, message, args);
-    }
-
-    public static void LogColorized(this ILogger logger, LogLevel logLevel, EventId eventId, Exception? exception, LogMessage message, params LogArgument[] args)
-    {
-        string colorizedMessage = Colorize(message, args, out object?[] outArgs)!;
-        logger.Log(logLevel, eventId, exception, colorizedMessage, outArgs);
-    }
-
-    private static string? Colorize(LogMessage message, LogArgument[] args, out object?[] outArgs)
-    {
-        StringBuilder resultMessageBuilder = new(message.Message.Length);
-        ReadOnlySpan<char> messageSpan = message.Message.AsSpan();
-
-        // Message base colors
-        ConsoleColor? messageForeground = message.ForegroundColor;
-        ConsoleColor? messageBackground = message.BackgroundColor;
-
-        if (messageForeground.HasValue)
-        {
-            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageForeground.Value, true));
-        }
-
-        if (messageBackground.HasValue)
-        {
-            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageBackground.Value, false));
-        }
-
-        ReadOnlySpan<LogArgument> argSpan = args.AsSpan();
-        outArgs = new object?[args.Length];
-
-        int argIndex = 0;
-        for (int index = 0; index < messageSpan.Length; index++)
-        {
-            if (messageSpan[index] == '{')
-            {
-                ref readonly LogArgument arg = ref argSpan[argIndex];
-                outArgs[argIndex] = arg.Argument;
-                argIndex++;
-                if (arg.ForegroundColor.HasValue)
-                {
-                    resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(arg.ForegroundColor.Value, true));
-                }
-
-                if (arg.BackgroundColor.HasValue)
-                {
-                    resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(arg.BackgroundColor.Value, false));
-                }
-
-                int closingIndex = messageSpan[index..].IndexOf('}');
-                resultMessageBuilder.Append(messageSpan.Slice(index, closingIndex + 1));
-
-                index += closingIndex;
-
-                if (arg.ForegroundColor.HasValue || arg.BackgroundColor.HasValue)
-                {
-                    // Restore message colors
-                    if (messageForeground.HasValue || messageBackground.HasValue)
-                    {
-                        if (messageForeground.HasValue)
-                        {
-                            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageForeground.Value, true));
-                        }
-
-                        if (messageBackground.HasValue)
-                        {
-                            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.FromConsoleColor(messageBackground.Value, false));
-                        }
-                    }
-                    else
-                    {
-                        resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
-                    }
-                }
-            }
-            else
-            {
-                resultMessageBuilder.Append(messageSpan[index]);
-            }
-        }
-
-        // Restore default colors
-        if (message.ForegroundColor.HasValue || message.BackgroundColor.HasValue)
-        {
-            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.ForegroundWhite);
-        }
-
-        return resultMessageBuilder.ToString();
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerFactoryExtensions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerFactoryExtensions.cs
@@ -3,17 +3,13 @@

 namespace Snap.Hutao.Core.Logging;

-internal static class LoggerFactoryExtension
+internal static class LoggerFactoryExtensions
 {
    public static ILoggingBuilder AddConsoleWindow(this ILoggingBuilder builder)
    {
        builder.Services.AddSingleton<ConsoleWindowLifeTime>();

-        builder.AddSimpleConsole(options =>
-        {
-            options.TimestampFormat = "yyyy-MM-dd HH:mm:ss.fff ";
-        });
-
+        builder.AddSimpleConsole();
        return builder;
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptions.cs
@@ -15,13 +15,15 @@ namespace Snap.Hutao.Core;
 [Injection(InjectAs.Singleton)]
 internal sealed class RuntimeOptions
 {
-    private readonly LazySlim<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
+    private readonly IServiceProvider serviceProvider;
+
+    private readonly Lazy<(Version Version, string UserAgent)> lazyVersionAndUserAgent = new(() =>
    {
        Version version = Package.Current.Id.Version.ToVersion();
        return (version, $"Snap Hutao/{version}");
    });

-    private readonly LazySlim<string> lazyDataFolder = new(() =>
+    private readonly Lazy<string> lazyDataFolder = new(() =>
    {
        string preferredPath = LocalSetting.Get(SettingKeys.DataFolderPath, string.Empty);

@@ -46,14 +48,14 @@ internal sealed class RuntimeOptions
        return path;
    });

-    private readonly LazySlim<string> lazyDeviceId = new(() =>
+    private readonly Lazy<string> lazyDeviceId = new(() =>
    {
        string userName = Environment.UserName;
        object? machineGuid = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Cryptography\", "MachineGuid", userName);
        return Convert.ToMd5HexString($"{userName}{machineGuid}");
    });

-    private readonly LazySlim<(string Version, bool Supported)> lazyWebViewEnvironment = new(() =>
+    private readonly Lazy<(string Version, bool Supported)> lazyWebViewEnvironment = new(() =>
    {
        try
        {
@@ -66,7 +68,7 @@ internal sealed class RuntimeOptions
        }
    });

-    private readonly LazySlim<bool> lazyElevated = new(() =>
+    private readonly Lazy<bool> lazyElevated = new(() =>
    {
        if (LocalSetting.Get(SettingKeys.OverrideElevationRequirement, false))
        {
@@ -80,18 +82,18 @@ internal sealed class RuntimeOptions
        }
    });

-    private readonly LazySlim<string> lazyLocalCache = new(() => ApplicationData.Current.LocalCacheFolder.Path);
-    private readonly LazySlim<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
-    private readonly LazySlim<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);
+    private readonly Lazy<string> lazyLocalCache = new(() => ApplicationData.Current.LocalCacheFolder.Path);
+    private readonly Lazy<string> lazyInstalledLocation = new(() => Package.Current.InstalledLocation.Path);
+    private readonly Lazy<string> lazyFamilyName = new(() => Package.Current.Id.FamilyName);

-    private readonly LazySlim<bool> lazyToastAvailable = new(() =>
-    {
-        ITaskContext taskContext = Ioc.Default.GetRequiredService<ITaskContext>();
-        return taskContext.InvokeOnMainThread(() => ToastNotificationManager.CreateToastNotifier().Setting is NotificationSetting.Enabled);
-    });
+    private bool isToastAvailable;
+    private bool isToastAvailableInitialized;
+    private object isToastAvailableLock = new();

-    public RuntimeOptions()
+    public RuntimeOptions(IServiceProvider serviceProvider, ILogger<RuntimeOptions> logger)
    {
+        this.serviceProvider = serviceProvider;
+
        AppLaunchTime = DateTimeOffset.UtcNow;
    }

@@ -115,7 +117,19 @@ internal sealed class RuntimeOptions

    public bool IsElevated { get => lazyElevated.Value; }

-    public bool IsToastAvailable { get => lazyToastAvailable.Value; }
+    public bool IsToastAvailable
+    {
+        get
+        {
+            return LazyInitializer.EnsureInitialized(ref isToastAvailable, ref isToastAvailableInitialized, ref isToastAvailableLock, GetIsToastAvailable);
+
+            bool GetIsToastAvailable()
+            {
+                ITaskContext taskContext = serviceProvider.GetRequiredService<ITaskContext>();
+                return taskContext.InvokeOnMainThread(() => ToastNotificationManager.CreateToastNotifier().Setting is NotificationSetting.Enabled);
+            }
+        }
+    }

    public DateTimeOffset AppLaunchTime { get; }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptionsExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/RuntimeOptionsExtension.cs
@@ -16,15 +16,11 @@ internal static class RuntimeOptionsExtension

    public static string GetDataFolderServerCacheFolder(this RuntimeOptions options)
    {
-        string directory = Path.Combine(options.DataFolder, "ServerCache");
-        Directory.CreateDirectory(directory);
-        return directory;
+        return Path.Combine(options.DataFolder, "ServerCache");
    }

    public static string GetDataFolderBackgroundFolder(this RuntimeOptions options)
    {
-        string directory = Path.Combine(options.DataFolder, "Background");
-        Directory.CreateDirectory(directory);
-        return directory;
+        return Path.Combine(options.DataFolder, "Background");
    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs
@@ -20,9 +20,7 @@ internal static class SettingKeys
    #region Application
    public const string LaunchTimes = "LaunchTimes";
    public const string DataFolderPath = "DataFolderPath";
-    public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState1";
-    public const string StaticResourceImageQuality = "StaticResourceImageQuality";
-    public const string StaticResourceImageArchive = "StaticResourceImageArchive";
+    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
    public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever";
    public const string IsAllocConsoleDebugModeEnabled = "IsAllocConsoleDebugModeEnabled2";
    #endregion
@@ -62,10 +60,6 @@ internal static class SettingKeys
    #endregion

    #region Obsolete
-
-    [Obsolete("重置新手引导状态")]
-    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
-
    [Obsolete("重置调试控制台开关")]
    public const string IsAllocConsoleDebugModeEnabledLegacy1 = "IsAllocConsoleDebugModeEnabled";
    #endregion
--- a/src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs
@@ -21,27 +21,22 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
    public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
    {
        string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
-        string elevatedLauncherPath = Path.Combine(runtimeOptions.DataFolder, "Snap.Hutao.Elevated.Launcher.exe");

        try
        {
            Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
            StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
            await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
-
-            Uri elevatedLauncherUri = "ms-appx:///Snap.Hutao.Elevated.Launcher.exe".ToUri();
-            StorageFile launcherFile = await StorageFile.GetFileFromApplicationUriAsync(elevatedLauncherUri);
-            await launcherFile.OverwriteCopyAsync(elevatedLauncherPath).ConfigureAwait(false);
        }
        catch
        {
            return false;
        }

-        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath, elevatedLauncherPath);
+        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath);
    }

-    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath, string elevatedLauncherPath)
+    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath)
    {
        bool result = false;

@@ -49,11 +44,17 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
        HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
        if (SUCCEEDED(hr))
        {
-            pShellLink->SetPath(elevatedLauncherPath);
-            pShellLink->SetArguments(runtimeOptions.FamilyName);
+            pShellLink->SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
            pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
            pShellLink->SetIconLocation(targetLogoPath, 0);

+            if (SUCCEEDED(pShellLink->QueryInterface(in IShellLinkDataList.IID, out IShellLinkDataList* pShellLinkDataList)))
+            {
+                pShellLinkDataList->GetFlags(out uint flags);
+                pShellLinkDataList->SetFlags(flags | (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER);
+                pShellLinkDataList->Release();
+            }
+
            if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
            {
                string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
--- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/SpinWaitPolyfill.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/SpinWaitPolyfill.cs
@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

-using System.Diagnostics;
-
 namespace Snap.Hutao.Core.Threading;

 internal delegate bool SpinWaitPredicate<T>(ref readonly T state);
@@ -17,23 +15,4 @@ internal static class SpinWaitPolyfill
            spinner.SpinOnce();
        }
    }
-
-    [SuppressMessage("", "SH002")]
-    public static unsafe bool SpinUntil<T>(ref T state, delegate*<ref readonly T, bool> condition, TimeSpan timeout)
-    {
-        long startTime = Stopwatch.GetTimestamp();
-
-        SpinWait spinner = default;
-        while (!condition(ref state))
-        {
-            spinner.SpinOnce();
-
-            if (timeout < Stopwatch.GetElapsedTime(startTime))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowController.cs
@@ -29,7 +29,6 @@ internal sealed class WindowController
    private readonly WindowOptions options;
    private readonly IServiceProvider serviceProvider;
    private readonly WindowSubclass subclass;
-    private readonly WindowNonRudeHWND windowNonRudeHWND;

    public WindowController(Window window, in WindowOptions options, IServiceProvider serviceProvider)
    {
@@ -40,8 +39,6 @@ internal sealed class WindowController
        // Window reference must be set before Window Subclass created
        serviceProvider.GetRequiredService<ICurrentWindowReference>().Window = window;
        subclass = new(window, options, serviceProvider);
-        windowNonRudeHWND = new(options.Hwnd);
-
        InitializeCore();
    }

@@ -140,19 +137,27 @@ internal sealed class WindowController
    {
        SaveOrSkipWindowSize();
        subclass?.Dispose();
-        windowNonRudeHWND?.Dispose();
    }

    private void ExtendsContentIntoTitleBar()
    {
-        AppWindowTitleBar appTitleBar = window.AppWindow.TitleBar;
-        appTitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
-        appTitleBar.ExtendsContentIntoTitleBar = true;
+        if (options.UseLegacyDragBarImplementation)
+        {
+            // use normal Window method to extend.
+            window.ExtendsContentIntoTitleBar = true;
+            window.SetTitleBar(options.TitleBar);
+        }
+        else
+        {
+            AppWindowTitleBar appTitleBar = window.AppWindow.TitleBar;
+            appTitleBar.IconShowOptions = IconShowOptions.HideIconAndSystemMenu;
+            appTitleBar.ExtendsContentIntoTitleBar = true;

-        UpdateTitleButtonColor();
-        UpdateDragRectangles();
-        options.TitleBar.ActualThemeChanged += (_, _) => UpdateTitleButtonColor();
-        options.TitleBar.SizeChanged += (_, _) => UpdateDragRectangles();
+            UpdateTitleButtonColor();
+            UpdateDragRectangles();
+            options.TitleBar.ActualThemeChanged += (_, _) => UpdateTitleButtonColor();
+            options.TitleBar.SizeChanged += (_, _) => UpdateDragRectangles();
+        }
    }

    private bool UpdateSystemBackdrop(BackdropType backdropType)
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowNonRudeHWND.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowNonRudeHWND.cs
@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Win32.Foundation;
-using static Snap.Hutao.Win32.User32;
-
-namespace Snap.Hutao.Core.Windowing;
-
-internal sealed class WindowNonRudeHWND : IDisposable
-{
-    // https://learn.microsoft.com/en-us/windows/win32/api/shobjidl_core/nf-shobjidl_core-itaskbarlist2-markfullscreenwindow#remarks
-    private const string NonRudeHWND = "NonRudeHWND";
-    private readonly HWND hwnd;
-
-    public WindowNonRudeHWND(HWND hwnd)
-    {
-        this.hwnd = hwnd;
-        SetPropW(hwnd, NonRudeHWND, BOOL.TRUE);
-    }
-
-    public void Dispose()
-    {
-        RemovePropW(hwnd, NonRudeHWND);
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowOptions.cs
@@ -41,6 +41,11 @@ internal readonly struct WindowOptions
    /// </summary>
    public readonly bool PersistSize;

+    /// <summary>
+    /// 是否使用 Win UI 3 自带的拓展标题栏实现
+    /// </summary>
+    public readonly bool UseLegacyDragBarImplementation = !AppWindowTitleBar.IsCustomizationSupported();
+
    public WindowOptions(Window window, FrameworkElement titleBar, SizeInt32 initSize, bool persistSize = false)
    {
        Hwnd = WindowNative.GetWindowHandle(window);
--- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowSubclass.cs
@@ -20,6 +20,7 @@ namespace Snap.Hutao.Core.Windowing;
 internal sealed class WindowSubclass : IDisposable
 {
    private const int WindowSubclassId = 101;
+    private const int DragBarSubclassId = 102;

    private readonly Window window;
    private readonly WindowOptions options;
@@ -28,6 +29,7 @@ internal sealed class WindowSubclass : IDisposable

    // We have to explicitly hold a reference to SUBCLASSPROC
    private SUBCLASSPROC windowProc = default!;
+    private SUBCLASSPROC legacyDragBarProc = default!;

    public WindowSubclass(Window window, in WindowOptions options, IServiceProvider serviceProvider)
    {
@@ -48,7 +50,26 @@ internal sealed class WindowSubclass : IDisposable
        bool windowHooked = SetWindowSubclass(options.Hwnd, windowProc, WindowSubclassId, 0);
        hotKeyController.RegisterAll();

-        return windowHooked;
+        bool titleBarHooked = true;
+
+        // only hook up drag bar proc when use legacy Window.ExtendsContentIntoTitleBar
+        if (!options.UseLegacyDragBarImplementation)
+        {
+            return windowHooked && titleBarHooked;
+        }
+
+        titleBarHooked = false;
+        HWND hwndDragBar = FindWindowExW(options.Hwnd, default, "DRAG_BAR_WINDOW_CLASS", default);
+
+        if (hwndDragBar.IsNull)
+        {
+            return windowHooked && titleBarHooked;
+        }
+
+        legacyDragBarProc = OnLegacyDragBarProcedure;
+        titleBarHooked = SetWindowSubclass(hwndDragBar, legacyDragBarProc, DragBarSubclassId, 0);
+
+        return windowHooked && titleBarHooked;
    }

    /// <inheritdoc/>
@@ -58,6 +79,12 @@ internal sealed class WindowSubclass : IDisposable

        RemoveWindowSubclass(options.Hwnd, windowProc, WindowSubclassId);
        windowProc = default!;
+
+        if (options.UseLegacyDragBarImplementation)
+        {
+            RemoveWindowSubclass(options.Hwnd, legacyDragBarProc, DragBarSubclassId);
+            legacyDragBarProc = default!;
+        }
    }

    [SuppressMessage("", "SH002")]
@@ -100,4 +127,19 @@ internal sealed class WindowSubclass : IDisposable

        return DefSubclassProc(hwnd, uMsg, wParam, lParam);
    }
+
+    [SuppressMessage("", "SH002")]
+    private LRESULT OnLegacyDragBarProcedure(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM lParam, nuint uIdSubclass, nuint dwRefData)
+    {
+        switch (uMsg)
+        {
+            case WM_NCRBUTTONDOWN:
+            case WM_NCRBUTTONUP:
+                {
+                    return (LRESULT)(nint)WM_NULL;
+                }
+        }
+
+        return DefSubclassProc(hwnd, uMsg, wParam, lParam);
+    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs
@@ -118,6 +118,14 @@ internal static partial class EnumerableExtension
        collection.RemoveAt(collection.Count - 1);
    }

+    /// <summary>
+    /// 转换到新类型的列表
+    /// </summary>
+    /// <typeparam name="TSource">原始类型</typeparam>
+    /// <typeparam name="TResult">新类型</typeparam>
+    /// <param name="list">列表</param>
+    /// <param name="selector">选择器</param>
+    /// <returns>新类型的列表</returns>
    [Pure]
    public static List<TResult> SelectList<TSource, TResult>(this List<TSource> list, Func<TSource, TResult> selector)
    {
@@ -192,13 +200,6 @@ internal static partial class EnumerableExtension
        return list;
    }

-    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static List<TSource> SortBy<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, IComparer<TKey> comparer)
-    {
-        list.Sort((left, right) => comparer.Compare(keySelector(left), keySelector(right)));
-        return list;
-    }
-
    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
    public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector)
        where TKey : IComparable
@@ -206,11 +207,4 @@ internal static partial class EnumerableExtension
        list.Sort((left, right) => keySelector(right).CompareTo(keySelector(left)));
        return list;
    }
-
-    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, IComparer<TKey> comparer)
-    {
-        list.Sort((left, right) => comparer.Compare(keySelector(right), keySelector(left)));
-        return list;
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml
@@ -8,7 +8,7 @@
    xmlns:shvg="using:Snap.Hutao.View.Guide"
    mc:Ignorable="d">

-    <Grid x:Name="RootGrid" Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
+    <Grid x:Name="RootGrid">
        <Grid.RowDefinitions>
            <RowDefinition Height="auto"/>
            <RowDefinition/>
--- a/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs
@@ -14,10 +14,10 @@ namespace Snap.Hutao;
 internal sealed partial class GuideWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
 {
    private const int MinWidth = 1000;
-    private const int MinHeight = 650;
+    private const int MinHeight = 600;

    private const int MaxWidth = 1200;
-    private const int MaxHeight = 800;
+    private const int MaxHeight = 750;

    private readonly WindowOptions windowOptions;

--- a/src/Snap.Hutao/Snap.Hutao/IdentifyMonitorWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/IdentifyMonitorWindow.xaml.cs
@@ -27,27 +27,4 @@ internal sealed partial class IdentifyMonitorWindow : Window
    }

    public string Monitor { get; private set; }
-
-    public static async ValueTask IdentifyAllMonitorsAsync(int secondsDelay)
-    {
-        List<IdentifyMonitorWindow> windows = [];
-
-        IReadOnlyList<DisplayArea> displayAreas = DisplayArea.FindAll();
-        for (int i = 0; i < displayAreas.Count; i++)
-        {
-            windows.Add(new IdentifyMonitorWindow(displayAreas[i], i + 1));
-        }
-
-        foreach (IdentifyMonitorWindow window in windows)
-        {
-            window.Activate();
-        }
-
-        await Delay.FromSeconds(secondsDelay).ConfigureAwait(true);
-
-        foreach (IdentifyMonitorWindow window in windows)
-        {
-            window.Close();
-        }
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
+++ b/src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.

 using Microsoft.UI.Xaml;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Windowing;
 using Snap.Hutao.ViewModel.Game;
 using Snap.Hutao.Win32.UI.WindowsAndMessaging;
@@ -36,7 +35,7 @@ internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOpt
        scope = serviceProvider.CreateScope();
        windowOptions = new(this, DragableGrid, new(MaxWidth, MaxHeight));
        this.InitializeController(serviceProvider);
-        RootGrid.InitializeDataContext<LaunchGameViewModel>(scope.ServiceProvider);
+        RootGrid.DataContext = scope.ServiceProvider.GetRequiredService<LaunchGameViewModel>();
    }

    /// <inheritdoc/>
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntity.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntity.cs
@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Entity.Abstraction;
-
-internal interface IAppDbEntity
-{
-    Guid InnerId { get; }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntityHasArchive.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntityHasArchive.cs
@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Entity.Abstraction;
-
-internal interface IAppDbEntityHasArchive : IAppDbEntity
-{
-    Guid ArchiveId { get; }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Achievement.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Achievement.cs
@@ -16,8 +16,8 @@ namespace Snap.Hutao.Model.Entity;
 [HighQuality]
 [Table("achievements")]
 [SuppressMessage("", "SA1124")]
-internal sealed class Achievement : IAppDbEntityHasArchive,
-    IEquatable<Achievement>,
+internal sealed class Achievement
+    : IEquatable<Achievement>,
    IDbMappingForeignKeyFrom<Achievement, AchievementId>,
    IDbMappingForeignKeyFrom<Achievement, UIAFItem>
 {
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/CultivateEntry.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/CultivateEntry.cs
@@ -13,7 +13,7 @@ namespace Snap.Hutao.Model.Entity;
 /// </summary>
 [HighQuality]
 [Table("cultivate_entries")]
-internal sealed class CultivateEntry : IDbMappingForeignKeyFrom<CultivateEntry, CultivateType, uint>, IAppDbEntity
+internal sealed class CultivateEntry : IDbMappingForeignKeyFrom<CultivateEntry, CultivateType, uint>
 {
    /// <summary>
    /// 内部Id
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/CultivateProject.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/CultivateProject.cs
@@ -3,7 +3,6 @@

 using Snap.Hutao.Core.Abstraction;
 using Snap.Hutao.Core.Database;
-using Snap.Hutao.Model.Entity.Abstraction;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;

@@ -14,7 +13,7 @@ namespace Snap.Hutao.Model.Entity;
 /// </summary>
 [HighQuality]
 [Table("cultivate_projects")]
-internal sealed class CultivateProject : ISelectable, IMappingFrom<CultivateProject, string, string>, IAppDbEntity
+internal sealed class CultivateProject : ISelectable, IMappingFrom<CultivateProject, string, string>
 {
    /// <summary>
    /// 内部Id
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/DailyNoteEntry.cs
@@ -3,7 +3,6 @@

 using CommunityToolkit.Mvvm.ComponentModel;
 using Snap.Hutao.Core.Abstraction;
-using Snap.Hutao.Model.Entity.Abstraction;
 using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Hoyolab.Takumi.Binding;
 using Snap.Hutao.Web.Hoyolab.Takumi.GameRecord.DailyNote;
@@ -17,7 +16,7 @@ namespace Snap.Hutao.Model.Entity;
 /// </summary>
 [HighQuality]
 [Table("daily_notes")]
-internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteEntry, UserAndUid>, IAppDbEntity
+internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteEntry, UserAndUid>
 {
    /// <summary>
    /// 内部Id
@@ -69,26 +68,61 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
        }
    }

+    /// <summary>
+    /// 树脂提醒阈值
+    /// </summary>
    public int ResinNotifyThreshold { get; set; }

+    /// <summary>
+    /// 用于判断树脂是否继续提醒
+    /// </summary>
    public bool ResinNotifySuppressed { get; set; }

+    /// <summary>
+    /// 洞天宝钱提醒阈值
+    /// </summary>
    public int HomeCoinNotifyThreshold { get; set; }

+    /// <summary>
+    /// 用于判断洞天宝钱是否继续提醒
+    /// </summary>
    public bool HomeCoinNotifySuppressed { get; set; }

+    /// <summary>
+    /// 参量质变仪提醒
+    /// </summary>
    public bool TransformerNotify { get; set; }

+    /// <summary>
+    /// 用于判断参量质变仪是否继续提醒
+    /// </summary>
    public bool TransformerNotifySuppressed { get; set; }

+    /// <summary>
+    /// 每日委托提醒
+    /// </summary>
    public bool DailyTaskNotify { get; set; }

+    /// <summary>
+    /// 用于判断每日委托是否继续提醒
+    /// </summary>
    public bool DailyTaskNotifySuppressed { get; set; }

+    /// <summary>
+    /// 探索派遣提醒
+    /// </summary>
    public bool ExpeditionNotify { get; set; }

+    /// <summary>
+    /// 用于判断探索派遣是否继续提醒
+    /// </summary>
    public bool ExpeditionNotifySuppressed { get; set; }

+    /// <summary>
+    /// 构造一个新的实时便笺
+    /// </summary>
+    /// <param name="userAndUid">用户与角色</param>
+    /// <returns>新的实时便笺</returns>
    public static DailyNoteEntry From(UserAndUid userAndUid)
    {
        return new()
@@ -100,6 +134,10 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
        };
    }

+    /// <summary>
+    /// 更新实时便笺
+    /// </summary>
+    /// <param name="dailyNote">新的值</param>
    public void UpdateDailyNote(DailyNote? dailyNote)
    {
        DailyNote = dailyNote;
@@ -108,24 +146,4 @@ internal sealed class DailyNoteEntry : ObservableObject, IMappingFrom<DailyNoteE
        RefreshTime = DateTimeOffset.UtcNow;
        OnPropertyChanged(nameof(RefreshTimeFormatted));
    }
-
-    public void CopyTo(DailyNoteEntry other)
-    {
-        other.UpdateDailyNote(DailyNote);
-
-        other.ResinNotifySuppressed = ResinNotifySuppressed;
-        other.OnPropertyChanged(nameof(ResinNotifySuppressed));
-
-        other.HomeCoinNotifySuppressed = HomeCoinNotifySuppressed;
-        other.OnPropertyChanged(nameof(HomeCoinNotifySuppressed));
-
-        other.TransformerNotifySuppressed = TransformerNotifySuppressed;
-        other.OnPropertyChanged(nameof(TransformerNotifySuppressed));
-
-        other.DailyTaskNotifySuppressed = DailyTaskNotifySuppressed;
-        other.OnPropertyChanged(nameof(DailyTaskNotifySuppressed));
-
-        other.ExpeditionNotifySuppressed = ExpeditionNotifySuppressed;
-        other.OnPropertyChanged(nameof(ExpeditionNotifySuppressed));
-    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContext.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContext.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT license.

 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Model.Entity.Configuration;
 using System.Diagnostics;

@@ -25,8 +23,18 @@ internal sealed class AppDbContext : DbContext
    public AppDbContext(DbContextOptions<AppDbContext> options)
        : base(options)
    {
-        logger = this.GetService<ILogger<AppDbContext>>();
-        logger?.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
+    }
+
+    /// <summary>
+    /// 构造一个新的应用程序数据库上下文
+    /// </summary>
+    /// <param name="options">选项</param>
+    /// <param name="logger">日志器</param>
+    public AppDbContext(DbContextOptions<AppDbContext> options, ILogger<AppDbContext> logger)
+        : this(options)
+    {
+        this.logger = logger;
+        logger.LogInformation("{Name}[{Id}] created", nameof(AppDbContext), ContextId);
    }

    public DbSet<SettingEntry> Settings { get; set; } = default!;
@@ -65,21 +73,21 @@ internal sealed class AppDbContext : DbContext

    public DbSet<SpiralAbyssEntry> SpiralAbysses { get; set; } = default!;

-    public static AppDbContext Create(IServiceProvider serviceProvider, string sqlConnectionString)
+    /// <summary>
+    /// 构造一个临时的应用程序数据库上下文
+    /// </summary>
+    /// <param name="sqlConnectionString">连接字符串</param>
+    /// <returns>应用程序数据库上下文</returns>
+    public static AppDbContext Create(string sqlConnectionString)
    {
-        DbContextOptions<AppDbContext> options = new DbContextOptionsBuilder<AppDbContext>()
-            .UseApplicationServiceProvider(serviceProvider)
-            .UseSqlite(sqlConnectionString)
-            .Options;
-
-        return new(options);
+        return new(new DbContextOptionsBuilder<AppDbContext>().UseSqlite(sqlConnectionString).Options);
    }

    /// <inheritdoc/>
    public override void Dispose()
    {
        base.Dispose();
-        logger?.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("disposed", ConsoleColor.Red));
+        logger?.LogInformation("{Name}[{Id}] disposed", nameof(AppDbContext), ContextId);
    }

    /// <inheritdoc/>
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContextDesignTimeFactory.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContextDesignTimeFactory.cs
@@ -18,7 +18,7 @@ internal sealed class AppDbContextDesignTimeFactory : IDesignTimeDbContextFactor
 #if DEBUG
        // TODO: replace with your own database file path.
        string userdataDbName = @"D:\Hutao\Userdata.db";
-        return AppDbContext.Create(default!, $"Data Source={userdataDbName}");
+        return AppDbContext.Create($"Data Source={userdataDbName}");
 #else
        throw Must.NeverHappen();
 #endif
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
@@ -19,7 +19,6 @@ internal sealed partial class SettingEntry
    public const string AnnouncementRegion = "AnnouncementRegion";

    public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";
-    public const string IsUnobtainedWishItemVisible = "IsUnobtainedWishItemVisible";

    public const string GeetestCustomCompositeUrl = "GeetestCustomCompositeUrl";

--- a/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Frozen/IntrinsicFrozen.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Frozen/IntrinsicFrozen.cs
@@ -11,26 +11,34 @@ namespace Snap.Hutao.Model.Intrinsic.Frozen;
 [HighQuality]
 internal static class IntrinsicFrozen
 {
+    /// <summary>
+    /// 所属地区
+    /// </summary>
    public static FrozenSet<string> AssociationTypes { get; } = Enum.GetValues<AssociationType>().Select(e => e.GetLocalizedDescriptionOrDefault()).OfType<string>().ToFrozenSet();

-    public static FrozenSet<NameValue<AssociationType>> AssociationTypeNameValues { get; } = Enum.GetValues<AssociationType>().Select(e => new NameValue<AssociationType>(e.GetLocalizedDescriptionOrDefault()!, e)).Where(nv => !string.IsNullOrEmpty(nv.Name)).ToFrozenSet();
-
+    /// <summary>
+    /// 武器类型
+    /// </summary>
    public static FrozenSet<string> WeaponTypes { get; } = Enum.GetValues<WeaponType>().Select(e => e.GetLocalizedDescriptionOrDefault()).OfType<string>().ToFrozenSet();

-    public static FrozenSet<NameValue<WeaponType>> WeaponTypeNameValues { get; } = Enum.GetValues<WeaponType>().Select(e => new NameValue<WeaponType>(e.GetLocalizedDescriptionOrDefault()!, e)).Where(nv => !string.IsNullOrEmpty(nv.Name)).ToFrozenSet();
-
+    /// <summary>
+    /// 物品类型
+    /// </summary>
    public static FrozenSet<string> ItemQualities { get; } = Enum.GetValues<QualityType>().Select(e => e.GetLocalizedDescriptionOrDefault()).OfType<string>().ToFrozenSet();

-    public static FrozenSet<NameValue<QualityType>> ItemQualityNameValues { get; } = Enum.GetValues<QualityType>().Select(e => new NameValue<QualityType>(e.GetLocalizedDescriptionOrDefault()!, e)).Where(nv => !string.IsNullOrEmpty(nv.Name)).ToFrozenSet();
-
+    /// <summary>
+    /// 身材类型
+    /// </summary>
    public static FrozenSet<string> BodyTypes { get; } = Enum.GetValues<BodyType>().Select(e => e.GetLocalizedDescriptionOrDefault()).OfType<string>().ToFrozenSet();

-    public static FrozenSet<NameValue<BodyType>> BodyTypeNameValues { get; } = Enum.GetValues<BodyType>().Select(e => new NameValue<BodyType>(e.GetLocalizedDescriptionOrDefault()!, e)).Where(nv => !string.IsNullOrEmpty(nv.Name)).ToFrozenSet();
-
+    /// <summary>
+    /// 战斗属性
+    /// </summary>
    public static FrozenSet<string> FightProperties { get; } = Enum.GetValues<FightProperty>().Select(e => e.GetLocalizedDescriptionOrDefault()).OfType<string>().ToFrozenSet();

-    public static FrozenSet<NameValue<FightProperty>> FightPropertyNameValues { get; } = Enum.GetValues<FightProperty>().Select(e => new NameValue<FightProperty>(e.GetLocalizedDescriptionOrDefault()!, e)).Where(nv => !string.IsNullOrEmpty(nv.Name)).ToFrozenSet();
-
+    /// <summary>
+    /// 元素名称
+    /// </summary>
    public static FrozenSet<string> ElementNames { get; } = FrozenSet.ToFrozenSet(
    [
        SH.ModelIntrinsicElementNameFire,
@@ -42,17 +50,6 @@ internal static class IntrinsicFrozen
        SH.ModelIntrinsicElementNameRock,
    ]);

-    public static FrozenSet<NameValue<int>> ElementNameValues { get; } = FrozenSet.ToFrozenSet(
-    [
-        new NameValue<int>(SH.ModelIntrinsicElementNameFire, 1),
-        new NameValue<int>(SH.ModelIntrinsicElementNameWater, 2),
-        new NameValue<int>(SH.ModelIntrinsicElementNameGrass, 3),
-        new NameValue<int>(SH.ModelIntrinsicElementNameElec, 4),
-        new NameValue<int>(SH.ModelIntrinsicElementNameWind, 5),
-        new NameValue<int>(SH.ModelIntrinsicElementNameIce, 6),
-        new NameValue<int>(SH.ModelIntrinsicElementNameRock, 7),
-    ]);
-
    public static FrozenSet<string> MaterialTypeDescriptions { get; } = FrozenSet.ToFrozenSet(
    [
        SH.ModelMetadataMaterialCharacterAndWeaponEnhancementMaterial,
--- a/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/QuestType.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/QuestType.cs
@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Intrinsic;
-
-internal enum QuestType
-{
-    AQ,
-    FQ,
-    LQ,
-    EQ,
-    DQ,
-    IQ,
-    VQ,
-    WQ,
-}
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/City.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/City.cs
@@ -1,16 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Metadata;
-
-// CityTaskOpenExcelConfig
-internal enum City : uint
-{
-    Mondstadt = 1,
-    Liyue = 2,
-    Inazuma = 3,
-    Sumeru = 4,
-    Fontaine = 5,
-    Natlan,
-    Snezhnaya,
-}
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AssociationTypeIconConverter.cs
@@ -9,6 +9,24 @@ namespace Snap.Hutao.Model.Metadata.Converter;

 internal sealed class AssociationTypeIconConverter : ValueConverter<AssociationType, Uri?>
 {
+    private static readonly FrozenDictionary<string, AssociationType> LocalizedNameToAssociationType = FrozenDictionary.ToFrozenDictionary(
+    [
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeMondstadt, AssociationType.ASSOC_TYPE_MONDSTADT),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeLiyue, AssociationType.ASSOC_TYPE_LIYUE),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeFatui, AssociationType.ASSOC_TYPE_FATUI),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeInazuma, AssociationType.ASSOC_TYPE_INAZUMA),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeRanger, AssociationType.ASSOC_TYPE_RANGER),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeSumeru, AssociationType.ASSOC_TYPE_SUMERU),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeFontaine, AssociationType.ASSOC_TYPE_FONTAINE),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeNatlan, AssociationType.ASSOC_TYPE_NATLAN),
+        KeyValuePair.Create(SH.ModelIntrinsicAssociationTypeSnezhnaya, AssociationType.ASSOC_TYPE_SNEZHNAYA),
+    ]);
+
+    public static Uri? AssociationTypeNameToIconUri(string associationTypeName)
+    {
+        return AssociationTypeToIconUri(LocalizedNameToAssociationType.GetValueOrDefault(associationTypeName));
+    }
+
    public static Uri? AssociationTypeToIconUri(AssociationType type)
    {
        string? association = type switch
--- a/Show More
+++ b/Show More