show not found if no result

2025-11-19 21:02:53 +08:00 · 2024-03-16 19:37:18 +08:00
61 changed files with 907 additions and 1479 deletions
--- 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) ![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) ![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) ![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) ![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)![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)  ![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)
+[从 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/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj
+++ b/src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj
@@ -15,7 +15,7 @@
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
    <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
    <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
-    <PackageReference Include="coverlet.collector" Version="6.0.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,11 +7,8 @@ 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;
-using System.Text;
-using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;

 namespace Snap.Hutao;

@@ -24,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.
        ----------------------------------------------------------------
@@ -72,7 +69,7 @@ public sealed partial class App : Application
                return;
            }

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

            // manually invoke
@@ -92,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,12 @@ 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);
        }
    }

@@ -47,19 +43,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.WhereOrDefault(q => q.Value.Contains(Text, StringComparison.OrdinalIgnoreCase), [SearchToken.NotFound]);
        }
    }

@@ -80,23 +69,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,15 @@ namespace Snap.Hutao.Control.AutoSuggestBox;

 internal sealed class SearchToken
 {
-    public static readonly SearchToken NotFound = new(SearchTokenKind.None, SH.ControlAutoSuggestBoxNotFoundValue, 0);
+    public static readonly SearchToken NotFound = new(SearchTokenKind.None, SH.ControlAutoSuggestBoxNotFoundValue);

-    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 +28,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/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/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;
    }
--- 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/UniformPanel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs
@@ -1,55 +1,21 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.

-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-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/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
@@ -3,13 +3,13 @@

 using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.IO;
-using Snap.Hutao.Core.IO.Hashing;
-using Snap.Hutao.Core.Logging;
 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;

@@ -104,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);
            }

@@ -132,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)
--- 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(BitConverter.ToString, 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/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,28 +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((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.Default);
-                    }
-                }
-            }
-            else
-            {
-                resultMessageBuilder.Append(messageSpan[index]);
-            }
-        }
-
-        // Restore default colors
-        if (message.ForegroundColor.HasValue || message.BackgroundColor.HasValue)
-        {
-            resultMessageBuilder.Append(ConsoleVirtualTerminalSequences.Default);
-        }
-
-        return resultMessageBuilder.ToString();
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerFactoryExtensions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Core/Logging/LoggerFactoryExtensions.cs
@@ -3,7 +3,7 @@

 namespace Snap.Hutao.Core.Logging;

-internal static class LoggerFactoryExtension
+internal static class LoggerFactoryExtensions
 {
    public static ILoggingBuilder AddConsoleWindow(this ILoggingBuilder builder)
    {
--- a/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.List.cs
@@ -200,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
@@ -214,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/Extension/EnumerableExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs
@@ -123,4 +123,9 @@ internal static partial class EnumerableExtension
    {
        return string.Join(separator, collection);
    }
+
+    public static IEnumerable<TSource> WhereOrDefault<TSource>(this IEnumerable<TSource> source, Func<TSource, bool> predicate, IEnumerable<TSource> defaultValue)
+    {
+        return source.Where(predicate).Any() ? source : defaultValue;
+    }
 }
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContext.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/Database/AppDbContext.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.

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

@@ -35,7 +34,7 @@ internal sealed class AppDbContext : DbContext
        : this(options)
    {
        this.logger = logger;
-        logger.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
+        logger.LogInformation("{Name}[{Id}] created", nameof(AppDbContext), ContextId);
    }

    public DbSet<SettingEntry> Settings { get; set; } = default!;
@@ -88,7 +87,7 @@ internal sealed class AppDbContext : DbContext
    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/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/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/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
+++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
@@ -13,7 +13,7 @@
  <Identity
    Name="60568DGPStudio.SnapHutao"
    Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.9.9.0" />
+    Version="1.9.8.0" />

  <Properties>
    <DisplayName>Snap Hutao</DisplayName>
--- a/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest
+++ b/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest
@@ -13,7 +13,7 @@
  <Identity
    Name="60568DGPStudio.SnapHutaoDev"
    Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.9.9.0" />
+    Version="1.9.8.0" />

  <Properties>
    <DisplayName>Snap Hutao Dev</DisplayName>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx
@@ -60,45 +60,45 @@
            : and then encoded with base64 encoding.
    -->
  <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string"/>
-              <xsd:attribute name="type" type="xsd:string"/>
-              <xsd:attribute name="mimetype" type="xsd:string"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string"/>
-              <xsd:attribute name="name" type="xsd:string"/>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
-              <xsd:attribute ref="xml:space"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required"/>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
@@ -2345,9 +2345,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>Enter your HoYoLab UID</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>You are using an embedded webview to login to your MiHoYo passport account, the client will fetch the Cookie data when you click on I'm Signed in button. All network communication initialed in this webview occurs only between your computer and MiHoYo official servers.</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>I'm logged in</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>Simpan</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>Invalid Url</value>
  </data>
@@ -2345,9 +2342,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>Masukkan UID HoYoLab Anda</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>Saya sudah masuk</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>保存</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>無効なURL</value>
  </data>
@@ -2345,9 +2342,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>HoYoLab UIDを入力してください</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>ログインしました</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>저장</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>잘못된 Uri</value>
  </data>
@@ -2345,9 +2342,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>HoYoLab Uid를 입력하세요</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>로그인됨</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>Salvar</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>Uri inválido</value>
  </data>
@@ -2345,9 +2342,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>Digite seu UID do HoYoLab</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>Estou conectado</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
@@ -2345,9 +2345,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>请输入你的 HoYoLab Uid</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>我已登录</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>Сохранить</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>Ошибка ссылки</value>
  </data>
@@ -2345,9 +2342,6 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>请输入你的 HoYoLab Uid</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>我已登录</value>
  </data>
--- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx
+++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx
@@ -121,7 +121,7 @@
    <value>胡桃 Dev {0}</value>
  </data>
  <data name="AppElevatedDevNameAndVersion" xml:space="preserve">
-    <value>胡桃Dev {0} [系統管理员]</value>
+    <value>胡桃Dev {0} [管理员]</value>
  </data>
  <data name="AppElevatedNameAndVersion" xml:space="preserve">
    <value>胡桃 {0} [系統管理員]</value>
@@ -144,9 +144,6 @@
  <data name="ContentDialogSavePrimaryButtonText" xml:space="preserve">
    <value>儲存</value>
  </data>
-  <data name="ControlAutoSuggestBoxNotFoundValue" xml:space="preserve">
-    <value>未找到结果</value>
-  </data>
  <data name="ControlImageCachedImageInvalidResourceUri" xml:space="preserve">
    <value>無效的 Uri</value>
  </data>
@@ -169,7 +166,7 @@
    <value>用户數據已損壞：{0}</value>
  </data>
  <data name="CoreIOPickerExtensionPickerExceptionInfoBarMessage" xml:space="preserve">
-    <value>請勿在系統管理員模式下使用此功能 {0}</value>
+    <value>請勿在管理員模式下使用此功能 {0}</value>
  </data>
  <data name="CoreIOPickerExtensionPickerExceptionInfoBarTitle" xml:space="preserve">
    <value>無法打開文件選擇器</value>
@@ -277,7 +274,7 @@
    <value>尚未重新整理</value>
  </data>
  <data name="ModelEntityDailyNoteRefreshTimeFormat" xml:space="preserve">
-    <value>重新整理於 {0:MM.dd HH:mm:ss}</value>
+    <value>重新整理于 {0:MM.dd HH:mm:ss}</value>
  </data>
  <data name="ModelEntitySpiralAbyssScheduleFormat" xml:space="preserve">
    <value>第 {0} 期</value>
@@ -543,28 +540,28 @@
    <value>必须登入 米遊社/HoYoLAB 並選定一個用戶與角色</value>
  </data>
  <data name="ServerGachaLogServiceDeleteEntrySucceed" xml:space="preserve">
-    <value>刪除了 UID：{0} 的 {1} 筆祈願記錄</value>
+    <value>刪除了 Uid：{0} 的 {1} 筆祈願記錄</value>
  </data>
  <data name="ServerGachaLogServiceInsufficientRecordSlot" xml:space="preserve">
-    <value>胡桃雲儲存的祈願記錄存檔數已達當前帳號上限</value>
+    <value>胡桃雲保存的祈願記錄存檔數已達當前帳號上限</value>
  </data>
  <data name="ServerGachaLogServiceInsufficientTime" xml:space="preserve">
    <value>未開通祈願紀錄上傳服務或已到期</value>
  </data>
  <data name="ServerGachaLogServiceInvalidGachaLogData" xml:space="preserve">
-    <value>祈願數據存在無效的物品，無法儲存至胡桃雲</value>
+    <value>祈願數據存在無效的物品，無法保存至胡桃雲</value>
  </data>
  <data name="ServerGachaLogServiceServerDatabaseError" xml:space="preserve">
-    <value>數據異常，無法儲存至雲端，請勿跨帳號上傳或嘗試删除雲端數據後重試</value>
+    <value>數據異常，無法保存至雲端，請勿跨帳號上傳或嘗試删除雲端數據後重試</value>
  </data>
  <data name="ServerGachaLogServiceUploadEntrySucceed" xml:space="preserve">
-    <value>上傳了 UID：{0} 的 {1} 筆祈願記錄，儲存了 {2} 筆</value>
+    <value>上傳了 Uid：{0} 的 {1} 筆祈願記錄，儲存了 {2} 筆</value>
  </data>
  <data name="ServerPassportLoginRequired" xml:space="preserve">
-    <value>請先登入或注冊胡桃帳號</value>
+    <value>請先登錄或注冊胡桃帳號</value>
  </data>
  <data name="ServerPassportLoginSucceed" xml:space="preserve">
-    <value>登入成功</value>
+    <value>登錄成功</value>
  </data>
  <data name="ServerPassportRegisterSucceed" xml:space="preserve">
    <value>註冊成功</value>
@@ -597,7 +594,7 @@
    <value>驗證失敗</value>
  </data>
  <data name="ServerPassportVerifyRequestNotCurrentUser" xml:space="preserve">
-    <value>驗證請求失敗，不是當前登入的帳號</value>
+    <value>驗證請求失敗，不是當前登錄的帳號</value>
  </data>
  <data name="ServerPassportVerifyRequestSuccess" xml:space="preserve">
    <value>驗證碼已發送至郵箱</value>
@@ -609,7 +606,7 @@
    <value>驗證請求過快，請 1 分鐘後再試</value>
  </data>
  <data name="ServerRecordBannedUid" xml:space="preserve">
-    <value>上傳深淵記錄失敗，當前 UID 已被胡桃數據庫封禁</value>
+    <value>上傳深淵記錄失敗，當前 Uid 已被胡桃數據庫封禁</value>
  </data>
  <data name="ServerRecordComputingStatistics" xml:space="preserve">
    <value>上傳深淵記錄失敗，正在計算統計數據</value>
@@ -624,19 +621,19 @@
    <value>上傳深淵記錄失敗，存在無效的數據</value>
  </data>
  <data name="ServerRecordInvalidUid" xml:space="preserve">
-    <value>無效的 UID</value>
+    <value>無效的 Uid</value>
  </data>
  <data name="ServerRecordNotCurrentSchedule" xml:space="preserve">
    <value>上傳深淵記錄失敗，不是本期數據</value>
  </data>
  <data name="ServerRecordPreviousRequestNotCompleted" xml:space="preserve">
-    <value>上傳深淵記錄失敗，當前 UID 的紀錄仍在處理中，請勿重複操作</value>
+    <value>上傳深淵記錄失敗，當前 Uid 的紀錄仍在處理中，請勿重複操作</value>
  </data>
  <data name="ServerRecordUploadSuccessAndGachaLogServiceTimeExtended" xml:space="preserve">
    <value>上傳深淵記錄成功，獲贈祈願記錄上傳服務時長</value>
  </data>
  <data name="ServerRecordUploadSuccessButNoPassport" xml:space="preserve">
-    <value>上傳深淵記錄成功，但未登入胡桃通行證，無法獲贈祈願記錄上傳服務時長</value>
+    <value>上傳深淵記錄成功，但未登錄胡桃通行證，無法獲贈祈願記錄上傳服務時長</value>
  </data>
  <data name="ServerRecordUploadSuccessButNoSuchUser" xml:space="preserve">
    <value>上傳深淵記錄成功，但無法找到使用者，無法獲贈祈願記錄上傳服務時長</value>
@@ -765,19 +762,19 @@
    <comment>Need EXACT same string in game</comment>
  </data>
  <data name="ServiceAvatarInfoSummaryCalculatorNotRefreshed" xml:space="preserve">
-    <value>養成計算：尚未重新整理</value>
+    <value>養成計算：尚未刷新</value>
  </data>
  <data name="ServiceAvatarInfoSummaryCalculatorRefreshTimeFormat" xml:space="preserve">
    <value>養成計算：{0:MM-dd HH:mm}</value>
  </data>
  <data name="ServiceAvatarInfoSummaryGameRecordNotRefreshed" xml:space="preserve">
-    <value>原神戰績：尚未重新整理</value>
+    <value>原神戰績：尚未更新</value>
  </data>
  <data name="ServiceAvatarInfoSummaryGameRecordRefreshTimeFormat" xml:space="preserve">
    <value>原神戰績：{0:MM-dd HH:mm}</value>
  </data>
  <data name="ServiceAvatarInfoSummaryShowcaseNotRefreshed" xml:space="preserve">
-    <value>角色櫥窗：尚未重新整理</value>
+    <value>角色櫥窗：尚未刷新</value>
  </data>
  <data name="ServiceAvatarInfoSummaryShowcaseRefreshTimeFormat" xml:space="preserve">
    <value>角色櫥窗：{0:MM-dd HH:mm}</value>
@@ -798,7 +795,7 @@
    <value>無背景圖片</value>
  </data>
  <data name="ServiceCultivationProjectCurrentUserdataCourrpted" xml:space="preserve">
-    <value>儲存養成計劃狀態失敗</value>
+    <value>保存養成計劃狀態失敗</value>
  </data>
  <data name="ServiceCultivationProjectCurrentUserdataCourrpted2" xml:space="preserve">
    <value>存在多個選中的養成計劃</value>
@@ -852,7 +849,7 @@
    <value>準備完成</value>
  </data>
  <data name="ServiceDailyNoteNotifierTransformerHint" xml:space="preserve">
-    <value>參數質變儀已準備完成</value>
+    <value>參量質變儀已準備完成</value>
  </data>
  <data name="ServiceDiscordActivityElevationRequiredHint" xml:space="preserve">
    <value>權限不足，將無法為您設定 Discord Activity 狀態</value>
@@ -882,7 +879,7 @@
    <value>神鑄賦形</value>
  </data>
  <data name="ServiceGachaLogHutaoCloudEndIdFetchFailed" xml:space="preserve">
-    <value>獲取雲端祈願紀錄失敗</value>
+    <value>獲取祈願紀錄失敗</value>
  </data>
  <data name="ServiceGachaLogHutaoCloudServiceNotAllowed" xml:space="preserve">
    <value>祈願記錄上傳服務不可用</value>
@@ -900,19 +897,19 @@
    <value>找不到原神內置瀏覽器緩存路徑：\n{0}</value>
  </data>
  <data name="ServiceGachaLogUrlProviderCacheUrlNotFound" xml:space="preserve">
-    <value>找不到可用的 URL</value>
+    <value>找不到可用的 Url</value>
  </data>
  <data name="ServiceGachaLogUrlProviderManualInputInvalid" xml:space="preserve">
-    <value>提供的 URL 無效</value>
+    <value>提供的 Url 無效</value>
  </data>
  <data name="ServiceGachaLogUrlProviderStokenUnsupported" xml:space="preserve">
-    <value>HoYoLAB 賬號不支持使用 SToken 重新整理祈願記錄</value>
+    <value>HoYoLAB 賬號不支持使用 SToken 刷新祈願記錄</value>
  </data>
  <data name="ServiceGachaLogUrlProviderUrlLanguageNotMatchCurrentLocale" xml:space="preserve">
-    <value>URL 中的語言：{0} 與胡桃的語言：{1} 不對應，請切換到對應語言重試</value>
+    <value>Url 中的語言：{0} 與胡桃的語言：{1} 不對應，請切換到對應語言重試</value>
  </data>
  <data name="ServiceGachaStatisticsFactoryItemIdInvalid" xml:space="preserve">
-    <value>不支持的 Item Id：{0}</value>
+    <value>不支持的 Item Id: {0}</value>
  </data>
  <data name="ServiceGachaUIGFImportLanguageNotMatch" xml:space="preserve">
    <value>UIGF 文件的語言：{0} 與胡桃的語言：{1} 不對應，請切換到對應語言重試</value>
@@ -924,7 +921,7 @@
    <value>文件系統權限不足，無法轉換伺服器</value>
  </data>
  <data name="ServiceGameEnsureGameResourceQueryResourceInformation" xml:space="preserve">
-    <value>下載遊戲資源索引</value>
+    <value>下载游戏资源索引</value>
  </data>
  <data name="ServiceGameFileOperationExceptionMessage" xml:space="preserve">
    <value>遊戲檔案操作失敗：{0}</value>
@@ -939,7 +936,7 @@
    <value>請選擇遊戲路徑</value>
  </data>
  <data name="ServiceGameLaunchExecutionGameResourceQueryIndexFailed" xml:space="preserve">
-    <value>下載遊戲資源索引失敗: {0}</value>
+    <value>下载游戏资源索引失败: {0}</value>
  </data>
  <data name="ServiceGameLaunchPhaseProcessExited" xml:space="preserve">
    <value>遊戲進程已退出</value>
@@ -999,13 +996,13 @@
    <value>無法找到遊戲本體路徑，請前往設定修改</value>
  </data>
  <data name="ServiceGameRegisteryInteropLongPathsDisabled" xml:space="preserve">
-    <value>未開啟長路徑功能，無法設定註冊表鍵值</value>
+    <value>未開啓長路徑功能，無法設定注冊表鍵值</value>
  </data>
  <data name="ServiceGameSetMultiChannelConfigFileNotFound" xml:space="preserve">
    <value>無法讀取遊戲設定檔 {0}，可能是檔案不存在</value>
  </data>
  <data name="ServiceGameSetMultiChannelUnauthorizedAccess" xml:space="preserve">
-    <value>無法讀取或儲存配置文件，請用系統管理員模式重試</value>
+    <value>無法讀取或保存配置文件，請用管理員模式重試</value>
  </data>
  <data name="ServiceGameUnlockerFindModuleNoModuleFound" xml:space="preserve">
    <value>在尋找必要的模組時遇到問題：無法讀取任何模組，可能是保護驅動已經載入完成，請重試</value>
@@ -1050,13 +1047,13 @@
    <value>獲取簽到次數失敗</value>
  </data>
  <data name="ServiceSignInRewardListRequestFailed" xml:space="preserve">
-    <value>獲取獎勵清單失敗</value>
+    <value>獲取獎勵列表失敗</value>
  </data>
  <data name="ServiceSignInRiskVerificationFailed" xml:space="preserve">
-    <value>驗證失敗，請前往HoYoLAB原神簽到頁面自行領取獎勵</value>
+    <value>驗證失敗，請前往HoYoLab原神簽到頁面自行領取獎勵</value>
  </data>
  <data name="ServiceSignInSuccessRewardFormat" xml:space="preserve">
-    <value>簽到成功，{0}×{1}</value>
+    <value>遷到成功，{0}×{1}</value>
  </data>
  <data name="ServiceUIGFImportUnsupportedVersion" xml:space="preserve">
    <value>不支援的 UIGF 版本</value>
@@ -1068,13 +1065,13 @@
    <value>已选中多条用户记录</value>
  </data>
  <data name="ServiceUserCurrentUpdateAndSaveFailed" xml:space="preserve">
-    <value>用戶 {0} 狀態儲存失敗</value>
+    <value>用戶 {0} 狀態保存失敗</value>
  </data>
  <data name="ServiceUserProcessCookieNoMid" xml:space="preserve">
-    <value>輸入的 Cookie 中必須包含 Mid</value>
+    <value>Mid 必須包含在輸入的 Cookie 中</value>
  </data>
  <data name="ServiceUserProcessCookieNoSToken" xml:space="preserve">
-    <value>輸入的 Cookie 中必須包含 SToken</value>
+    <value>輸入的 Cookie 中必須包含 Stoken 字段</value>
  </data>
  <data name="ServiceUserProcessCookieRequestUserInfoFailed" xml:space="preserve">
    <value>輸入的 Cookie 無法獲取用戶信息</value>
@@ -1107,7 +1104,7 @@
    <value>突破後</value>
  </data>
  <data name="ViewControlElevationText" xml:space="preserve">
-    <value>需要系統管理員權限</value>
+    <value>需要管理者權限</value>
  </data>
  <data name="ViewControlLoadingText" xml:space="preserve">
    <value>加載中，請等候</value>
@@ -1236,10 +1233,10 @@
    <value>參數質變儀提醒</value>
  </data>
  <data name="ViewDialogDailyNoteWebhookUrlInputPlaceholder" xml:space="preserve">
-    <value>請輸入 URL</value>
+    <value>請輸入 Url</value>
  </data>
  <data name="ViewDialogDailyNoteWebhookUrlTitle" xml:space="preserve">
-    <value>即時便箋 Webhook URL</value>
+    <value>即時便箋 Webhook Url</value>
  </data>
  <data name="ViewDialogFeedbackEnableLoopbackContent" xml:space="preserve">
    <value>解除限制後需使用其他工具恢復限制</value>
@@ -1260,13 +1257,13 @@
    <value>獲取祈願物品中</value>
  </data>
  <data name="ViewDialogGachaLogUrlInputPlaceholder" xml:space="preserve">
-    <value>請輸入 URL</value>
+    <value>請輸入 Url</value>
  </data>
  <data name="ViewDialogGachaLogUrlTitle" xml:space="preserve">
-    <value>手動輸入祈願記錄 URL</value>
+    <value>手動輸入祈願記錄 Url</value>
  </data>
  <data name="ViewDialogGeetestCustomUrlCompositInputHint" xml:space="preserve">
-    <value>請輸入請求接口的 URL 複合模板</value>
+    <value>請輸入請求接口的 Url 複合模板</value>
  </data>
  <data name="ViewDialogGeetestCustomUrlReturnDataDescription1" xml:space="preserve">
    <value>接口需要返回形如上方所示的 Json 數據，多餘的數據會被忽略</value>
@@ -1296,7 +1293,7 @@
    <value>登入胡桃通行證</value>
  </data>
  <data name="ViewDialogHutaoPassportRegisterTitle" xml:space="preserve">
-    <value>註冊胡桃通行證</value>
+    <value>建立胡桃通行證用戶</value>
  </data>
  <data name="ViewDialogHutaoPassportResetPasswordTitle" xml:space="preserve">
    <value>重設胡桃通行證用戶密碼</value>
@@ -1350,7 +1347,7 @@
    <value>你正在啟用一個危險功能</value>
  </data>
  <data name="ViewDialogSettingDeleteUserDataContent" xml:space="preserve">
-    <value>該操作是不可逆，所有用戶登入狀態會遺失</value>
+    <value>該操作是不可逆，所有用戶登錄狀態會遺失</value>
  </data>
  <data name="ViewDialogSettingDeleteUserDataTitle" xml:space="preserve">
    <value>是否永久刪除用戶數據</value>
@@ -1398,7 +1395,7 @@
    <value>環境</value>
  </data>
  <data name="ViewGuideStepEnvironmentAfterInstallDescription" xml:space="preserve">
-    <value>安裝完成後重新啟動胡桃以查看是否正常生效</value>
+    <value>安裝完成後重啟胡桃以查看是否正常生效</value>
  </data>
  <data name="ViewGuideStepEnvironmentFontDescription1" xml:space="preserve">
    <value>如果上方的圖標中存在亂碼，請前往</value>
@@ -1410,7 +1407,7 @@
    <value>若未檢測到 WebView2 Runtime信息，可以前往</value>
  </data>
  <data name="ViewGuideStepEnvironmentWebView2Description2" xml:space="preserve">
-    <value>下載並自行安裝運行時</value>
+    <value>下載並自行安裝Runtime</value>
  </data>
  <data name="ViewGuideStepLanguage" xml:space="preserve">
    <value>語言</value>
@@ -1428,7 +1425,7 @@
    <value>啟動遊戲</value>
  </data>
  <data name="ViewListViewDragElevatedHint" xml:space="preserve">
-    <value>系統管理員模式下無法拖動排序</value>
+    <value>管理員模式下無法拖動排序</value>
  </data>
  <data name="ViewModelAchievementArchiveAdded" xml:space="preserve">
    <value>存檔 [{0}] 添加成功</value>
@@ -1509,7 +1506,7 @@
    <value>不能新增名稱無效的計劃</value>
  </data>
  <data name="ViewModelDailyNoteConfigWebhookUrlComplete" xml:space="preserve">
-    <value>即時便箋 Webhook URL 配置成功</value>
+    <value>即時便箋 Webhook Url 配置成功</value>
  </data>
  <data name="ViewModelDailyNoteHoyolabVerificationUnsupported" xml:space="preserve">
    <value>HoYoLAB 賬號不支持驗證實时便箋</value>
@@ -1575,7 +1572,7 @@
    <value>獲取祈願紀錄失敗</value>
  </data>
  <data name="ViewModelGachaLogRefreshOperationCancel" xml:space="preserve">
-    <value>祈願紀錄重新整理操作被異常取消</value>
+    <value>祈願紀錄刷新操作被異常取消</value>
  </data>
  <data name="ViewModelGachaLogRemoveArchiveDescription" xml:space="preserve">
    <value>該操作是不可逆的，該存檔和其內的所有祈願紀錄會丟失</value>
@@ -1632,7 +1629,7 @@
    <value>無法讀取遊戲設定檔案: {0}，可能是檔案不存在或權限不足</value>
  </data>
  <data name="ViewModelLaunchGamePathInvalid" xml:space="preserve">
-    <value>遊戲程式路徑不正確，前往設定更改遊戲路徑</value>
+    <value>游戲程式路徑不正確，前往設定更改遊戲路徑</value>
  </data>
  <data name="ViewModelLaunchGameSchemeNotSelected" xml:space="preserve">
    <value>還未選擇任何伺服器</value>
@@ -1647,7 +1644,7 @@
    <value>操作完成</value>
  </data>
  <data name="ViewModelSettingClearWebCacheFail" xml:space="preserve">
-    <value>清除失敗，文件目錄權限不足，請使用系統管理員模式重試</value>
+    <value>清除失敗，文件目錄權限不足，請使用管理員模式重試</value>
  </data>
  <data name="ViewModelSettingClearWebCachePathInvalid" xml:space="preserve">
    <value>清除失敗，找不到目錄：{0}</value>
@@ -1671,10 +1668,10 @@
    <value>已使用磁碟空間：{0}</value>
  </data>
  <data name="ViewModelSettingGeetestCustomUrlSucceed" xml:space="preserve">
-    <value>無感驗證復合 URL 配置成功</value>
+    <value>無感驗證復合 Url 配置成功</value>
  </data>
  <data name="ViewModelSettingSetDataFolderSuccess" xml:space="preserve">
-    <value>設置數據目錄成功，重新啟動以應用更改</value>
+    <value>設置數據目錄成功，重啓以應用更改</value>
  </data>
  <data name="ViewModelSettingSetGamePathDatabaseFailedTitle" xml:space="preserve">
    <value>儲存遊戲路徑失敗</value>
@@ -1740,7 +1737,7 @@
    <value>刪除當前存檔</value>
  </data>
  <data name="ViewPageAchievementSearchPlaceholder" xml:space="preserve">
-    <value>搜尋成就名稱，描述，版本或編號</value>
+    <value>搜索成就名稱，描述，版本或編號</value>
  </data>
  <data name="ViewPageAchievementSortIncompletedItemsFirst" xml:space="preserve">
    <value>優先未完成</value>
@@ -1800,7 +1797,7 @@
    <value>同步角色天賦外的大部分信息</value>
  </data>
  <data name="ViewPageAvatarPropertyRefreshTimeToggle" xml:space="preserve">
-    <value>重新整理時間</value>
+    <value>刷新時間</value>
  </data>
  <data name="ViewPageAvatarPropertyScore" xml:space="preserve">
    <value>評分</value>
@@ -1812,13 +1809,13 @@
    <value>養成計算</value>
  </data>
  <data name="ViewPageCultivationAddProject" xml:space="preserve">
-    <value>新增計劃</value>
+    <value>新建計劃</value>
  </data>
  <data name="ViewPageCultivationAddProjectAction" xml:space="preserve">
    <value>新增</value>
  </data>
  <data name="ViewPageCultivationAddProjectContinue" xml:space="preserve">
-    <value>新增養成計劃以繼續</value>
+    <value>新建養成計劃以繼續</value>
  </data>
  <data name="ViewPageCultivationAddProjectDescription" xml:space="preserve">
    <value>稍後可以前往其他頁面添加養成計劃條目</value>
@@ -1866,7 +1863,7 @@
    <value>歷練點獲取詳情</value>
  </data>
  <data name="ViewPageDailyNoteConfigWebhookDescription" xml:space="preserve">
-    <value>在即時便箋重新整理之後推送到指定的 Webhook</value>
+    <value>在即時便箋重整之後推送到指定的 Webhook</value>
  </data>
  <data name="ViewPageDailyNoteConfigWebhookHeader" xml:space="preserve">
    <value>配置 Webhook</value>
@@ -1899,13 +1896,13 @@
    <value>本周已消耗減半次數</value>
  </data>
  <data name="ViewPageDailyNoteSettingAutoRefresh" xml:space="preserve">
-    <value>自動重新整理</value>
+    <value>自動刷新</value>
  </data>
  <data name="ViewPageDailyNoteSettingAutoRefreshDescription" xml:space="preserve">
-    <value>間隔選定的時間後重新整理添加的實時便箋</value>
+    <value>間隔選定的時間後刷新添加的實時便箋</value>
  </data>
  <data name="ViewPageDailyNoteSettingRefreshElevatedHint" xml:space="preserve">
-    <value>這些選項僅允許在非系統管理員模式下更改</value>
+    <value>這些選項僅允許在非管理員模式下更改</value>
  </data>
  <data name="ViewPageDailyNoteSettingRefreshHeader" xml:space="preserve">
    <value>重新整理</value>
@@ -1962,7 +1959,7 @@
    <value>胡桃服務</value>
  </data>
  <data name="ViewPageGachaLogAggressiveRefresh" xml:space="preserve">
-    <value>全量式重新整理</value>
+    <value>全量式重整</value>
  </data>
  <data name="ViewPageGachaLogExportAction" xml:space="preserve">
    <value>匯出</value>
@@ -2022,22 +2019,22 @@
    <value>獲取</value>
  </data>
  <data name="ViewPageGachaLogRefreshByManualInput" xml:space="preserve">
-    <value>手動輸入 URL</value>
+    <value>手動輸入 Url</value>
  </data>
  <data name="ViewPageGachaLogRefreshByManualInputDescription" xml:space="preserve">
-    <value>使用由你提供的 URL 重新整理祈願記錄</value>
+    <value>使用由你提供的 Url 刷新祈願記錄</value>
  </data>
  <data name="ViewPageGachaLogRefreshBySToken" xml:space="preserve">
-    <value>SToken 重新整理</value>
+    <value>SToken 重整</value>
  </data>
  <data name="ViewPageGachaLogRefreshBySTokenDescription" xml:space="preserve">
-    <value>使用當前用戶的 Cookie 信息重新整理祈願紀錄</value>
+    <value>使用當前用戶的 Cookie 信息刷新祈願紀錄</value>
  </data>
  <data name="ViewPageGachaLogRefreshByWebCache" xml:space="preserve">
-    <value>網頁緩存重新整理</value>
+    <value>網頁緩存刷新</value>
  </data>
  <data name="ViewPageGachaLogRefreshByWebCacheDescription" xml:space="preserve">
-    <value>使用遊戲內瀏覽器的網頁快取重新整理祈願紀錄</value>
+    <value>使用遊戲內瀏覽器的網頁快取刷新祈願紀錄</value>
  </data>
  <data name="ViewPageGachaLogRemoveArchiveAction" xml:space="preserve">
    <value>刪除當前存檔</value>
@@ -2121,7 +2118,7 @@
    <value>上傳記錄總數</value>
  </data>
  <data name="ViewPageHutaoDatabaseOverviewRefreshTime" xml:space="preserve">
-    <value>數據重新整理時間</value>
+    <value>數據刷新時間</value>
  </data>
  <data name="ViewPageHutaoDatabaseOverviewSpiralAbyss" xml:space="preserve">
    <value>深淵數據統計</value>
@@ -2154,7 +2151,7 @@
    <value>至少需要八個字元</value>
  </data>
  <data name="ViewPageHutaoPassportRegisterHeader" xml:space="preserve">
-    <value>註冊</value>
+    <value>建立帳號</value>
  </data>
  <data name="ViewPageHutaoPassportResetPasswordHeader" xml:space="preserve">
    <value>重設密碼</value>
@@ -2196,7 +2193,7 @@
    <value>啟用內置觸摸布局，不會響應鍵鼠輸入</value>
  </data>
  <data name="ViewPageLaunchGameAppearanceExclusiveDescription" xml:space="preserve">
-    <value>與遊戲内瀏覽器不兼容，切屏等操作也能使遊戲閃退</value>
+    <value>與游戲内瀏覽器不兼容，切屏等操作也能使游戲閃退</value>
  </data>
  <data name="ViewPageLaunchGameAppearanceExclusiveHeader" xml:space="preserve">
    <value>獨占全屏</value>
@@ -2238,7 +2235,7 @@
    <value>一般</value>
  </data>
  <data name="ViewPageLaunchGameConfigurationSaveHint" xml:space="preserve">
-    <value>所有選項盡會在啟動遊戲成功後儲存</value>
+    <value>所有選項盡會在啓動游戲成功後保存</value>
  </data>
  <data name="ViewPageLaunchGameDiscordActivityDescription" xml:space="preserve">
    <value>在我遊戲時設定 Discord Activity 狀態</value>
@@ -2345,14 +2342,11 @@
  <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
    <value>請輸入您的 HoYoLAB UID</value>
  </data>
-  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
-  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
-    <value>我已登入</value>
+    <value>我已登錄</value>
  </data>
  <data name="ViewPageLoginMihoyoUserTitle" xml:space="preserve">
-    <value>在下方登入 miHoYo 通行證賬號</value>
+    <value>在下方登錄 MiHoYo 通行證賬號</value>
  </data>
  <data name="ViewPageOpenScreenshotFolderAction" xml:space="preserve">
    <value>開啟截圖資料夾</value>
@@ -2382,7 +2376,7 @@
    <value>圖片版權訊息</value>
  </data>
  <data name="ViewPageSettingBackgroundImageDescription" xml:space="preserve">
-    <value>更改視窗的背景圖片來源，重新啟動胡桃以盡快生效</value>
+    <value>更改視窗的背景圖片來源，重啟胡桃以盡快生效</value>
  </data>
  <data name="ViewPageSettingBackgroundImageHeader" xml:space="preserve">
    <value>背景圖片</value>
@@ -2430,7 +2424,7 @@
    <value>刪除</value>
  </data>
  <data name="ViewPageSettingDeleteCacheDescription" xml:space="preserve">
-    <value>若祈願紀錄緩存重新整理頻繁提示驗證密鑰過期，可以嘗試此操作</value>
+    <value>若祈願紀錄緩存刷新頻繁提示驗證密鑰過期，可以嘗試此操作</value>
  </data>
  <data name="ViewPageSettingDeleteCacheHeader" xml:space="preserve">
    <value>刪除游戲内網頁緩存</value>
@@ -2457,7 +2451,7 @@
    <value>系統管理員模式</value>
  </data>
  <data name="ViewPageSettingElevatedModeRestartAction" xml:space="preserve">
-    <value>以系統管理員身分重新啟動</value>
+    <value>以系統管理員身分重啟動</value>
  </data>
  <data name="ViewPageSettingEmptyHistoryVisibleDescription" xml:space="preserve">
    <value>在祈願紀錄頁面顯示或隱藏無記錄的歷史祈願活動</value>
@@ -2472,7 +2466,7 @@
    <value>顯示</value>
  </data>
  <data name="ViewPageSettingFeaturesDangerousHint" xml:space="preserve">
-    <value>您解鎖了含有違反原神服務條款風險的「啟動遊戲-進階功能」，將自行承擔任何不良後果。</value>
+    <value>您解鎖了含有違反原神服務條款風險的「啟動遊戲-高級功能」，將自行承擔任何不良後果。</value>
  </data>
  <data name="ViewPageSettingFeedbackNavigate" xml:space="preserve">
    <value>前往反饋</value>
@@ -2538,7 +2532,7 @@
    <value>胡桃雲服務到期時間</value>
  </data>
  <data name="ViewPageSettingHutaoPassportHeader" xml:space="preserve">
-    <value>胡桃通行證帳號</value>
+    <value>胡桃雲通行證帳號</value>
  </data>
  <data name="ViewPageSettingHutaoPassportLicensedDeveloperDescription" xml:space="preserve">
    <value>您可以無限制使用任何基於胡桃雲服務的功能</value>
@@ -2565,7 +2559,7 @@
    <value>使用兌換碼</value>
  </data>
  <data name="ViewPageSettingHutaoPassportRegisterAction" xml:space="preserve">
-    <value>註冊</value>
+    <value>建立帳號</value>
  </data>
  <data name="ViewPageSettingHutaoPassportResetPasswordAction" xml:space="preserve">
    <value>重設密碼</value>
@@ -2574,10 +2568,10 @@
    <value>刪除帳號</value>
  </data>
  <data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledDescription" xml:space="preserve">
-    <value>在完整閱讀原神和胡桃工具箱使用者協定後，我選擇啟用「啟動遊戲 - 進階功能」</value>
+    <value>在完整閱讀原神和胡桃工具箱使用者協定後，我選擇啟用「啟動遊戲 - 高級功能」</value>
  </data>
  <data name="ViewPageSettingIsAdvancedLaunchOptionsEnabledHeader" xml:space="preserve">
-    <value>進階功能</value>
+    <value>啟動高級功能</value>
  </data>
  <data name="ViewPageSettingKeyShortcutAutoClickingDescription" xml:space="preserve">
    <value>更改自動連續點按功能的快速鍵</value>
@@ -2607,10 +2601,10 @@
    <value>重設圖片資源</value>
  </data>
  <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsDescription" xml:space="preserve">
-    <value>在啟動遊戲頁面的程序部分加入解鎖 FPS 限制選項</value>
+    <value>在啟動遊戲頁面的程序部分加入解鎖幀率限制選項</value>
  </data>
  <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsHeader" xml:space="preserve">
-    <value>啟動遊戲-解鎖 FPS 限制</value>
+    <value>啟動遊戲-解鎖幀率限制</value>
  </data>
  <data name="ViewPageSettingSetDataFolderDescription" xml:space="preserve">
    <value>更改目錄后需要手動移動目錄内的數據，否則會重新創建用戶數據</value>
@@ -2748,7 +2742,7 @@
    <value>登入失敗，請重新登入</value>
  </data>
  <data name="ViewServiceHutaoUserLoginOrRegisterHint" xml:space="preserve">
-    <value>立即登入或註冊</value>
+    <value>立即登入或建立帳號</value>
  </data>
  <data name="ViewSettingAllocConsoleDescription" xml:space="preserve">
    <value>控制胡桃啟動時是否開啟主控台，重新啟動後生效</value>
@@ -2817,7 +2811,7 @@
    <value>重新整理數據</value>
  </data>
  <data name="ViewSpiralAbyssRefreshDescription" xml:space="preserve">
-    <value>同步 HoYoLAB 的深淵挑戰記錄</value>
+    <value>同步 HoYo-LAB 的深淵挑戰記錄</value>
  </data>
  <data name="ViewSpiralAbyssReveal" xml:space="preserve">
    <value>出戰次數</value>
@@ -2886,10 +2880,10 @@
    <value>尚未登入</value>
  </data>
  <data name="ViewUserRefreshCookieTokenSuccess" xml:space="preserve">
-    <value>重新整理 CookieToken 成功</value>
+    <value>更新 CookieToken 成功</value>
  </data>
  <data name="ViewUserRefreshCookieTokenWarning" xml:space="preserve">
-    <value>重新整理 CookieToken 失敗</value>
+    <value>更新 CookieToken 失敗</value>
  </data>
  <data name="ViewUserRemoveAction" xml:space="preserve">
    <value>移除用戶</value>
@@ -3036,7 +3030,7 @@
    <value>尚未獲得</value>
  </data>
  <data name="WebDailyNoteTransformerNotObtainedDetail" xml:space="preserve">
-    <value>尚未獲得參數質變儀</value>
+    <value>尚未獲得參量質變儀</value>
  </data>
  <data name="WebDailyNoteTransformerNotReached" xml:space="preserve">
    <value>冷卻中</value>
@@ -3129,7 +3123,7 @@
    <value>狀態：{0} | 信息：{1}</value>
  </data>
  <data name="WebResponseRefreshCookieHintFormat" xml:space="preserve">
-    <value>請重新整理 Cookie，原始消息：{0}</value>
+    <value>請更新 Cookie，原始消息：{0}</value>
  </data>
  <data name="WebResponseRequestExceptionFormat" xml:space="preserve">
    <value>[{0}] 中的 [{1}] 網路請求異常，請稍後再試</value>
--- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs
@@ -126,7 +126,10 @@ internal sealed partial class CultivationService : ICultivationService

        token.ThrowIfCancellationRequested();

-        return resultItems.SortBy(item => item.Inner.Id, MaterialIdComparer.Shared).ToObservableCollection();
+        return resultItems
+            .OrderByDescending(i => i.TotalCount)
+            .ThenByDescending(i => i.Count)
+            .ToObservableCollection();
    }

    /// <inheritdoc/>
--- a/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Cultivation/MaterialIdComparer.cs
@@ -1,40 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.Cultivation;
-
-namespace Snap.Hutao.Service.Cultivation;
-
-internal sealed class MaterialIdComparer : IComparer<MaterialId>
-{
-    private static readonly Lazy<MaterialIdComparer> LazyShared = new(() => new());
-
-    public static MaterialIdComparer Shared { get => LazyShared.Value; }
-
-    public int Compare(MaterialId x, MaterialId y)
-    {
-        return Transform(x).CompareTo(Transform(y));
-    }
-
-    private static uint Transform(MaterialId value)
-    {
-        return value.Value switch
-        {
-            // 摩拉
-            202U => 0U,
-
-            // 经验
-            104001U => 1U,
-            104002U => 2U,
-            104003U => 3U,
-
-            // 魔矿
-            104011U => 4U,
-            104012U => 5U,
-            104013U => 6U,
-
-            _ => value,
-        };
-    }
-}
--- a/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs
@@ -5,7 +5,6 @@ using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Cultivation;

 namespace Snap.Hutao.Service.Metadata.ContextAbstraction;

@@ -68,7 +67,7 @@ internal static class MetadataServiceContextExtension
 #pragma warning disable SH002
    public static IEnumerable<Material> EnumerateInventoryMaterial(this IMetadataListMaterialSource context)
    {
-        return context.Materials.Where(m => m.IsInventoryItem()).OrderBy(m => m.Id, MaterialIdComparer.Shared);
+        return context.Materials.Where(m => m.IsInventoryItem()).OrderBy(m => m.Id.Value);
    }

    public static Avatar GetAvatar(this IMetadataDictionaryIdAvatarSource context, AvatarId id)
--- a/src/Snap.Hutao/Snap.Hutao/Service/Navigation/NavigationService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/Navigation/NavigationService.cs
@@ -3,7 +3,6 @@

 using Microsoft.UI.Xaml.Controls;
 using Snap.Hutao.Control;
-using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.View.Helper;
@@ -82,7 +81,7 @@ internal sealed class NavigationService : INavigationService, INavigationInitial

        if (currentType == pageType)
        {
-            logger.LogColorizedInformation("Navigate to {Page} : {Result}, already in", (pageType, ConsoleColor.DarkGreen), ("succeed", ConsoleColor.Green));
+            logger.LogInformation("Navigate to {pageType} : succeed, already in", pageType);
            return NavigationResult.AlreadyNavigatedTo;
        }

@@ -92,7 +91,7 @@ internal sealed class NavigationService : INavigationService, INavigationInitial
        try
        {
            navigated = frame?.Navigate(pageType, data) ?? false;
-            logger.LogColorizedInformation("Navigate to {Page} : {Result}", (pageType, ConsoleColor.Magenta), navigated ? ("succeed", ConsoleColor.Green) : ("succeed", ConsoleColor.Red));
+            logger.LogInformation("Navigate to {pageType} : {result}", pageType, navigated ? "succeed" : "failed");
        }
        catch (Exception ex)
        {
--- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs
@@ -16,7 +16,7 @@ namespace Snap.Hutao.Service.User;
 [Injection(InjectAs.Singleton, typeof(IUserCollectionService))]
 internal sealed partial class UserCollectionService : IUserCollectionService, IDisposable
 {
-    private readonly ScopedDbCurrent<BindingUser, EntityUser, UserChangedMessage> dbCurrent;
+    private readonly ScopedDbCurrent<BindingUser, Model.Entity.User, UserChangedMessage> dbCurrent;
    private readonly IUserInitializationService userInitializationService;
    private readonly IServiceProvider serviceProvider;
    private readonly IUserDbService userDbService;
@@ -163,7 +163,7 @@ internal sealed partial class UserCollectionService : IUserCollectionService, ID

        // Sync cache
        await taskContext.SwitchToMainThreadAsync();
-        userCollection.Add(newUser); // Database synced in the collection
+        userCollection.Add(newUser);
        if (newUser.Entity.Mid is not null)
        {
            midUserMap?.Add(newUser.Entity.Mid, newUser);
@@ -178,6 +178,9 @@ internal sealed partial class UserCollectionService : IUserCollectionService, ID
            }
        }

+        // Sync database
+        await taskContext.SwitchToBackgroundAsync();
+        await userDbService.AddUserAsync(newUser.Entity).ConfigureAwait(false);
        ArgumentNullException.ThrowIfNull(newUser.UserInfo);
        return new(UserOptionResult.Added, newUser.UserInfo.Uid);
    }
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -174,20 +174,12 @@
                    </ItemContainer.Resources>
                    <shvcp:HorizontalCard>
                        <shvcp:HorizontalCard.Left>
-                            <Grid Grid.Column="0">
-                                <shvco:ItemIcon
-                                    Width="40"
-                                    Height="40"
-                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                    Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
-                                    Quality="{Binding Inner.RankLevel}"/>
-                                <FontIcon
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center"
-                                    FontSize="24"
-                                    Glyph="&#xE73E;"
-                                    Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                            </Grid>
+                            <shvco:ItemIcon
+                                Grid.Column="0"
+                                Width="40"
+                                Height="40"
+                                Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                                Quality="{Binding Inner.RankLevel}"/>
                        </shvcp:HorizontalCard.Left>
                        <shvcp:HorizontalCard.Right>
                            <Grid Margin="16,0">
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/FeedbackPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/FeedbackPage.xaml
@@ -104,7 +104,7 @@
                                            IsClickEnabled="True"/>
                                        <cwcont:SettingsCard
                                            Command="{Binding NavigateToUriCommand}"
-                                            CommandParameter="https://status.snapgenshin.cn/status"
+                                            CommandParameter="https://status.hut.ao"
                                            Description="{shcm:ResourceString Name=ViewPageFeedbackServerStatusDescription}"
                                            Header="{shcm:ResourceString Name=ViewPageFeedbackServerStatusHeader}"
                                            IsClickEnabled="True"/>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginHoyoverseUserPage.xaml
@@ -13,22 +13,16 @@
            <RowDefinition Height="auto"/>
            <RowDefinition/>
        </Grid.RowDefinitions>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="auto"/>
-            </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0" Margin="12">
-                <TextBlock Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserTitle}"/>
-                <TextBlock Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserDescription}"/>
-            </StackPanel>
-            <Button
-                Grid.Column="1"
-                Margin="12"
-                Command="{x:Bind HandleCurrentCookieCommand}"
-                Content="{shcm:ResourceString Name=ViewPageLoginMihoyoUserLoggedInAction}"/>
-        </Grid>
+        <TextBlock
+            Grid.Row="0"
+            Margin="12,0,0,0"
+            VerticalAlignment="Center"
+            Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserTitle}"/>
+        <Button
+            Margin="16"
+            HorizontalAlignment="Right"
+            Command="{x:Bind HandleCurrentCookieCommand}"
+            Content="{shcm:ResourceString Name=ViewPageLoginMihoyoUserLoggedInAction}"/>
        <WebView2 x:Name="WebView" Grid.Row="2"/>
    </Grid>
-
 </Page>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LoginMihoyoUserPage.xaml
@@ -13,22 +13,16 @@
            <RowDefinition Height="auto"/>
            <RowDefinition/>
        </Grid.RowDefinitions>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="auto"/>
-            </Grid.ColumnDefinitions>
-            <StackPanel Grid.Column="0" Margin="12">
-                <TextBlock Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserTitle}"/>
-                <TextBlock Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserDescription}"/>
-            </StackPanel>
-            <Button
-                Grid.Column="1"
-                Margin="12"
-                Command="{x:Bind HandleCurrentCookieCommand}"
-                Content="{shcm:ResourceString Name=ViewPageLoginMihoyoUserLoggedInAction}"/>
-        </Grid>
+        <TextBlock
+            Grid.Row="0"
+            Margin="12,0,0,0"
+            VerticalAlignment="Center"
+            Text="{shcm:ResourceString Name=ViewPageLoginMihoyoUserTitle}"/>
+        <Button
+            Margin="16"
+            HorizontalAlignment="Right"
+            Command="{x:Bind HandleCurrentCookieCommand}"
+            Content="{shcm:ResourceString Name=ViewPageLoginMihoyoUserLoggedInAction}"/>
        <WebView2 x:Name="WebView" Grid.Row="2"/>
    </Grid>
-
 </Page>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml
@@ -725,7 +725,7 @@
                                                <ListView.ItemsPanel>
                                                    <ItemsPanelTemplate>
                                                        <shcp:UniformPanel
-                                                            Margin="0,0,16,0"
+                                                            Padding="0,0,16,0"
                                                            ColumnSpacing="6"
                                                            MinItemWidth="240"
                                                            RowSpacing="2"/>
@@ -752,7 +752,7 @@
                                                <ListView.ItemsPanel>
                                                    <ItemsPanelTemplate>
                                                        <shcp:UniformPanel
-                                                            Margin="0,0,16,0"
+                                                            Padding="0,0,16,0"
                                                            ColumnSpacing="6"
                                                            MinItemWidth="240"
                                                            RowSpacing="2"/>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -365,380 +365,367 @@

                                </SplitView.Pane>
                                <SplitView.Content>
-                                    <Grid Padding="16">
-                                        <StackPanel VerticalAlignment="Center" Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
-                                            <shci:CachedImage
-                                                Height="120"
-                                                MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
-                                                EnableLazyLoading="False"
-                                                Source="{StaticResource UI_EmotionIcon89}"/>
-                                            <TextBlock
-                                                Margin="0,5,0,21"
-                                                HorizontalAlignment="Center"
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
-                                        </StackPanel>
-                                        <ScrollViewer Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                            <StackPanel HorizontalAlignment="Left" Spacing="16">
-                                                <!--  简介  -->
-                                                <Grid Style="{ThemeResource GridCardStyle}">
+                                    <ScrollViewer>
+                                        <StackPanel
+                                            Padding="16,16,16,16"
+                                            HorizontalAlignment="Left"
+                                            Spacing="16">
+                                            <!--  简介  -->
+                                            <Grid Style="{ThemeResource GridCardStyle}">
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition/>
+                                                    <RowDefinition/>
+                                                </Grid.RowDefinitions>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition/>
+                                                </Grid.ColumnDefinitions>
+                                                <StackPanel Grid.Column="0" Margin="16">
+                                                    <Grid Margin="0,0,0,12" ColumnSpacing="8">
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
+                                                            <ColumnDefinition Width="auto"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <shci:MonoChrome
+                                                            Grid.Column="0"
+                                                            Width="32"
+                                                            Height="32"
+                                                            HorizontalAlignment="Left"
+                                                            Source="{Binding Selected.FetterInfo.VisionBefore, Converter={StaticResource ElementNameIconConverter}}"/>
+                                                        <shci:MonoChrome
+                                                            Grid.Column="1"
+                                                            Width="32"
+                                                            Height="32"
+                                                            Source="{Binding Selected.Weapon, Converter={StaticResource WeaponTypeIconConverter}}"/>
+                                                    </Grid>
+                                                    <shvcont:ItemIcon
+                                                        Width="128"
+                                                        Height="128"
+                                                        Icon="{Binding Selected.Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}"
+                                                        Quality="{Binding Selected.Quality, Mode=OneWay}"/>
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Column="1" Margin="16">
+                                                    <StackPanel Margin="0,0,0,2" Orientation="Horizontal">
+                                                        <TextBlock
+                                                            VerticalAlignment="Center"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.Name}"/>
+                                                        <TextBlock
+                                                            Margin="24,0,0,0"
+                                                            VerticalAlignment="Center"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.FetterInfo.Title}"/>
+                                                    </StackPanel>
+
+                                                    <TextBlock
+                                                        Opacity="0.7"
+                                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                                        Text="{Binding Selected.FetterInfo.Detail}"
+                                                        TextWrapping="NoWrap"/>
+
+                                                    <cwc:UniformGrid
+                                                        Margin="0,16,0,0"
+                                                        ColumnSpacing="6"
+                                                        Columns="4">
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOccupationNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.Native}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarConstellationNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.ConstellationBefore}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarDateofBirthTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.BirthFormatted}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                    </cwc:UniformGrid>
+
+                                                    <cwc:UniformGrid
+                                                        Margin="0,12,0,0"
+                                                        ColumnSpacing="6"
+                                                        Columns="4">
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarChineseCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvChinese}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarJapaneseCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvJapanese}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarEnglishCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvEnglish}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                        <StackPanel>
+                                                            <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarKoreanCVNameTitle}"/>
+                                                            <TextBlock
+                                                                Margin="0,6,0,0"
+                                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                                Text="{Binding Selected.FetterInfo.CvKorean}"
+                                                                TextWrapping="NoWrap"/>
+                                                        </StackPanel>
+                                                    </cwc:UniformGrid>
+                                                </StackPanel>
+
+                                                <StackPanel Grid.Row="1" Grid.ColumnSpan="2">
+                                                    <ItemsControl
+                                                        Margin="16,0,16,16"
+                                                        ItemTemplate="{StaticResource CultivationItemTemplate}"
+                                                        ItemsSource="{Binding Selected.CultivationItemsView}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Grid>
+
+                                            <!--  属性  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <shvcont:BaseValueSlider
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
+                                            </Border>
+
+                                            <!--  天赋  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <shvcont:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
+                                            </Border>
+
+                                            <!--  命座  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <shvcont:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
+                                            </Border>
+
+                                            <!--  搭配  -->
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <Grid ColumnSpacing="8" RowSpacing="8">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition/>
+                                                    </Grid.ColumnDefinitions>
                                                    <Grid.RowDefinitions>
                                                        <RowDefinition/>
                                                        <RowDefinition/>
                                                    </Grid.RowDefinitions>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="0"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="0"
+                                                        ItemTemplate="{StaticResource CollocationTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.Avatars}"/>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="1"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarWeaponCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        ItemTemplate="{StaticResource CollocationTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.Weapons}"/>
+                                                    <TextBlock
+                                                        Grid.Row="0"
+                                                        Grid.Column="2"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarArtifactSetCombinationHeader}"/>
+                                                    <ItemsControl
+                                                        Grid.Row="1"
+                                                        Grid.Column="2"
+                                                        ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
+                                                        ItemsPanel="{StaticResource StackPanelSpacing4Template}"
+                                                        ItemsSource="{Binding Selected.Collocation.ReliquarySets}"/>
+                                                </Grid>
+                                            </Border>
+
+                                            <!--  立绘  -->
+                                            <cwc:ConstrainedBox AspectRatio="2048:1024">
+                                                <Grid Style="{ThemeResource GridCardStyle}">
                                                    <Grid.ColumnDefinitions>
                                                        <ColumnDefinition Width="auto"/>
                                                        <ColumnDefinition/>
                                                    </Grid.ColumnDefinitions>
-                                                    <StackPanel Grid.Column="0" Margin="16">
-                                                        <Grid Margin="0,0,0,12" ColumnSpacing="8">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shci:MonoChrome
-                                                                Grid.Column="0"
-                                                                Width="32"
-                                                                Height="32"
-                                                                HorizontalAlignment="Left"
-                                                                Source="{Binding Selected.FetterInfo.VisionBefore, Converter={StaticResource ElementNameIconConverter}}"/>
-                                                            <shci:MonoChrome
-                                                                Grid.Column="1"
-                                                                Width="32"
-                                                                Height="32"
-                                                                Source="{Binding Selected.Weapon, Converter={StaticResource WeaponTypeIconConverter}}"/>
-                                                        </Grid>
-                                                        <shvcont:ItemIcon
-                                                            Width="128"
-                                                            Height="128"
-                                                            Icon="{Binding Selected.Icon, Converter={StaticResource AvatarIconConverter}, Mode=OneWay}"
-                                                            Quality="{Binding Selected.Quality, Mode=OneWay}"/>
-                                                    </StackPanel>
+                                                    <!--  使其有较低的ZOrder  -->
+                                                    <shci:CachedImage Grid.ColumnSpan="2" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>

-                                                    <StackPanel Grid.Column="1" Margin="16">
-                                                        <StackPanel Margin="0,0,0,2" Orientation="Horizontal">
-                                                            <TextBlock
-                                                                VerticalAlignment="Center"
-                                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                                Text="{Binding Selected.Name}"
-                                                                TextWrapping="NoWrap"/>
-                                                            <TextBlock
-                                                                Margin="24,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                                Text="{Binding Selected.FetterInfo.Title}"
-                                                                TextWrapping="NoWrap"/>
-                                                        </StackPanel>
-
-                                                        <TextBlock
-                                                            Opacity="0.7"
-                                                            Style="{StaticResource CaptionTextBlockStyle}"
-                                                            Text="{Binding Selected.FetterInfo.Detail}"
-                                                            TextWrapping="NoWrap"/>
-
-                                                        <cwc:UniformGrid
-                                                            Margin="0,16,0,0"
-                                                            ColumnSpacing="6"
-                                                            Columns="4">
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOccupationNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.Native}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarConstellationNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.ConstellationBefore}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarDateofBirthTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.BirthFormatted}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </cwc:UniformGrid>
-
-                                                        <cwc:UniformGrid
-                                                            Margin="0,12,0,0"
-                                                            ColumnSpacing="6"
-                                                            Columns="4">
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarChineseCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvChinese}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarJapaneseCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvJapanese}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarEnglishCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvEnglish}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                            <StackPanel>
-                                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarKoreanCVNameTitle}"/>
-                                                                <TextBlock
-                                                                    Margin="0,6,0,0"
-                                                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                                                    Text="{Binding Selected.FetterInfo.CvKorean}"
-                                                                    TextWrapping="NoWrap"/>
-                                                            </StackPanel>
-                                                        </cwc:UniformGrid>
-                                                    </StackPanel>
-
-                                                    <StackPanel Grid.Row="1" Grid.ColumnSpan="2">
-                                                        <ItemsControl
-                                                            Margin="16,0,16,16"
-                                                            ItemTemplate="{StaticResource CultivationItemTemplate}"
-                                                            ItemsSource="{Binding Selected.CultivationItemsView}">
-                                                            <ItemsControl.ItemsPanel>
-                                                                <ItemsPanelTemplate>
-                                                                    <cwc:UniformGrid
-                                                                        ColumnSpacing="8"
-                                                                        Columns="3"
-                                                                        RowSpacing="8"/>
-                                                                </ItemsPanelTemplate>
-                                                            </ItemsControl.ItemsPanel>
-                                                        </ItemsControl>
-                                                    </StackPanel>
+                                                    <Border
+                                                        Grid.Column="0"
+                                                        Margin="16"
+                                                        Style="{StaticResource BorderCardStyle}">
+                                                        <cwc:ConstrainedBox AspectRatio="320:1024">
+                                                            <shci:CachedImage CornerRadius="{ThemeResource ControlCornerRadius}" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
+                                                        </cwc:ConstrainedBox>
+                                                    </Border>
                                                </Grid>
+                                            </cwc:ConstrainedBox>

-                                                <!--  属性  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <shvcont:BaseValueSlider
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
-                                                </Border>
-
-                                                <!--  天赋  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource SkillDataTemplate}" Skills="{Binding Selected.SkillDepot.CompositeSkills}"/>
-                                                </Border>
-
-                                                <!--  命座  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <shvcont:SkillPivot ItemTemplate="{StaticResource TalentDataTemplate}" Skills="{Binding Selected.SkillDepot.Talents}"/>
-                                                </Border>
-
-                                                <!--  搭配  -->
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <Grid ColumnSpacing="8" RowSpacing="8">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition/>
-                                                        </Grid.ColumnDefinitions>
+                                            <!--  料理  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <Expander
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Header="{shcm:ResourceString Name=ViewPageWiKiAvatarFoodHeader}"
+                                                    IsExpanded="True">
+                                                    <Grid DataContext="{Binding Selected.CookBonusView}">
                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
                                                        </Grid.RowDefinitions>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="0"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="0"
-                                                            ItemTemplate="{StaticResource CollocationTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.Avatars}"/>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="1"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarWeaponCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="1"
-                                                            ItemTemplate="{StaticResource CollocationTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.Weapons}"/>
-                                                        <TextBlock
-                                                            Grid.Row="0"
-                                                            Grid.Column="2"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarArtifactSetCombinationHeader}"/>
-                                                        <ItemsControl
-                                                            Grid.Row="1"
-                                                            Grid.Column="2"
-                                                            ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
-                                                            ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.Collocation.ReliquarySets}"/>
-                                                    </Grid>
-                                                </Border>
-
-                                                <!--  立绘  -->
-                                                <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                                    <Grid Style="{ThemeResource GridCardStyle}">
                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
                                                            <ColumnDefinition Width="auto"/>
                                                            <ColumnDefinition/>
                                                        </Grid.ColumnDefinitions>
-                                                        <!--  使其有较低的ZOrder  -->
-                                                        <shci:CachedImage Grid.ColumnSpan="2" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>
-
-                                                        <Border
+                                                        <TextBlock
                                                            Grid.Column="0"
-                                                            Margin="16"
-                                                            Style="{StaticResource BorderCardStyle}">
-                                                            <cwc:ConstrainedBox AspectRatio="320:1024">
-                                                                <shci:CachedImage CornerRadius="{ThemeResource ControlCornerRadius}" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
-                                                            </cwc:ConstrainedBox>
-                                                        </Border>
-                                                    </Grid>
-                                                </cwc:ConstrainedBox>
-
-                                                <!--  料理  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <Expander
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarFoodHeader}"
-                                                        IsExpanded="True">
-                                                        <Grid DataContext="{Binding Selected.CookBonusView}">
-                                                            <Grid.RowDefinitions>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                                <RowDefinition Height="auto"/>
-                                                            </Grid.RowDefinitions>
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                            </Grid.ColumnDefinitions>
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarSpecialFoodTitle}"/>
+                                                        <shvcont:BottomTextControl
+                                                            Grid.Row="1"
+                                                            Grid.Column="0"
+                                                            Margin="0,16,0,0"
+                                                            Text="{Binding Item.Name}">
+                                                            <shvcont:ItemIcon Icon="{Binding Item.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Item.RankLevel}"/>
+                                                        </shvcont:BottomTextControl>
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            Margin="16,0,0,0"
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOriginalFoodTitle}"/>
+                                                        <shvcont:BottomTextControl
+                                                            Grid.Row="1"
+                                                            Grid.Column="1"
+                                                            Margin="16,16,0,0"
+                                                            Text="{Binding OriginItem.Name}">
+                                                            <shvcont:ItemIcon Icon="{Binding OriginItem.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding OriginItem.RankLevel}"/>
+                                                        </shvcont:BottomTextControl>
+                                                        <StackPanel
+                                                            Grid.RowSpan="4"
+                                                            Grid.Column="2"
+                                                            Margin="16,0,0,0">
                                                            <TextBlock
-                                                                Grid.Column="0"
-                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                Text="{shcm:ResourceString Name=ViewPageWiKiAvatarSpecialFoodTitle}"/>
-                                                            <shvcont:BottomTextControl
-                                                                Grid.Row="1"
-                                                                Grid.Column="0"
+                                                                Grid.Row="2"
+                                                                Grid.ColumnSpan="4"
+                                                                Text="{Binding Item.Description}"
+                                                                TextWrapping="Wrap"/>
+                                                            <TextBlock
+                                                                Grid.Row="3"
+                                                                Grid.ColumnSpan="4"
                                                                Margin="0,16,0,0"
-                                                                Text="{Binding Item.Name}">
-                                                                <shvcont:ItemIcon Icon="{Binding Item.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Item.RankLevel}"/>
-                                                            </shvcont:BottomTextControl>
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="16,0,0,0"
-                                                                Style="{StaticResource BaseTextBlockStyle}"
-                                                                Text="{shcm:ResourceString Name=ViewPageWiKiAvatarOriginalFoodTitle}"/>
-                                                            <shvcont:BottomTextControl
-                                                                Grid.Row="1"
-                                                                Grid.Column="1"
-                                                                Margin="16,16,0,0"
-                                                                Text="{Binding OriginItem.Name}">
-                                                                <shvcont:ItemIcon Icon="{Binding OriginItem.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding OriginItem.RankLevel}"/>
-                                                            </shvcont:BottomTextControl>
-                                                            <StackPanel
-                                                                Grid.RowSpan="4"
-                                                                Grid.Column="2"
-                                                                Margin="16,0,0,0">
-                                                                <TextBlock
-                                                                    Grid.Row="2"
-                                                                    Grid.ColumnSpan="4"
-                                                                    Text="{Binding Item.Description}"
-                                                                    TextWrapping="Wrap"/>
-                                                                <TextBlock
-                                                                    Grid.Row="3"
-                                                                    Grid.ColumnSpan="4"
-                                                                    Margin="0,16,0,0"
-                                                                    Text="{Binding Item.EffectDescription}"
-                                                                    TextWrapping="Wrap"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                    </Expander>
-                                                </Border>
+                                                                Text="{Binding Item.EffectDescription}"
+                                                                TextWrapping="Wrap"/>
+                                                        </StackPanel>
+                                                    </Grid>
+                                                </Expander>
+                                            </Border>

-                                                <!--  衣装  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <Expander
-                                                        HorizontalAlignment="Stretch"
-                                                        HorizontalContentAlignment="Stretch"
-                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}"
-                                                        IsExpanded="True">
-                                                        <ItemsControl
-                                                            Margin="0,0,0,-16"
-                                                            ItemTemplate="{StaticResource CostumeTemplate}"
-                                                            ItemsSource="{Binding Selected.Costumes}"/>
-                                                    </Expander>
-                                                </Border>
+                                            <!--  衣装  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderHeaderBackground" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <Expander
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Header="{shcm:ResourceString Name=ViewPageWiKiAvatarCostumeHeader}"
+                                                    IsExpanded="True">
+                                                    <ItemsControl
+                                                        Margin="0,0,0,-16"
+                                                        ItemTemplate="{StaticResource CostumeTemplate}"
+                                                        ItemsSource="{Binding Selected.Costumes}"/>
+                                                </Expander>
+                                            </Border>

-                                                <!--  资料  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <ScrollViewer VerticalScrollBarVisibility="Hidden">
-                                                        <cwc:SettingsExpander
-                                                            Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}"
-                                                            ItemTemplate="{StaticResource FetterStoryTemplate}"
-                                                            ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
-                                                    </ScrollViewer>
-                                                </Border>
+                                            <!--  资料  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <ScrollViewer VerticalScrollBarVisibility="Hidden">
+                                                    <cwc:SettingsExpander
+                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}"
+                                                        ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                        ItemsSource="{Binding Selected.FetterInfo.Fetters}"/>
+                                                </ScrollViewer>
+                                            </Border>

-                                                <!--  故事  -->
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Resources>
-                                                        <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
-                                                        <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
-                                                    </Border.Resources>
-                                                    <ScrollViewer VerticalScrollBarVisibility="Hidden">
-                                                        <cwc:SettingsExpander
-                                                            Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}"
-                                                            ItemTemplate="{StaticResource FetterStoryTemplate}"
-                                                            ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
-                                                    </ScrollViewer>
-                                                </Border>
-                                            </StackPanel>
-                                        </ScrollViewer>
-                                    </Grid>
+                                            <!--  故事  -->
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Resources>
+                                                    <SolidColorBrush x:Key="ToggleButtonBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ExpanderContentBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundDisabled" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPointerOver" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="SettingsCardBackgroundPressed" Color="Transparent"/>
+                                                </Border.Resources>
+                                                <ScrollViewer VerticalScrollBarVisibility="Hidden">
+                                                    <cwc:SettingsExpander
+                                                        Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}"
+                                                        ItemTemplate="{StaticResource FetterStoryTemplate}"
+                                                        ItemsSource="{Binding Selected.FetterInfo.FetterStories}"/>
+                                                </ScrollViewer>
+                                            </Border>
+                                        </StackPanel>
+                                    </ScrollViewer>
                                </SplitView.Content>
                            </SplitView>
                        </Border>
@@ -747,33 +734,19 @@
                <cwc:Case Value="Grid">
                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                            <Grid Padding="16,16,4,4">
-                                <StackPanel VerticalAlignment="Center" Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
-                                    <shci:CachedImage
-                                        Height="120"
-                                        MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
-                                        EnableLazyLoading="False"
-                                        Source="{StaticResource UI_EmotionIcon89}"/>
-                                    <TextBlock
-                                        Margin="0,5,0,21"
-                                        HorizontalAlignment="Center"
-                                        Style="{StaticResource SubtitleTextBlockStyle}"
-                                        Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
-                                </StackPanel>
-                                <GridView
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Left"
-                                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                                    ItemTemplate="{StaticResource AvatarGridTemplate}"
-                                    ItemsSource="{Binding Avatars}"
-                                    SelectedItem="{Binding Selected, Mode=TwoWay}"
-                                    SelectionMode="Single"
-                                    Visibility="{Binding Avatars.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                    <mxi:Interaction.Behaviors>
-                                        <shcb:SelectedItemInViewBehavior/>
-                                    </mxi:Interaction.Behaviors>
-                                </GridView>
-                            </Grid>
+                            <GridView
+                                Padding="16,16,4,4"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                ItemTemplate="{StaticResource AvatarGridTemplate}"
+                                ItemsSource="{Binding Avatars}"
+                                SelectedItem="{Binding Selected, Mode=TwoWay}"
+                                SelectionMode="Single">
+                                <mxi:Interaction.Behaviors>
+                                    <shcb:SelectedItemInViewBehavior/>
+                                </mxi:Interaction.Behaviors>
+                            </GridView>
                        </Border>
                    </Border>
                </cwc:Case>
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -233,125 +233,111 @@
                                    </ListView>
                                </SplitView.Pane>
                                <SplitView.Content>
-                                    <Grid Padding="16">
-                                        <StackPanel VerticalAlignment="Center" Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
-                                            <shci:CachedImage
-                                                Height="120"
-                                                MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
-                                                EnableLazyLoading="False"
-                                                Source="{StaticResource UI_EmotionIcon89}"/>
-                                            <TextBlock
-                                                Margin="0,5,0,21"
-                                                HorizontalAlignment="Center"
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
-                                        </StackPanel>
-                                        <ScrollViewer Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                            <StackPanel Spacing="16">
-                                                <Border Style="{ThemeResource BorderCardStyle}">
-                                                    <Border.Background>
-                                                        <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
-                                                    </Border.Background>
-                                                    <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                                        <Grid>
+                                    <ScrollViewer>
+                                        <StackPanel Padding="16" Spacing="16">
+                                            <Border Style="{ThemeResource BorderCardStyle}">
+                                                <Border.Background>
+                                                    <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
+                                                </Border.Background>
+                                                <cwc:ConstrainedBox AspectRatio="2048:1024">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="auto"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
+                                                        <ScrollViewer
+                                                            Grid.Column="0"
+                                                            Margin="16"
+                                                            VerticalScrollBarVisibility="Hidden">
+                                                            <StackPanel>
+                                                                <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
+                                                                    <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                                </shvc:BottomTextControl>
+
+                                                                <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
+                                                                    <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                                </shvc:BottomTextControl>
+                                                            </StackPanel>
+                                                        </ScrollViewer>
+
+                                                        <Grid Grid.ColumnSpan="2">
                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
+                                                                <ColumnDefinition Width="176*"/>
+                                                                <ColumnDefinition Width="848*"/>
                                                            </Grid.ColumnDefinitions>
-                                                            <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
-                                                            <ScrollViewer
-                                                                Grid.Column="0"
-                                                                Margin="16"
-                                                                VerticalScrollBarVisibility="Hidden">
-                                                                <StackPanel>
-                                                                    <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
-                                                                        <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                                    </shvc:BottomTextControl>
-
-                                                                    <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
-                                                                        <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                                    </shvc:BottomTextControl>
-                                                                </StackPanel>
-                                                            </ScrollViewer>
-
-                                                            <Grid Grid.ColumnSpan="2">
-                                                                <Grid.ColumnDefinitions>
-                                                                    <ColumnDefinition Width="176*"/>
-                                                                    <ColumnDefinition Width="848*"/>
-                                                                </Grid.ColumnDefinitions>
-                                                                <shci:CachedImage
-                                                                    Grid.Column="1"
-                                                                    HorizontalAlignment="Center"
-                                                                    VerticalAlignment="Stretch"
-                                                                    Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
-                                                            </Grid>
-                                                            <TextBlock
+                                                            <shci:CachedImage
                                                                Grid.Column="1"
-                                                                Margin="16"
-                                                                HorizontalAlignment="Right"
-                                                                VerticalAlignment="Bottom"
-                                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                                Text="{Binding Selected.Name}"/>
+                                                                HorizontalAlignment="Center"
+                                                                VerticalAlignment="Stretch"
+                                                                Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
                                                        </Grid>
-                                                    </cwc:ConstrainedBox>
-                                                </Border>
-
-                                                <TextBlock Text="{Binding Selected.Description}" TextWrapping="Wrap"/>
-                                                <shvc:BaseValueSlider
-                                                    HorizontalAlignment="Stretch"
-                                                    HorizontalContentAlignment="Stretch"
-                                                    BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>
-
-
-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <StackPanel Spacing="16">
                                                        <TextBlock
-                                                            Margin="0,0,0,0"
-                                                            Style="{StaticResource BaseTextBlockStyle}"
-                                                            Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
-                                                        <ItemsControl ItemTemplate="{StaticResource CultivateItemTemplate}" ItemsSource="{Binding Selected.CultivationItemsView}">
-                                                            <ItemsControl.ItemsPanel>
-                                                                <ItemsPanelTemplate>
-                                                                    <cwc:UniformGrid
-                                                                        ColumnSpacing="8"
-                                                                        Columns="3"
-                                                                        RowSpacing="8"/>
-                                                                </ItemsPanelTemplate>
-                                                            </ItemsControl.ItemsPanel>
-                                                        </ItemsControl>
-                                                    </StackPanel>
-                                                </Border>
+                                                            Grid.Column="1"
+                                                            Margin="16"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Bottom"
+                                                            Style="{StaticResource SubtitleTextBlockStyle}"
+                                                            Text="{Binding Selected.Name}"/>
+                                                    </Grid>
+                                                </cwc:ConstrainedBox>
+                                            </Border>

-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <StackPanel Spacing="16" Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
-                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Selected.Affix.Name}"/>
-                                                        <Pivot
-                                                            Margin="-16,-16,0,0"
-                                                            HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
-                                                            ItemTemplate="{StaticResource AffixPivotItemTemplate}"
-                                                            ItemsSource="{Binding Selected.Affix.Descriptions}"/>
-                                                    </StackPanel>
-                                                </Border>
+                                            <TextBlock Text="{Binding Selected.Description}" TextWrapping="Wrap"/>
+                                            <shvc:BaseValueSlider
+                                                HorizontalAlignment="Stretch"
+                                                HorizontalContentAlignment="Stretch"
+                                                BaseValueInfo="{Binding BaseValueInfo, Mode=OneWay}"/>


-                                                <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
-                                                    <StackPanel Spacing="16">
-                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
-                                                        <ItemsControl ItemTemplate="{StaticResource CollocationTemplate}" ItemsSource="{Binding Selected.Collocation.Avatars}">
-                                                            <ItemsControl.ItemsPanel>
-                                                                <ItemsPanelTemplate>
-                                                                    <cwc:UniformGrid
-                                                                        ColumnSpacing="8"
-                                                                        Columns="3"
-                                                                        RowSpacing="8"/>
-                                                                </ItemsPanelTemplate>
-                                                            </ItemsControl.ItemsPanel>
-                                                        </ItemsControl>
-                                                    </StackPanel>
-                                                </Border>
-                                            </StackPanel>
-                                        </ScrollViewer>
-                                    </Grid>
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16">
+                                                    <TextBlock
+                                                        Margin="0,0,0,0"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{shcm:ResourceString Name=ViewPageWiKiAvatarAscensionMaterialsHeader}"/>
+                                                    <ItemsControl ItemTemplate="{StaticResource CultivateItemTemplate}" ItemsSource="{Binding Selected.CultivationItemsView}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Border>
+
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16" Visibility="{Binding Selected.Affix, Converter={StaticResource EmptyObjectToVisibilityConverter}}">
+                                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Selected.Affix.Name}"/>
+                                                    <Pivot
+                                                        Margin="-16,-16,0,0"
+                                                        HeaderTemplate="{StaticResource AffixPivotHeaderTemplate}"
+                                                        ItemTemplate="{StaticResource AffixPivotItemTemplate}"
+                                                        ItemsSource="{Binding Selected.Affix.Descriptions}"/>
+                                                </StackPanel>
+                                            </Border>
+
+
+                                            <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
+                                                <StackPanel Spacing="16">
+                                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
+                                                    <ItemsControl ItemTemplate="{StaticResource CollocationTemplate}" ItemsSource="{Binding Selected.Collocation.Avatars}">
+                                                        <ItemsControl.ItemsPanel>
+                                                            <ItemsPanelTemplate>
+                                                                <cwc:UniformGrid
+                                                                    ColumnSpacing="8"
+                                                                    Columns="3"
+                                                                    RowSpacing="8"/>
+                                                            </ItemsPanelTemplate>
+                                                        </ItemsControl.ItemsPanel>
+                                                    </ItemsControl>
+                                                </StackPanel>
+                                            </Border>
+                                        </StackPanel>
+                                    </ScrollViewer>
                                </SplitView.Content>
                            </SplitView>
                        </Border>
@@ -360,34 +346,19 @@
                <cwc:Case Value="Grid">
                    <Border Margin="16,0,16,16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                        <Border Style="{ThemeResource AcrylicBorderCardStyle}">
-                            <Grid Padding="16,16,4,4">
-                                <StackPanel VerticalAlignment="Center" Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}">
-                                    <shci:CachedImage
-                                        Height="120"
-                                        MinWidth="{ThemeResource SettingsCardContentControlMinWidth}"
-                                        EnableLazyLoading="False"
-                                        Source="{StaticResource UI_EmotionIcon89}"/>
-                                    <TextBlock
-                                        Margin="0,5,0,21"
-                                        HorizontalAlignment="Center"
-                                        Style="{StaticResource SubtitleTextBlockStyle}"
-                                        Text="{shcm:ResourceString Name=ControlAutoSuggestBoxNotFoundValue}"/>
-                                </StackPanel>
-                                <GridView
-                                    Padding="16,16,4,4"
-                                    HorizontalAlignment="Stretch"
-                                    HorizontalContentAlignment="Left"
-                                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                                    ItemTemplate="{StaticResource WeaponGridTemplate}"
-                                    ItemsSource="{Binding Weapons}"
-                                    SelectedItem="{Binding Selected, Mode=TwoWay}"
-                                    SelectionMode="Single"
-                                    Visibility="{Binding Weapons.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                    <mxi:Interaction.Behaviors>
-                                        <shcb:SelectedItemInViewBehavior/>
-                                    </mxi:Interaction.Behaviors>
-                                </GridView>
-                            </Grid>
+                            <GridView
+                                Padding="16,16,4,4"
+                                HorizontalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                ItemTemplate="{StaticResource WeaponGridTemplate}"
+                                ItemsSource="{Binding Weapons}"
+                                SelectedItem="{Binding Selected, Mode=TwoWay}"
+                                SelectionMode="Single">
+                                <mxi:Interaction.Behaviors>
+                                    <shcb:SelectedItemInViewBehavior/>
+                                </mxi:Interaction.Behaviors>
+                            </GridView>
                        </Border>
                    </Border>
                </cwc:Case>
--- a/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/UserView.xaml
@@ -14,106 +14,6 @@
    xmlns:shvu="using:Snap.Hutao.ViewModel.User"
    d:DataContext="{d:DesignInstance shvu:UserViewModel}"
    mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
-
-        <DataTemplate x:Key="UserGameRoleTemplate">
-            <StackPanel Padding="0,6">
-                <TextBlock Text="{Binding Nickname}"/>
-                <TextBlock
-                    Margin="0,2,0,0"
-                    Opacity="0.6"
-                    Style="{StaticResource CaptionTextBlockStyle}"
-                    Text="{Binding Description}"/>
-            </StackPanel>
-        </DataTemplate>
-
-        <DataTemplate x:Key="UserTemplate">
-            <Grid Padding="0,12" Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition/>
-                    <ColumnDefinition Width="auto"/>
-                    <ColumnDefinition Width="auto"/>
-                </Grid.ColumnDefinitions>
-                <PersonPicture
-                    Height="32"
-                    Margin="2,0"
-                    HorizontalAlignment="Left"
-                    ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
-                <TextBlock
-                    Grid.Column="1"
-                    Margin="12,0,0,0"
-                    VerticalAlignment="Center"
-                    Text="{Binding UserInfo.Nickname}"/>
-                <TextBlock
-                    Grid.Column="2"
-                    VerticalAlignment="Center"
-                    Text="HoYoLAB"
-                    Visibility="{Binding IsOversea}"/>
-                <StackPanel
-                    x:Name="ButtonPanel"
-                    Grid.Column="3"
-                    Orientation="Horizontal"
-                    Visibility="Collapsed">
-                    <Button
-                        Margin="12,0,0,0"
-                        VerticalAlignment="Stretch"
-                        Background="Transparent"
-                        Command="{Binding DataContext.CopyCookieCommand, Source={StaticResource ViewModelBindingProxy}}"
-                        CommandParameter="{Binding}"
-                        Content="{StaticResource FontIconContentCopy}"
-                        FontFamily="{StaticResource SymbolThemeFontFamily}"
-                        Style="{StaticResource ButtonRevealStyle}"
-                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserCopyCookieAction}"/>
-                    <Button
-                        Margin="6,0,0,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Stretch"
-                        Background="Transparent"
-                        Command="{Binding DataContext.RemoveUserCommand, Source={StaticResource ViewModelBindingProxy}}"
-                        CommandParameter="{Binding}"
-                        Content="{StaticResource FontIconContentDelete}"
-                        FontFamily="{StaticResource SymbolThemeFontFamily}"
-                        Style="{StaticResource ButtonRevealStyle}"
-                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserRemoveAction}"/>
-                </StackPanel>
-
-                <Grid.Resources>
-                    <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                            <DiscreteObjectKeyFrame KeyTime="0">
-                                <DiscreteObjectKeyFrame.Value>
-                                    <Visibility>Visible</Visibility>
-                                </DiscreteObjectKeyFrame.Value>
-                            </DiscreteObjectKeyFrame>
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-
-                    <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                            <DiscreteObjectKeyFrame KeyTime="0">
-                                <DiscreteObjectKeyFrame.Value>
-                                    <Visibility>Collapsed</Visibility>
-                                </DiscreteObjectKeyFrame.Value>
-                            </DiscreteObjectKeyFrame>
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                </Grid.Resources>
-
-                <mxi:Interaction.Behaviors>
-                    <mxic:EventTriggerBehavior EventName="PointerEntered">
-                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                    </mxic:EventTriggerBehavior>
-                    <mxic:EventTriggerBehavior EventName="PointerExited">
-                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                    </mxic:EventTriggerBehavior>
-                </mxi:Interaction.Behaviors>
-            </Grid>
-        </DataTemplate>
-    </UserControl.Resources>
-
    <mxi:Interaction.Behaviors>
        <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
    </mxi:Interaction.Behaviors>
@@ -157,6 +57,7 @@
                        <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="NavigationViewItemForegroundPressed"/>
                    </ResourceDictionary>
                </ResourceDictionary.ThemeDictionaries>
+                <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
            </ResourceDictionary>
        </StackPanel.Resources>

@@ -178,9 +79,17 @@
                        Grid.Column="1"
                        Margin="1,0,0,0"
                        VerticalAlignment="Center"
-                        Text="{Binding SelectedUser.UserInfo.Nickname, Mode=OneWay, FallbackValue={shcm:ResourceString Name=ViewUserNoUserHint}}"
+                        Text="{Binding SelectedUser.UserInfo.Nickname, Mode=OneWay}"
                        TextTrimming="CharacterEllipsis"
                        TextWrapping="NoWrap"/>
+                    <TextBlock
+                        Grid.Column="1"
+                        Margin="1,0,0,0"
+                        VerticalAlignment="Center"
+                        Text="{shcm:ResourceString Name=ViewUserNoUserHint}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap"
+                        Visibility="{Binding Users.Count, Converter={StaticResource Int32ToVisibilityRevertConverter}}"/>
                    <FontIcon
                        Grid.Column="2"
                        Margin="0,0,8,0"
@@ -322,20 +231,29 @@

                        <Grid Grid.Column="1" Width="280">
                            <StackPanel Visibility="{Binding Users.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                                <StackPanel Visibility="{Binding SelectedUser, Converter={StaticResource EmptyObjectToVisibilityConverter}, Mode=OneWay}">
-                                    <TextBlock
-                                        Margin="10,6,0,6"
-                                        Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="{shcm:ResourceString Name=ViewUserRole}"/>
-                                    <ListView
-                                        Grid.Row="1"
-                                        Margin="4"
-                                        ItemTemplate="{StaticResource UserGameRoleTemplate}"
-                                        ItemsSource="{Binding SelectedUser.UserGameRoles}"
-                                        SelectedItem="{Binding SelectedUser.SelectedUserGameRole, Mode=TwoWay}"
-                                        SelectionMode="Single"/>
-                                </StackPanel>
-
+                                <TextBlock
+                                    Margin="10,6,0,6"
+                                    Style="{StaticResource BaseTextBlockStyle}"
+                                    Text="{shcm:ResourceString Name=ViewUserRole}"/>
+                                <ListView
+                                    Grid.Row="1"
+                                    Margin="4"
+                                    ItemsSource="{Binding SelectedUser.UserGameRoles}"
+                                    SelectedItem="{Binding SelectedUser.SelectedUserGameRole, Mode=TwoWay}"
+                                    SelectionMode="Single">
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate>
+                                            <StackPanel Padding="0,6">
+                                                <TextBlock Text="{Binding Nickname}"/>
+                                                <TextBlock
+                                                    Margin="0,2,0,0"
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{Binding Description}"/>
+                                            </StackPanel>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                </ListView>
                                <TextBlock
                                    Margin="10,6,0,6"
                                    Style="{StaticResource BaseTextBlockStyle}"
@@ -345,7 +263,6 @@
                                    Margin="4"
                                    AllowDrop="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
                                    CanReorderItems="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolNegationConverter}}"
-                                    ItemTemplate="{StaticResource UserTemplate}"
                                    ItemsSource="{Binding Users}"
                                    SelectedItem="{Binding SelectedUser, Mode=TwoWay}"
                                    SelectionMode="Single">
@@ -358,6 +275,91 @@
                                            Severity="Warning"
                                            Visibility="{Binding RuntimeOptions.IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
                                    </ListView.Header>
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate>
+                                            <Grid Padding="0,12" Background="Transparent">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition Width="auto"/>
+                                                </Grid.ColumnDefinitions>
+                                                <PersonPicture
+                                                    Height="32"
+                                                    Margin="2,0"
+                                                    HorizontalAlignment="Left"
+                                                    ProfilePicture="{Binding UserInfo.AvatarUrl, Mode=OneWay}"/>
+                                                <TextBlock
+                                                    Grid.Column="1"
+                                                    Margin="12,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Text="{Binding UserInfo.Nickname}"/>
+                                                <TextBlock
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Text="HoYoLAB"
+                                                    Visibility="{Binding IsOversea}"/>
+                                                <StackPanel
+                                                    x:Name="ButtonPanel"
+                                                    Grid.Column="3"
+                                                    Orientation="Horizontal"
+                                                    Visibility="Collapsed">
+                                                    <Button
+                                                        Margin="12,0,0,0"
+                                                        VerticalAlignment="Stretch"
+                                                        Background="Transparent"
+                                                        Command="{Binding DataContext.CopyCookieCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                                        CommandParameter="{Binding}"
+                                                        Content="{StaticResource FontIconContentCopy}"
+                                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                        Style="{StaticResource ButtonRevealStyle}"
+                                                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserCopyCookieAction}"/>
+                                                    <Button
+                                                        Margin="6,0,0,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Stretch"
+                                                        Background="Transparent"
+                                                        Command="{Binding DataContext.RemoveUserCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                                        CommandParameter="{Binding}"
+                                                        Content="{StaticResource FontIconContentDelete}"
+                                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                        Style="{StaticResource ButtonRevealStyle}"
+                                                        ToolTipService.ToolTip="{shcm:ResourceString Name=ViewUserRemoveAction}"/>
+                                                </StackPanel>
+
+                                                <Grid.Resources>
+                                                    <Storyboard x:Name="ButtonPanelVisibleStoryboard">
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                                <DiscreteObjectKeyFrame.Value>
+                                                                    <Visibility>Visible</Visibility>
+                                                                </DiscreteObjectKeyFrame.Value>
+                                                            </DiscreteObjectKeyFrame>
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+
+                                                    <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
+                                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                                <DiscreteObjectKeyFrame.Value>
+                                                                    <Visibility>Collapsed</Visibility>
+                                                                </DiscreteObjectKeyFrame.Value>
+                                                            </DiscreteObjectKeyFrame>
+                                                        </ObjectAnimationUsingKeyFrames>
+                                                    </Storyboard>
+                                                </Grid.Resources>
+
+                                                <mxi:Interaction.Behaviors>
+                                                    <mxic:EventTriggerBehavior EventName="PointerEntered">
+                                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
+                                                    </mxic:EventTriggerBehavior>
+                                                    <mxic:EventTriggerBehavior EventName="PointerExited">
+                                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
+                                                    </mxic:EventTriggerBehavior>
+                                                </mxi:Interaction.Behaviors>
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
                                </ListView>
                            </StackPanel>
                            <TextBlock
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementViewModel.cs
@@ -381,29 +381,26 @@ internal sealed partial class AchievementViewModel : Abstraction.ViewModel, INav
        {
            SetProperty(ref selectedAchievementGoal, null);

-            if (string.IsNullOrEmpty(search))
+            if (!string.IsNullOrEmpty(search))
            {
-                Achievements.Filter = default!;
-                return;
-            }
+                if (uint.TryParse(search, out uint achievementId))
+                {
+                    Achievements.Filter = view => view.Inner.Id == achievementId;
+                    return;
+                }

-            if (uint.TryParse(search, out uint achievementId))
-            {
-                Achievements.Filter = view => view.Inner.Id == achievementId;
-                return;
-            }
+                if (VersionRegex().IsMatch(search))
+                {
+                    Achievements.Filter = view => view.Inner.Version == search;
+                    return;
+                }

-            if (VersionRegex().IsMatch(search))
-            {
-                Achievements.Filter = view => view.Inner.Version == search;
-                return;
+                Achievements.Filter = view =>
+                {
+                    return view.Inner.Title.Contains(search, StringComparison.CurrentCultureIgnoreCase)
+                        || view.Inner.Description.Contains(search, StringComparison.CurrentCultureIgnoreCase);
+                };
            }
-
-            Achievements.Filter = view =>
-            {
-                return view.Inner.Title.Contains(search, StringComparison.CurrentCultureIgnoreCase)
-                    || view.Inner.Description.Contains(search, StringComparison.CurrentCultureIgnoreCase);
-            };
        }
    }

--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/StatisticsCultivateItem.cs
@@ -28,7 +28,7 @@ internal sealed class StatisticsCultivateItem
    public Material Inner { get; }

    /// <summary>
-    /// 对应需求物品的个数
+    /// 对应背包物品的个数
    /// </summary>
    public uint Count { get; set; }

@@ -40,10 +40,10 @@ internal sealed class StatisticsCultivateItem
    /// <summary>
    /// 是否完成
    /// </summary>
-    public bool IsFinished { get => TotalCount >= Count; }
+    public bool IsFinished { get => Count >= TotalCount; }

    /// <summary>
    /// 格式化总数
    /// </summary>
-    public string CountFormatted { get => $"{TotalCount}/{Count}"; }
+    public string CountFormatted { get => $"{Count}/{TotalCount}"; }
 }
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/User/UserViewModel.cs
@@ -67,13 +67,10 @@ internal sealed partial class UserViewModel : ObservableObject
                }
            }

-            if (!ReferenceEquals(selectedUser, value))
+            if (SetProperty(ref selectedUser, value))
            {
-                selectedUser = value;
                userService.Current = value;
            }
-
-            OnPropertyChanged(nameof(SelectedUser));
        }
    }

@@ -219,11 +216,6 @@ internal sealed partial class UserViewModel : ObservableObject

        try
        {
-            if (user.IsSelected)
-            {
-                SelectedUser = default;
-            }
-
            await userService.RemoveUserAsync(user).ConfigureAwait(false);
            infoBarService.Success(SH.FormatViewModelUserRemoved(user.UserInfo?.Nickname));
        }
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs
@@ -119,12 +119,12 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel

                availableTokens = FrozenDictionary.ToFrozenDictionary(
                [
-                    .. avatars.Select((avatar, index) => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, index, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
-                    .. IntrinsicFrozen.AssociationTypeNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.AssociationType, nv.Name, (int)nv.Value, iconUri: AssociationTypeIconConverter.AssociationTypeToIconUri(nv.Value)))),
-                    .. IntrinsicFrozen.BodyTypeNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.BodyType, nv.Name, (int)nv.Value))),
-                    .. IntrinsicFrozen.ElementNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.ElementName, nv.Name, nv.Value, iconUri: ElementNameIconConverter.ElementNameToIconUri(nv.Name)))),
-                    .. IntrinsicFrozen.ItemQualityNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.ItemQuality, nv.Name, (int)nv.Value, quality: QualityColorConverter.QualityToColor(nv.Value)))),
-                    .. IntrinsicFrozen.WeaponTypeNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.WeaponType, nv.Name, (int)nv.Value, iconUri: WeaponTypeIconConverter.WeaponTypeToIconUri(nv.Value)))),
+                    .. avatars.Select(avatar => KeyValuePair.Create(avatar.Name, new SearchToken(SearchTokenKind.Avatar, avatar.Name, sideIconUri: AvatarSideIconConverter.IconNameToUri(avatar.SideIcon)))),
+                    .. IntrinsicFrozen.AssociationTypes.Select(assoc => KeyValuePair.Create(assoc, new SearchToken(SearchTokenKind.AssociationType, assoc, iconUri: AssociationTypeIconConverter.AssociationTypeNameToIconUri(assoc)))),
+                    .. IntrinsicFrozen.BodyTypes.Select(b => KeyValuePair.Create(b, new SearchToken(SearchTokenKind.BodyType, b))),
+                    .. IntrinsicFrozen.ElementNames.Select(e => KeyValuePair.Create(e, new SearchToken(SearchTokenKind.ElementName, e, iconUri: ElementNameIconConverter.ElementNameToIconUri(e)))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
                ]);

                return true;
@@ -246,11 +246,10 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
        if (FilterTokens.IsNullOrEmpty())
        {
            Avatars.Filter = default!;
+            return;
        }
-        else
-        {
-            Avatars.Filter = AvatarFilter.Compile(FilterTokens);
-        }
+
+        Avatars.Filter = AvatarFilter.Compile(FilterTokens);

        if (Selected is not null && Avatars.Contains(Selected))
        {
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs
@@ -119,10 +119,10 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel

                availableTokens = FrozenDictionary.ToFrozenDictionary(
                [
-                    .. weapons.Select((weapon, index) => KeyValuePair.Create(weapon.Name, new SearchToken(SearchTokenKind.Weapon, weapon.Name, index, sideIconUri: EquipIconConverter.IconNameToUri(weapon.Icon)))),
-                    .. IntrinsicFrozen.FightPropertyNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.FightProperty, nv.Name, (int)nv.Value))),
-                    .. IntrinsicFrozen.ItemQualityNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.ItemQuality, nv.Name, (int)nv.Value, quality: QualityColorConverter.QualityToColor(nv.Value)))),
-                    .. IntrinsicFrozen.WeaponTypeNameValues.Select(nv => KeyValuePair.Create(nv.Name, new SearchToken(SearchTokenKind.WeaponType, nv.Name, (int)nv.Value, iconUri: WeaponTypeIconConverter.WeaponTypeToIconUri(nv.Value)))),
+                    .. weapons.Select(w => KeyValuePair.Create(w.Name, new SearchToken(SearchTokenKind.Weapon, w.Name, sideIconUri: EquipIconConverter.IconNameToUri(w.Icon)))),
+                    .. IntrinsicFrozen.FightProperties.Select(f => KeyValuePair.Create(f, new SearchToken(SearchTokenKind.FightProperty, f))),
+                    .. IntrinsicFrozen.ItemQualities.Select(i => KeyValuePair.Create(i, new SearchToken(SearchTokenKind.ItemQuality, i, quality: QualityColorConverter.QualityNameToColor(i)))),
+                    .. IntrinsicFrozen.WeaponTypes.Select(w => KeyValuePair.Create(w, new SearchToken(SearchTokenKind.WeaponType, w, iconUri: WeaponTypeIconConverter.WeaponTypeNameToIconUri(w)))),
                ]);
            }
            catch (OperationCanceledException)
@@ -228,11 +228,10 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
        if (FilterTokens.IsNullOrEmpty())
        {
            Weapons.Filter = default!;
+            return;
        }
-        else
-        {
-            Weapons.Filter = WeaponFilter.Compile(FilterTokens);
-        }
+
+        Weapons.Filter = WeaponFilter.Compile(FilterTokens);

        if (Selected is not null && Weapons.Contains(Selected))
        {