update to hutao api v2

update to was 1.2.0 preview

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -24,8 +24,8 @@ body:
     id: shver
     attributes:
       label: Snap Hutao 版本
-      description: 在应用程序的设置界面中靠下的位置可以找到
-      placeholder: 例：1.0.30.0
+      description: 在应用标题，应用程序的设置界面中靠下的位置可以找到
+      placeholder: 例：1.1.0
     validations:
       required: true   
 
@@ -48,6 +48,42 @@ body:
   - type: textarea
     id: logs
     attributes:
-      label: 相关的崩溃日志 位于 %HOMEPATH%/Documents/Hutao/Log.db
-      description: 如果应用程序崩溃了，可以将崩溃日志复制后粘贴在此处，文件包含了敏感信息，谨慎上传
+      label: 相关的崩溃日志 位于 `%HOMEPATH%/Documents/Hutao/Log.db`
+      description: |
+                   在资源管理器中直接输入`%HOMEPATH%/Documents/Hutao`即可进入文件夹
+                   如果应用程序崩溃了，请将`log.db` 文件上传，文件包含了敏感信息，谨慎上传
+                   如果这个表单是关于导入祈愿记录的问题，请包含你导入的`Json`文件
+                   **务必不要上传`user.db`文件，该文件包含你的帐号敏感信息**
       render: shell
+  
+  - type: checkboxes
+    id: confirm-issue
+    attributes:
+      label: 我确认已在表单中附上了充足的补充说明以帮助开发人员确定问题
+      description: 补充说明包括但不限于：日志文件、抛出的错误信息、截图和录屏
+      options:
+        - label: 是
+          required: true
+        
+  - type: checkboxes
+    id: confirm-no-duplicated-issue
+    attributes:
+      label: 我确认没有他人提出相同或类似的问题
+      description: |
+                   请先通过 Issue 搜索功能确认这不是相同的问题；
+                   [BUG Issues](https://github.com/DGP-Studio/Snap.Hutao/issues?q=is%3Aissue+is%3Aopen+label%3ABUG)
+                   你应该在原始 Issue 中通过回复添加有助于解决问题的信息，而不是创建重复的问题；
+                   **没有帮助的重复问题可能会被直接关闭**
+      options:
+        - label: 是
+          required: true
+      
+  - type: checkboxes
+    id: confirm-docs
+    attributes:
+      label: 我确认该问题没有在文档中解释
+      description: Snap Hutao 官方文档：[https://hut.ao](https://hut.ao)
+      options:
+        - label: 是
+          required: true
+        

README.md

@@ -3,10 +3,18 @@
 
 ![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)
 
+## 项目首页（文档）
+
+[![Deploy Docs](https://github.com/DGP-Studio/Snap.Hutao.Docs/actions/workflows/deploy-docs.yml/badge.svg)](https://github.com/DGP-Studio/Snap.Hutao.Docs/actions/workflows/deploy-docs.yml)
+
+[HUT.AO](https://hut.ao)
+
 ## 安装
 
-* 前往 [下载页面](https://go.hut.ao/archive) 下载最新版本的 `胡桃` 安装包
-* 完全解压后，使用 powershell 运行 `install.ps1` 文件
+* 前往 [下载页面](https://go.hut.ao/down) 下载最新版本的 `胡桃` 安装包
+* （曾启用的可以跳过此步骤）在系统设置中打开 **开发者选项** 界面，勾选 `开发人员模式` 和 `允许 PowerShell 脚本`
+* 完全解压后，右键使用 powershell 运行 `install.ps1` 文件
+* 安装完成后可以关闭 `允许 PowerShell 脚本`
 
 ## 特别感谢
 

src/Snap.Hutao/.editorconfig

@@ -159,6 +159,7 @@ dotnet_diagnostic.CA1805.severity = suggestion
 
 # VSTHRD111: Use ConfigureAwait(bool)
 dotnet_diagnostic.VSTHRD111.severity = suggestion
+csharp_style_prefer_top_level_statements = true:silent
 
 [*.vb]
 #### 命名样式 ####

src/Snap.Hutao/Snap.Hutao.SourceGeneration/DedendencyInjection/InjectionGenerator.cs

@@ -73,14 +73,17 @@ internal static partial class ServiceCollectionExtensions
         StringBuilder lineBuilder = new();
 
         foreach (INamedTypeSymbol classSymbol in receiver.Classes)
+        {
+            IEnumerable<AttributeData> datas = classSymbol
+                .GetAttributes()
+                .Where(attr => attr.AttributeClass!.ToDisplayString() == InjectionSyntaxContextReceiver.AttributeName);
+
+            foreach (AttributeData injectionInfo in datas)
             {
                 lineBuilder
                     .Clear()
                     .Append("\r\n");
 
-            AttributeData injectionInfo = classSymbol
-                .GetAttributes()
-                .Single(attr => attr.AttributeClass!.ToDisplayString() == InjectionSyntaxContextReceiver.AttributeName);
                 ImmutableArray<TypedConstant> arguments = injectionInfo.ConstructorArguments;
 
                 TypedConstant injectAs = arguments[0];
@@ -108,6 +111,7 @@ internal static partial class ServiceCollectionExtensions
 
                 lines.Add(lineBuilder.ToString());
             }
+        }
 
         foreach (string line in lines.OrderBy(x => x))
         {

src/Snap.Hutao/Snap.Hutao/App.xaml.cs

@@ -3,6 +3,8 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.Windows.AppLifecycle;
+using Snap.Hutao.Core;
+using Snap.Hutao.Core.Exception;
 using Snap.Hutao.Core.LifeCycle;
 using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Core.Threading;
@@ -47,6 +49,7 @@ public partial class App : Application
             Activation.Activate(firstInstance, activatedEventArgs);
             firstInstance.Activated += Activation.Activate;
 
+            logger.LogInformation(EventIds.CommonLog, "Snap Hutao : {version}", CoreEnvironment.Version);
             logger.LogInformation(EventIds.CommonLog, "Cache folder : {folder}", ApplicationData.Current.TemporaryFolder.Path);
 
             Ioc.Default

src/Snap.Hutao/Snap.Hutao/Context/Database/AppDbContext.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.EntityFrameworkCore;
 using Snap.Hutao.Model.Entity;
+using Snap.Hutao.Model.Entity.Configuration;
 
 namespace Snap.Hutao.Context.Database;
 
@@ -50,6 +51,11 @@ public class AppDbContext : DbContext
     /// </summary>
     public DbSet<GachaArchive> GachaArchives { get; set; } = default!;
 
+    /// <summary>
+    /// 角色信息
+    /// </summary>
+    public DbSet<AvatarInfo> AvatarInfos { get; set; } = default!;
+
     /// <summary>
     /// 构造一个临时的应用程序数据库上下文
     /// </summary>
@@ -59,4 +65,12 @@ public class AppDbContext : DbContext
     {
         return new(new DbContextOptionsBuilder<AppDbContext>().UseSqlite(sqlConnectionString).Options);
     }
+
+    /// <inheritdoc/>
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder
+            .ApplyConfiguration(new AvatarInfoConfiguration())
+            .ApplyConfiguration(new UserConfiguration());
+    }
 }

src/Snap.Hutao/Snap.Hutao/Control/Behavior/ContentDialogBehavior.cs

@@ -1,40 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI.UI.Behaviors;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Shapes;
-
-namespace Snap.Hutao.Control.Behavior;
-
-/// <summary>
-/// Make ContentDialog's SmokeLayerBackground dsiplay over custom titleBar
-/// </summary>
-public class ContentDialogBehavior : BehaviorBase<FrameworkElement>
-{
-    /// <inheritdoc/>
-    protected override void OnAssociatedObjectLoaded()
-    {
-        DependencyObject parent = VisualTreeHelper.GetParent(AssociatedObject);
-
-        for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
-        {
-            DependencyObject current = VisualTreeHelper.GetChild(parent, i);
-            if (current is Rectangle { Name: "SmokeLayerBackground" } background)
-            {
-                background.ClearValue(FrameworkElement.MarginProperty);
-                background.RegisterPropertyChangedCallback(FrameworkElement.MarginProperty, OnMarginChanged);
-                break;
-            }
-        }
-    }
-
-    private static void OnMarginChanged(DependencyObject sender, DependencyProperty property)
-    {
-        if (property == FrameworkElement.MarginProperty)
-        {
-            sender.ClearValue(property);
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/Extension/ContentDialogExtensions.cs

@@ -3,8 +3,6 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.Xaml.Interactivity;
-using Snap.Hutao.Control.Behavior;
 using Snap.Hutao.Core.Threading;
 
 namespace Snap.Hutao.Control.Extension;
@@ -23,7 +21,6 @@ internal static class ContentDialogExtensions
     public static ContentDialog InitializeWithWindow(this ContentDialog contentDialog, Window window)
     {
         contentDialog.XamlRoot = window.Content.XamlRoot;
-        Interaction.SetBehaviors(contentDialog, new() { new ContentDialogBehavior() });
 
         return contentDialog;
     }

src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs

@@ -121,12 +121,19 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
     {
         await HideAsync(token);
 
-        if (uri != null)
-        {
-            StorageFile storageFile = await imageCache.GetFileFromCacheAsync(uri);
+        LoadedImageSurface? imageSurface = null;
         Compositor compositor = ElementCompositionPreview.GetElementVisual(this).Compositor;
 
-            LoadedImageSurface? imageSurface = null;
+        if (uri != null)
+        {
+            if (uri.Scheme == "ms-appx")
+            {
+                imageSurface = LoadedImageSurface.StartLoadFromUri(uri);
+            }
+            else
+            {
+                StorageFile storageFile = await imageCache.GetFileFromCacheAsync(uri);
+
                 try
                 {
                     imageSurface = await LoadImageSurfaceAsync(storageFile, token);
@@ -135,6 +142,7 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
                 {
                     await imageCache.RemoveAsync(uri.Enumerate());
                 }
+            }
 
             if (imageSurface != null)
             {

src/Snap.Hutao/Snap.Hutao/Control/Image/MonoChrome.cs

@@ -29,7 +29,6 @@ public class MonoChrome : CompositionImage
     {
         CompositionColorBrush blackLayerBursh = compositor.CreateColorBrush(Colors.Black);
         CompositionSurfaceBrush imageSurfaceBrush = compositor.CompositeSurfaceBrush(imageSurface, stretch: CompositionStretch.Uniform, vRatio: 0f);
-
         CompositionEffectBrush overlayBrush = compositor.CompositeBlendEffectBrush(blackLayerBursh, imageSurfaceBrush, BlendEffectMode.Overlay);
         CompositionEffectBrush opacityBrush = compositor.CompositeLuminanceToAlphaEffectBrush(overlayBrush);
 

src/Snap.Hutao/Snap.Hutao/Control/Markup/I18NExtension.cs

@@ -24,8 +24,8 @@ internal class I18NExtension : MarkupExtension
     static I18NExtension()
     {
         string currentName = CultureInfo.CurrentUICulture.Name;
-        Type languageType = EnumerableExtensions.GetValueOrDefault(TranslationMap, currentName, typeof(LanguagezhCN));
-        Translation = (ITranslation)Activator.CreateInstance(languageType)!;
+        Type? languageType = ((IDictionary<string, Type>)TranslationMap).GetValueOrDefault2(currentName, typeof(LanguagezhCN));
+        Translation = (ITranslation)Activator.CreateInstance(languageType!)!;
     }
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs

@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+
+namespace Snap.Hutao.Control.Markup;
+
+/// <summary>
+/// Uri扩展
+/// </summary>
+[MarkupExtensionReturnType(ReturnType = typeof(Uri))]
+public sealed class UriExtension : MarkupExtension
+{
+    /// <summary>
+    /// 构造一个新的Uri扩展
+    /// </summary>
+    public UriExtension()
+    {
+    }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Value { get; set; }
+
+    /// <inheritdoc/>
+    protected override object ProvideValue()
+    {
+        return new Uri(Value ?? string.Empty);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Panel/PanelSelector.xaml

@@ -0,0 +1,29 @@
+<UserControl
+    x:Class="Snap.Hutao.Control.Panel.PanelSelector"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shcm="using:Snap.Hutao.Control.Markup"
+    mc:Ignorable="d">
+
+    <SplitButton Padding="0,6" Click="SplitButtonClick" Loaded="SplitButtonLoaded">
+        <SplitButton.Content>
+            <FontIcon Name="IconPresenter" Glyph="&#xE8FD;"/>
+        </SplitButton.Content>
+        <SplitButton.Flyout>
+            <MenuFlyout>
+                <RadioMenuFlyoutItem
+                    Tag="List"
+                    Click="RadioMenuFlyoutItemClick"
+                    Icon="{shcm:FontIcon Glyph=&#xE8FD;}"
+                    Text="列表"/>
+                <RadioMenuFlyoutItem
+                    Tag="Grid"
+                    Click="RadioMenuFlyoutItemClick"
+                    Icon="{shcm:FontIcon Glyph=&#xF0E2;}"
+                    Text="网格"/>
+            </MenuFlyout>
+        </SplitButton.Flyout>
+    </SplitButton>
+</UserControl>

src/Snap.Hutao/Snap.Hutao/Control/Panel/PanelSelector.xaml.cs

@@ -0,0 +1,82 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Core;
+using Snap.Hutao.Web.Hutao.Model;
+
+namespace Snap.Hutao.Control.Panel;
+
+/// <summary>
+/// 面板选择器
+/// </summary>
+public sealed partial class PanelSelector : UserControl
+{
+    private static readonly DependencyProperty CurrentProperty = Property<PanelSelector>.Depend(nameof(Current), "List");
+
+    /// <summary>
+    /// 构造一个新的面板选择器
+    /// </summary>
+    public PanelSelector()
+    {
+        InitializeComponent();
+    }
+
+    /// <summary>
+    /// 当前选择
+    /// </summary>
+    public string Current
+    {
+        get { return (string)GetValue(CurrentProperty); }
+        set { SetValue(CurrentProperty, value); }
+    }
+
+    private void SplitButtonLoaded(object sender, RoutedEventArgs e)
+    {
+        MenuFlyout menuFlyout = (MenuFlyout)((SplitButton)sender).Flyout;
+        ((RadioMenuFlyoutItem)menuFlyout.Items[0]).IsChecked = true;
+    }
+
+    private void SplitButtonClick(SplitButton sender, SplitButtonClickEventArgs args)
+    {
+        MenuFlyout menuFlyout = (MenuFlyout)sender.Flyout;
+        int i = 0;
+        for (; i < menuFlyout.Items.Count; i++)
+        {
+            RadioMenuFlyoutItem current = (RadioMenuFlyoutItem)menuFlyout.Items[i];
+            if (current.IsChecked)
+            {
+                break;
+            }
+        }
+
+        i++;
+
+        if (i > menuFlyout.Items.Count)
+        {
+            i = 1;
+        }
+
+        if (i == menuFlyout.Items.Count)
+        {
+            i = 0;
+        }
+
+        RadioMenuFlyoutItem item = (RadioMenuFlyoutItem)menuFlyout.Items[i];
+        item.IsChecked = true;
+        UpdateState(item);
+    }
+
+    private void RadioMenuFlyoutItemClick(object sender, RoutedEventArgs e)
+    {
+        RadioMenuFlyoutItem item = (RadioMenuFlyoutItem)sender;
+        UpdateState(item);
+    }
+
+    private void UpdateState(RadioMenuFlyoutItem item)
+    {
+        Current = (string)item.Tag;
+        IconPresenter.Glyph = ((FontIcon)item.Icon).Glyph;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs

@@ -102,7 +102,7 @@ public class DescriptionTextBlock : ContentControl
 
             if (i == description.Length - 1)
             {
-                AppendText(text, description[last..i]);
+                AppendText(text, description[last..(i + 1)]);
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/Control/ValueConverterBase.cs

@@ -0,0 +1,59 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Data;
+
+namespace Snap.Hutao.Control;
+
+/// <summary>
+/// 值转换器
+/// </summary>
+/// <typeparam name="TFrom">源类型</typeparam>
+/// <typeparam name="TTo">目标类型</typeparam>
+public abstract class ValueConverterBase<TFrom, TTo> : IValueConverter
+{
+    /// <inheritdoc/>
+    public object? Convert(object value, Type targetType, object parameter, string language)
+    {
+#if DEBUG
+        try
+        {
+            return Convert((TFrom)value);
+        }
+        catch (Exception ex)
+        {
+            Ioc.Default
+                .GetRequiredService<ILogger<ValueConverterBase<TFrom, TTo>>>()
+                .LogError(ex, "值转换器异常");
+        }
+
+        return null;
+#else
+        return Convert((TFrom)value);
+#endif
+    }
+
+    /// <inheritdoc/>
+    public object? ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return ConvertBack((TTo)value);
+    }
+
+    /// <summary>
+    /// 从源类型转换到目标类型
+    /// </summary>
+    /// <param name="from">源</param>
+    /// <returns>目标</returns>
+    public abstract TTo Convert(TFrom from);
+
+    /// <summary>
+    /// 从目标类型转换到源类型
+    /// 重写时请勿调用基类方法
+    /// </summary>
+    /// <param name="to">目标</param>
+    /// <returns>源</returns>
+    public virtual TFrom ConvertBack(TTo to)
+    {
+        throw Must.NeverHappen();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Caching/CacheBase.cs

@@ -3,9 +3,10 @@
 // See the LICENSE file in the project root for more information.
 
 using Snap.Hutao.Core.Logging;
-using Snap.Hutao.Extension;
+using Snap.Hutao.Core.Threading;
 using System.IO;
 using System.Net.Http;
+using System.Security.Cryptography;
 using System.Text;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
@@ -138,7 +139,7 @@ public abstract class CacheBase<T>
 
         IStorageItem? item = await folder.TryGetItemAsync(fileName).AsTask().ConfigureAwait(false);
 
-        if (item == null)
+        if (item == null || (await item.GetBasicPropertiesAsync()).Size == 0)
         {
             StorageFile baseFile = await folder.CreateFileAsync(fileName, CreationCollisionOption.ReplaceExisting).AsTask().ConfigureAwait(false);
             await DownloadFileAsync(uri, baseFile).ConfigureAwait(false);
@@ -169,34 +170,21 @@ public abstract class CacheBase<T>
 
     private static string GetCacheFileName(Uri uri)
     {
-        return CreateHash64(uri.ToString()).ToString();
-    }
-
-    private static ulong CreateHash64(string str)
-    {
-        byte[] utf8 = Encoding.UTF8.GetBytes(str);
-
-        ulong value = (ulong)utf8.Length;
-        for (int n = 0; n < utf8.Length; n++)
-        {
-            value += (ulong)utf8[n] << ((n * 5) % 56);
-        }
-
-        return value;
+        string url = uri.ToString();
+        byte[] chars = Encoding.UTF8.GetBytes(url);
+        byte[] hash = SHA1.HashData(chars);
+        return System.Convert.ToHexString(hash);
     }
 
     private async Task DownloadFileAsync(Uri uri, StorageFile baseFile)
     {
         logger.LogInformation(EventIds.FileCaching, "Begin downloading for {uri}", uri);
 
-        using (Stream httpStream = await httpClient.GetStreamAsync(uri))
+        using (Stream httpStream = await httpClient.GetStreamAsync(uri).ConfigureAwait(false))
         {
-            using (Stream fileStream = await baseFile.OpenStreamForWriteAsync())
+            using (FileStream fileStream = File.Create(baseFile.Path))
             {
-                await httpStream.CopyToAsync(fileStream);
-
-                // Call this before dispose fileStream.
-                await fileStream.FlushAsync();
+                await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
             }
         }
     }

src/Snap.Hutao/Snap.Hutao/Core/Caching/ImageCache.cs

@@ -15,7 +15,7 @@ namespace Snap.Hutao.Core.Caching;
 /// </summary>
 [Injection(InjectAs.Singleton, typeof(IImageCache))]
 [HttpClient(HttpClientConfigration.Default)]
-[PrimaryHttpMessageHandler(MaxConnectionsPerServer = 20)]
+[PrimaryHttpMessageHandler(MaxConnectionsPerServer = 16)]
 public class ImageCache : CacheBase<BitmapImage>, IImageCache
 {
     private const string DateAccessedProperty = "System.DateAccessed";

src/Snap.Hutao/Snap.Hutao/Core/CoreEnvironment.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Extension;
+using System.Text.Encodings.Web;
 using Windows.ApplicationModel;
 
 namespace Snap.Hutao.Core;
@@ -11,17 +12,17 @@ namespace Snap.Hutao.Core;
 /// </summary>
 internal static class CoreEnvironment
 {
+    // 计算过程：https://gist.github.com/Lightczx/373c5940b36e24b25362728b52dec4fd
+
     /// <summary>
     /// 动态密钥1的盐
-    /// 计算过程：https://gist.github.com/Lightczx/373c5940b36e24b25362728b52dec4fd
     /// </summary>
-    public const string DynamicSecret1Salt = "n0KjuIrKgLHh08LWSCYP0WXlVXaYvV64";
+    public const string DynamicSecret1Salt = "yUZ3s0Sna1IrSNfk29Vo6vRapdOyqyhB";
 
     /// <summary>
     /// 动态密钥2的盐
-    /// 计算过程：https://gist.github.com/Lightczx/373c5940b36e24b25362728b52dec4fd
     /// </summary>
-    public const string DynamicSecret2Salt = "YVEIkzDFNHLeKXLxzqCA9TzxCpWwbIbk";
+    public const string DynamicSecret2Salt = "xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs";
 
     /// <summary>
     /// 米游社请求UA
@@ -31,7 +32,7 @@ internal static class CoreEnvironment
     /// <summary>
     /// 米游社 Rpc 版本
     /// </summary>
-    public const string HoyolabXrpcVersion = "2.36.1";
+    public const string HoyolabXrpcVersion = "2.38.1";
 
     /// <summary>
     /// 标准UA
@@ -48,6 +49,17 @@ internal static class CoreEnvironment
     /// </summary>
     public static readonly string HoyolabDeviceId;
 
+    /// <summary>
+    /// 默认的Json序列化选项
+    /// </summary>
+    public static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        PropertyNameCaseInsensitive = true,
+        WriteIndented = true,
+    };
+
     static CoreEnvironment()
     {
         Version = Package.Current.Id.Version.ToVersion();

src/Snap.Hutao/Snap.Hutao/Core/Database/DbCurrent.cs

@@ -74,3 +74,80 @@ internal class DbCurrent<TEntity, TMessage>
         }
     }
 }
+
+/// <summary>
+/// 数据库当前项
+/// 简化对数据库中选中项的管理
+/// </summary>
+/// <typeparam name="TObservable">绑定类型</typeparam>
+/// <typeparam name="TEntity">实体的类型</typeparam>
+/// <typeparam name="TMessage">消息的类型</typeparam>
+[SuppressMessage("", "SA1402")]
+internal class DbCurrent<TObservable, TEntity, TMessage>
+    where TObservable : class
+    where TEntity : class, ISelectable
+    where TMessage : Message.ValueChangedMessage<TObservable>
+{
+    private readonly DbContext dbContext;
+    private readonly DbSet<TEntity> dbSet;
+    private readonly IMessenger messenger;
+    private readonly Func<TObservable, TEntity> selector;
+
+    private TObservable? current;
+
+    /// <summary>
+    /// 构造一个新的数据库当前项
+    /// </summary>
+    /// <param name="dbContext">数据库上下文</param>
+    /// <param name="dbSet">数据集</param>
+    /// <param name="selector">选择器</param>
+    /// <param name="messenger">消息器</param>
+    public DbCurrent(DbContext dbContext, DbSet<TEntity> dbSet, Func<TObservable, TEntity> selector, IMessenger messenger)
+    {
+        this.dbContext = dbContext;
+        this.dbSet = dbSet;
+        this.selector = selector;
+        this.messenger = messenger;
+    }
+
+    /// <summary>
+    /// 当前选中的项
+    /// </summary>
+    public TObservable? Current
+    {
+        get => current;
+        set
+        {
+            // prevent useless sets
+            if (current == value)
+            {
+                return;
+            }
+
+            // only update when not processing a deletion
+            if (value != null)
+            {
+                if (current != null)
+                {
+                    TEntity entity = selector(current);
+                    entity.IsSelected = false;
+                    dbSet.Update(entity);
+                    dbContext.SaveChanges();
+                }
+            }
+
+            TMessage message = (TMessage)Activator.CreateInstance(typeof(TMessage), current, value)!;
+            current = value;
+
+            if (current != null)
+            {
+                TEntity entity = selector(current);
+                entity.IsSelected = true;
+                dbSet.Update(entity);
+                dbContext.SaveChanges();
+            }
+
+            messenger.Send(message);
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/Annotation/InjectionAttribute.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Core.DependencyInjection.Annotation;
 /// 指示被标注的类型可注入
 /// 由源生成器生成注入代码
 /// </summary>
-[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
 public class InjectionAttribute : Attribute
 {
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Core/DependencyInjection/IocConfiguration.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Snap.Hutao.Context.Database;
 using Snap.Hutao.Context.FileSystem;
 using System.Diagnostics;
-using System.Text.Encodings.Web;
 
 namespace Snap.Hutao.Core.DependencyInjection;
 
@@ -22,14 +21,7 @@ internal static class IocConfiguration
     /// <returns>可继续操作的集合</returns>
     public static IServiceCollection AddJsonSerializerOptions(this IServiceCollection services)
     {
-        return services
-            .AddSingleton(new JsonSerializerOptions()
-            {
-                DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                PropertyNameCaseInsensitive = true,
-                WriteIndented = true,
-            });
+        return services.AddSingleton(CoreEnvironment.JsonOptions);
     }
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Core/Exception/ExceptionRecorder.cs

@@ -2,9 +2,12 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using Snap.Hutao.Core.Diagnostics;
 using Snap.Hutao.Core.Logging;
+using System.Diagnostics;
+using System.IO;
 
-namespace Snap.Hutao.Core.LifeCycle;
+namespace Snap.Hutao.Core.Exception;
 
 /// <summary>
 /// 异常记录器
@@ -26,22 +29,20 @@ internal class ExceptionRecorder
         application.DebugSettings.BindingFailed += OnXamlBindingFailed;
     }
 
-    /// <summary>
-    /// 当应用程序未经处理的异常引发时调用
-    /// </summary>
-    /// <param name="sender">实例</param>
-    /// <param name="e">事件参数</param>
-    public void OnAppUnhandledException(object? sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+    private void OnAppUnhandledException(object? sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
     {
-        logger.LogError(EventIds.UnhandledException, e.Exception, "未经处理的异常: [HResult:{code}]", e.Exception.HResult);
+        // string path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+        // string fileName = $"ex-{DateTimeOffset.Now:yyyyMMddHHmmssffff}.txt";
+        // File.WriteAllText(Path.Combine(path, fileName), $"{e.Exception}\r\n{e.Exception.StackTrace}");
+        logger.LogError(EventIds.UnhandledException, e.Exception, "未经处理的异常");
+
+        foreach (ILoggerProvider provider in Ioc.Default.GetRequiredService<IEnumerable<ILoggerProvider>>())
+        {
+            provider.Dispose();
+        }
     }
 
-    /// <summary>
-    /// Xaml 绑定失败时触发
-    /// </summary>
-    /// <param name="sender">实例</param>
-    /// <param name="e">事件参数</param>
-    public void OnXamlBindingFailed(object? sender, BindingFailedEventArgs e)
+    private void OnXamlBindingFailed(object? sender, BindingFailedEventArgs e)
     {
         logger.LogCritical(EventIds.XamlBindingError, "XAML绑定失败: {message}", e.Message);
     }

src/Snap.Hutao/Snap.Hutao/Core/IO/DataTransfer/Clipboard.cs

@@ -25,4 +25,16 @@ internal static class Clipboard
         string json = await view.GetTextAsync();
         return JsonSerializer.Deserialize<T>(json, options);
     }
+
+    /// <summary>
+    /// 设置文本
+    /// </summary>
+    /// <param name="text">文本</param>
+    public static void SetText(string text)
+    {
+        DataPackage content = new();
+        content.SetText(text);
+        Windows.ApplicationModel.DataTransfer.Clipboard.SetContent(content);
+        Windows.ApplicationModel.DataTransfer.Clipboard.Flush();
+    }
 }

src/Snap.Hutao/Snap.Hutao/Core/IO/StorageFileExtensions.cs

@@ -1,9 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core.Threading;
 using System.IO;
 using Windows.Storage;
-using Windows.Storage.Streams;
 
 namespace Snap.Hutao.Core.IO;
 
@@ -18,27 +18,47 @@ public static class StorageFileExtensions
     /// <typeparam name="T">内容的类型</typeparam>
     /// <param name="file">文件</param>
     /// <param name="options">序列化选项</param>
-    /// <param name="onException">错误时调用</param>
-    /// <returns>反序列化后的内容</returns>
-    public static async Task<T?> DeserializeJsonAsync<T>(this StorageFile file, JsonSerializerOptions options, Action<System.Exception>? onException = null)
+    /// <returns>操作是否成功，反序列化后的内容</returns>
+    public static async Task<ValueResult<bool, T?>> DeserializeFromJsonAsync<T>(this StorageFile file, JsonSerializerOptions options)
         where T : class
     {
-        T? t = null;
         try
         {
-            using (IRandomAccessStreamWithContentType fileSream = await file.OpenReadAsync())
+            using (FileStream stream = File.OpenRead(file.Path))
             {
-                using (Stream stream = fileSream.AsStream())
-                {
-                    t = await JsonSerializer.DeserializeAsync<T>(stream, options).ConfigureAwait(false);
-                }
+                T? t = await JsonSerializer.DeserializeAsync<T>(stream, options).ConfigureAwait(false);
+                return new(true, t);
             }
         }
         catch (System.Exception ex)
         {
-            onException?.Invoke(ex);
+            _ = ex;
+            return new(false, null);
+        }
     }
 
-        return t;
+    /// <summary>
+    /// 将对象异步序列化入文件
+    /// </summary>
+    /// <typeparam name="T">对象的类型</typeparam>
+    /// <param name="file">文件</param>
+    /// <param name="obj">对象</param>
+    /// <param name="options">序列化选项</param>
+    /// <returns>操作是否成功</returns>
+    public static async Task<bool> SerializeToJsonAsync<T>(this StorageFile file, T obj, JsonSerializerOptions options)
+    {
+        try
+        {
+            using (FileStream stream = File.Create(file.Path))
+            {
+                await JsonSerializer.SerializeAsync(stream, obj, options).ConfigureAwait(false);
+            }
+
+            return true;
+        }
+        catch (System.Exception)
+        {
+            return false;
+        }
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Json/Converter/EnumStringValueConverter{TEnum}.cs

@@ -0,0 +1,29 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Core.Json.Converter;
+
+/// <summary>
+/// 枚举 - 字符串数字 转换器
+/// </summary>
+/// <typeparam name="TEnum">枚举的类型</typeparam>
+internal class EnumStringValueConverter<TEnum> : JsonConverter<TEnum>
+    where TEnum : struct, Enum
+{
+    /// <inheritdoc/>
+    public override TEnum Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.GetString() is string str)
+        {
+            return Enum.Parse<TEnum>(str);
+        }
+
+        throw Must.NeverHappen();
+    }
+
+    /// <inheritdoc/>
+    public override void Write(Utf8JsonWriter writer, TEnum value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString("D"));
+    }
+}

src/Snap.Hutao/Snap.Hutao/Core/Json/Converter/StringEnumKeyDictionaryConverter.cs

@@ -1,8 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using System.Reflection;
-
 namespace Snap.Hutao.Core.Json.Converter;
 
 /// <summary>
@@ -18,7 +16,7 @@ public class StringEnumKeyDictionaryConverter : JsonConverterFactory
             return false;
         }
 
-        if (typeToConvert.GetGenericTypeDefinition() != typeof(Dictionary<,>))
+        if (typeToConvert.GetGenericTypeDefinition() != typeof(IDictionary<,>))
         {
             return false;
         }
@@ -33,24 +31,19 @@ public class StringEnumKeyDictionaryConverter : JsonConverterFactory
         Type valueType = type.GetGenericArguments()[1];
 
         Type innerConverterType = typeof(StringEnumDictionaryConverterInner<,>).MakeGenericType(keyType, valueType);
-        JsonConverter converter = (JsonConverter)Activator.CreateInstance(innerConverterType, BindingFlags.Instance | BindingFlags.Public, null, new object[] { options }, null)!;
+        JsonConverter converter = (JsonConverter)Activator.CreateInstance(innerConverterType)!;
         return converter;
     }
 
     private class StringEnumDictionaryConverterInner<TKey, TValue> : JsonConverter<IDictionary<TKey, TValue>>
         where TKey : struct, Enum
     {
-        private readonly JsonConverter<TValue>? valueConverter;
         private readonly Type keyType;
-        private readonly Type valueType;
 
-        public StringEnumDictionaryConverterInner(JsonSerializerOptions options)
+        public StringEnumDictionaryConverterInner()
         {
-            valueConverter = (JsonConverter<TValue>)options.GetConverter(typeof(TValue));
-
             // Cache the key and value types.
             keyType = typeof(TKey);
-            valueType = typeof(TValue);
         }
 
         public override IDictionary<TKey, TValue> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -77,22 +70,13 @@ public class StringEnumKeyDictionaryConverter : JsonConverterFactory
 
                 string? propertyName = reader.GetString();
 
-                if (!Enum.TryParse(propertyName, out TKey key))
+                if (!Enum.TryParse(propertyName, ignoreCase: false, out TKey key) && !Enum.TryParse(propertyName, ignoreCase: true, out key))
                 {
                     throw new JsonException($"Unable to convert \"{propertyName}\" to Enum \"{keyType}\".");
                 }
 
                 // Get the value.
-                TValue value;
-                if (valueConverter != null)
-                {
-                    reader.Read();
-                    value = valueConverter.Read(ref reader, valueType, options)!;
-                }
-                else
-                {
-                    value = JsonSerializer.Deserialize<TValue>(ref reader, options)!;
-                }
+                TValue value = JsonSerializer.Deserialize<TValue>(ref reader, options)!;
 
                 // Add to dictionary.
                 dictionary.Add(key, value);
@@ -111,16 +95,8 @@ public class StringEnumKeyDictionaryConverter : JsonConverterFactory
                 string? convertedName = options.PropertyNamingPolicy?.ConvertName(propertyName) ?? propertyName;
 
                 writer.WritePropertyName(convertedName);
-
-                if (valueConverter != null)
-                {
-                    valueConverter.Write(writer, value, options);
-                }
-                else
-                {
                 JsonSerializer.Serialize(writer, value, options);
             }
-            }
 
             writer.WriteEndObject();
         }

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/Activation.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.Windows.AppLifecycle;
 using Snap.Hutao.Core.Threading;
-using Snap.Hutao.Extension;
 using Snap.Hutao.Service.Abstraction;
 using Snap.Hutao.Service.Navigation;
 

src/Snap.Hutao/Snap.Hutao/Core/Logging/EventIds.cs

@@ -88,6 +88,16 @@ internal static class EventIds
     /// 成就
     /// </summary>
     public static readonly EventId Achievement = 100130;
+
+    /// <summary>
+    /// 祈愿统计生成
+    /// </summary>
+    public static readonly EventId GachaStatisticGeneration = 100140;
+
+    /// <summary>
+    /// 祈愿统计生成
+    /// </summary>
+    public static readonly EventId AvatarInfoGeneration = 100150;
     #endregion
 
     #region 杂项

src/Snap.Hutao/Snap.Hutao/Core/Logging/LogEntryQueue.cs

@@ -20,6 +20,8 @@ public sealed class LogEntryQueue : IDisposable
     private readonly TaskCompletionSource writeDbCompletionSource = new();
     private readonly LogDbContext logDbContext;
 
+    private bool disposed;
+
     /// <summary>
     /// 构造一个新的日志队列
     /// </summary>
@@ -27,7 +29,7 @@ public sealed class LogEntryQueue : IDisposable
     {
         logDbContext = InitializeDbContext();
 
-        Task.Run(async () => await WritePendingLogsAsync(disposeTokenSource.Token)).SafeForget();
+        Task.Run(() => WritePendingLogsAsync(disposeTokenSource.Token)).SafeForget();
     }
 
     /// <summary>
@@ -43,6 +45,11 @@ public sealed class LogEntryQueue : IDisposable
     [SuppressMessage("", "VSTHRD002")]
     public void Dispose()
     {
+        if (disposed)
+        {
+            return;
+        }
+
         // notify the write task to complete.
         disposeTokenSource.Cancel();
 
@@ -50,6 +57,7 @@ public sealed class LogEntryQueue : IDisposable
         writeDbCompletionSource.Task.GetAwaiter().GetResult();
 
         logDbContext.Dispose();
+        disposed = true;
     }
 
     private static LogDbContext InitializeDbContext()
@@ -62,9 +70,8 @@ public sealed class LogEntryQueue : IDisposable
             logDbContext.Database.Migrate();
         }
 
-        logDbContext.Logs.RemoveRange(logDbContext.Logs);
-        logDbContext.SaveChanges();
-
+        // only raw sql can pass
+        logDbContext.Database.ExecuteSqlRaw("DELETE FROM logs WHERE Exception IS NULL");
         return logDbContext;
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Threading/SemaphoreSlimExtensions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Snap.Hutao.Extension;
+namespace Snap.Hutao.Core.Threading;
 
 /// <summary>
 /// 信号量扩展
@@ -15,7 +15,7 @@ public static class SemaphoreSlimExtensions
     /// <returns>可释放的对象，用于释放信号量</returns>
     public static async Task<IDisposable> EnterAsync(this SemaphoreSlim semaphoreSlim)
     {
-        await semaphoreSlim.WaitAsync();
+        await semaphoreSlim.WaitAsync().ConfigureAwait(false);
         return new SemaphoreSlimReleaser(semaphoreSlim);
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Threading/ValueResult.cs

@@ -12,8 +12,6 @@ namespace Snap.Hutao.Core.Threading;
 /// <typeparam name="TResult">结果类型</typeparam>
 /// <typeparam name="TValue">值类型</typeparam>
 public readonly struct ValueResult<TResult, TValue> : IDeconstructable<TResult, TValue>
-    where TResult : notnull
-    where TValue : notnull
 {
     /// <summary>
     /// 是否成功

src/Snap.Hutao/Snap.Hutao/Core/Windowing/ExtendedWindow.cs

@@ -5,6 +5,8 @@ using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Snap.Hutao.Core.Logging;
+using Snap.Hutao.Extension;
+using Snap.Hutao.Win32;
 using Windows.Graphics;
 using Windows.UI;
 using Windows.Win32.Foundation;
@@ -16,7 +18,7 @@ namespace Snap.Hutao.Core.Windowing;
 /// 窗口管理器
 /// 主要包含了针对窗体的 P/Inoke 逻辑
 /// </summary>
-internal sealed class WindowManager : IDisposable
+internal sealed class ExtendedWindow
 {
     private readonly HWND handle;
     private readonly AppWindow appWindow;
@@ -24,7 +26,7 @@ internal sealed class WindowManager : IDisposable
     private readonly Window window;
     private readonly FrameworkElement titleBar;
 
-    private readonly ILogger<WindowManager> logger;
+    private readonly ILogger<ExtendedWindow> logger;
     private readonly WindowSubclassManager subclassManager;
 
     private readonly bool useLegacyDragBar;
@@ -34,15 +36,15 @@ internal sealed class WindowManager : IDisposable
     /// </summary>
     /// <param name="window">窗口</param>
     /// <param name="titleBar">充当标题栏的元素</param>
-    public WindowManager(Window window, FrameworkElement titleBar)
+    private ExtendedWindow(Window window, FrameworkElement titleBar)
     {
         this.window = window;
         this.titleBar = titleBar;
-        logger = Ioc.Default.GetRequiredService<ILogger<WindowManager>>();
+        logger = Ioc.Default.GetRequiredService<ILogger<ExtendedWindow>>();
 
         handle = (HWND)WindowNative.GetWindowHandle(window);
 
-        Microsoft.UI.WindowId windowId = Win32Interop.GetWindowIdFromWindow(handle);
+        WindowId windowId = Win32Interop.GetWindowIdFromWindow(handle);
         appWindow = AppWindow.GetFromWindowId(windowId);
 
         useLegacyDragBar = !AppWindowTitleBar.IsCustomizationSupported();
@@ -51,11 +53,15 @@ internal sealed class WindowManager : IDisposable
         InitializeWindow();
     }
 
-    /// <inheritdoc/>
-    public void Dispose()
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    /// <param name="window">窗口</param>
+    /// <param name="titleBar">标题栏</param>
+    /// <returns>实例</returns>
+    public static ExtendedWindow Initialize(Window window, FrameworkElement titleBar)
     {
-        Persistence.Save(appWindow);
-        subclassManager?.Dispose();
+        return new(window, titleBar);
     }
 
     private static void UpdateTitleButtonColor(AppWindowTitleBar appTitleBar)
@@ -105,11 +111,19 @@ internal sealed class WindowManager : IDisposable
 
         appWindow.Show(true);
 
-        bool micaApplied = new SystemBackdrop(window).TrySetBackdrop();
+        bool micaApplied = new SystemBackdrop(window).TryApply();
         logger.LogInformation(EventIds.BackdropState, "Apply {name} : {result}", nameof(SystemBackdrop), micaApplied ? "succeed" : "failed");
 
         bool subClassApplied = subclassManager.TrySetWindowSubclass();
         logger.LogInformation(EventIds.SubClassing, "Apply {name} : {result}", nameof(WindowSubclassManager), subClassApplied ? "succeed" : "failed");
+
+        window.Closed += OnWindowClosed;
+    }
+
+    private void OnWindowClosed(object sender, WindowEventArgs args)
+    {
+        Persistence.Save(appWindow);
+        subclassManager?.Dispose();
     }
 
     private void ExtendsContentIntoTitleBar()
@@ -137,14 +151,8 @@ internal sealed class WindowManager : IDisposable
     {
         double scale = Persistence.GetScaleForWindow(handle);
 
-        List<RectInt32> dragRectsList = new();
-
         // 48 is the navigation button leftInset
-        RectInt32 dragRect = new((int)(48 * scale), 0, (int)(titleBar.ActualWidth * scale), (int)(titleBar.ActualHeight * scale));
-        dragRectsList.Add(dragRect);
-
-        RectInt32[] dragRects = dragRectsList.ToArray();
-
-        appTitleBar.SetDragRectangles(dragRects);
+        RectInt32 dragRect = new RectInt32(48, 0, (int)titleBar.ActualWidth, (int)titleBar.ActualHeight).Scale(scale);
+        appTitleBar.SetDragRectangles(dragRect.Enumerate().ToArray());
     }
 }

src/Snap.Hutao/Snap.Hutao/Core/Windowing/Persistence.cs

@@ -4,6 +4,7 @@
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Snap.Hutao.Core.Setting;
+using Snap.Hutao.Win32;
 using System.Runtime.InteropServices;
 using Windows.Graphics;
 using Windows.Win32.Foundation;
@@ -25,11 +26,15 @@ internal static class Persistence
         // Set first launch size.
         HWND hwnd = (HWND)Win32Interop.GetWindowFromWindowId(appWindow.Id);
         SizeInt32 size = TransformSizeForWindow(new(1200, 741), hwnd);
-        RectInt32 rect = new(0, 0, size.Width, size.Height);
+        RectInt32 rect = StructMarshal.RectInt32(size);
 
-        // Make it centralized
-        TransformToCenterScreen(ref rect);
         RectInt32 target = (CompactRect)LocalSetting.Get(SettingKeys.WindowRect, (ulong)(CompactRect)rect);
+        if (target.Width * target.Height < 848 * 524)
+        {
+            target = rect;
+        }
+
+        TransformToCenterScreen(ref target);
         appWindow.MoveAndResize(target);
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Windowing/SystemBackdrop.cs

@@ -34,7 +34,7 @@ public class SystemBackdrop
     /// 尝试设置背景
     /// </summary>
     /// <returns>是否设置成功</returns>
-    public bool TrySetBackdrop()
+    public bool TryApply()
     {
         if (!MicaController.IsSupported())
         {
@@ -58,7 +58,7 @@ public class SystemBackdrop
             backdropController = new()
             {
                 // Mica Alt
-                Kind = MicaKind.BaseAlt
+                Kind = MicaKind.BaseAlt,
             };
             backdropController.AddSystemBackdropTarget(window.As<ICompositionSupportsSystemBackdrop>());
             backdropController.SetSystemBackdropConfiguration(configuration);

src/Snap.Hutao/Snap.Hutao/Extension/BinaryReaderExtension.cs

@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="BinaryReader"/> 扩展
 /// </summary>
-public static class BinaryReaderExtensions
+public static class BinaryReaderExtension
 {
     /// <summary>
     /// 判断是否处于流的结尾

src/Snap.Hutao/Snap.Hutao/Extension/DateTimeOffsetExtension.cs

@@ -6,7 +6,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="DateTimeOffset"/> 扩展
 /// </summary>
-public static class DateTimeOffsetExtensions
+public static class DateTimeOffsetExtension
 {
     /// <summary>
     /// Converts the current <see cref="DateTimeOffset"/> to a <see cref="DateTimeOffset"/> that represents the local time.

src/Snap.Hutao/Snap.Hutao/Extension/EnumExtension.cs

@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 枚举拓展
 /// </summary>
-public static class EnumExtensions
+public static class EnumExtension
 {
     /// <summary>
     /// 获取枚举的描述

src/Snap.Hutao/Snap.Hutao/Extension/EnumerableExtension.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Extension;
@@ -8,7 +9,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// <see cref="IEnumerable{T}"/> 扩展
 /// </summary>
-public static partial class EnumerableExtensions
+public static partial class EnumerableExtension
 {
     /// <inheritdoc cref="Enumerable.Average(IEnumerable{int})"/>
     public static double AverageNoThrow(this List<int> source)
@@ -107,7 +108,7 @@ public static partial class EnumerableExtensions
     /// <param name="key">键</param>
     /// <param name="defaultValue">默认值</param>
     /// <returns>结果值</returns>
-    public static TValue GetValueOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue defaultValue = default!)
+    public static TValue? GetValueOrDefault2<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue? defaultValue = default)
         where TKey : notnull
     {
         if (dictionary.TryGetValue(key, out TValue? value))
@@ -118,6 +119,53 @@ public static partial class EnumerableExtensions
         return defaultValue;
     }
 
+    /// <summary>
+    /// 增加计数
+    /// </summary>
+    /// <typeparam name="TKey">键类型</typeparam>
+    /// <param name="dict">字典</param>
+    /// <param name="key">键</param>
+    public static void Increase<TKey>(this Dictionary<TKey, int> dict, TKey key)
+        where TKey : notnull
+    {
+        ++CollectionsMarshal.GetValueRefOrAddDefault(dict, key, out _);
+    }
+
+    /// <summary>
+    /// 增加计数
+    /// </summary>
+    /// <typeparam name="TKey">键类型</typeparam>
+    /// <param name="dict">字典</param>
+    /// <param name="key">键</param>
+    /// <param name="value">增加的值</param>
+    public static void Increase<TKey>(this Dictionary<TKey, int> dict, TKey key, int value)
+        where TKey : notnull
+    {
+        // ref the value, so that we can manipulate it outside the dict.
+        ref int current = ref CollectionsMarshal.GetValueRefOrAddDefault(dict, key, out _);
+        current += value;
+    }
+
+    /// <summary>
+    /// 增加计数
+    /// </summary>
+    /// <typeparam name="TKey">键类型</typeparam>
+    /// <param name="dict">字典</param>
+    /// <param name="key">键</param>
+    /// <returns>是否存在键值</returns>
+    public static bool TryIncrease<TKey>(this Dictionary<TKey, int> dict, TKey key)
+        where TKey : notnull
+    {
+        ref int value = ref CollectionsMarshal.GetValueRefOrNullRef(dict, key);
+        if (!Unsafe.IsNullRef(ref value))
+        {
+            ++value;
+            return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// 移除表中首个满足条件的项
     /// </summary>
@@ -153,6 +201,20 @@ public static partial class EnumerableExtensions
         return dictionary;
     }
 
+    /// <inheritdoc cref="Enumerable.ToDictionary{TSource, TKey, TElement}(IEnumerable{TSource}, Func{TSource, TKey}, Func{TSource, TElement})"/>
+    public static Dictionary<TKey, TValue> ToDictionaryOverride<TKey, TValue, TSource>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TValue> valueSelector)
+        where TKey : notnull
+    {
+        Dictionary<TKey, TValue> dictionary = new();
+
+        foreach (TSource value in source)
+        {
+            dictionary[keySelector(value)] = valueSelector(value);
+        }
+
+        return dictionary;
+    }
+
     /// <summary>
     /// 表示一个对 <see cref="TItem"/> 类型的计数器
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Extension/NumberExtension.cs

@@ -6,8 +6,19 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 数高性能扩展
 /// </summary>
-public static class NumberExtensions
+public static class NumberExtension
 {
+    /// <summary>
+    /// 获取从右向左某位上的数字
+    /// </summary>
+    /// <param name="x">源</param>
+    /// <param name="place">位</param>
+    /// <returns>数字</returns>
+    public static int AtPlace(this int x, int place)
+    {
+        return (int)(x / Math.Pow(10, place - 1)) % 10;
+    }
+
     /// <summary>
     /// 计算给定整数的位数
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Extension/ObjectExtension.cs

@@ -6,7 +6,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 对象扩展
 /// </summary>
-public static class ObjectExtensions
+public static class ObjectExtension
 {
     /// <summary>
     /// <see langword="as"/> 的链式调用扩展

src/Snap.Hutao/Snap.Hutao/Extension/PackageVersionExtension.cs

@@ -8,7 +8,7 @@ namespace Snap.Hutao.Extension;
 /// <summary>
 /// 包版本扩展
 /// </summary>
-public static class PackageVersionExtensions
+public static class PackageVersionExtension
 {
     /// <summary>
     /// 将包版本转换为版本

src/Snap.Hutao/Snap.Hutao/Factory/AsyncRelayCommandFactory.cs

@@ -93,7 +93,7 @@ internal class AsyncRelayCommandFactory : IAsyncRelayCommandFactory
                     if (asyncRelayCommand.ExecutionTask?.Exception is AggregateException exception)
                     {
                         Exception baseException = exception.GetBaseException();
-                        logger.LogError(EventIds.AsyncCommandException, baseException, "{name} Exception", nameof(asyncRelayCommand));
+                        logger.LogError(EventIds.AsyncCommandException, baseException, "{name} Exception", nameof(AsyncRelayCommand));
                     }
                 }
             }

src/Snap.Hutao/Snap.Hutao/MainWindow.xaml

@@ -1,18 +1,18 @@
 <Window
     x:Class="Snap.Hutao.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:view="using:Snap.Hutao.View"
+    xmlns:shv="using:Snap.Hutao.View"
     mc:Ignorable="d">
 
     <Grid>
-        <view:TitleView
+        <shv:TitleView
             Margin="48,0,0,0"
             Height="44"
             x:Name="TitleBarView"/>
         
-        <view:MainView/>
+        <shv:MainView/>
     </Grid>
 </Window>

src/Snap.Hutao/Snap.Hutao/MainWindow.xaml.cs

@@ -13,21 +13,12 @@ namespace Snap.Hutao;
 [SuppressMessage("", "CA1001")]
 public sealed partial class MainWindow : Window
 {
-    private readonly WindowManager windowManager;
-
     /// <summary>
     /// 构造一个新的主窗体
     /// </summary>
     public MainWindow()
     {
         InitializeComponent();
-        Closed += MainWindowClosed;
-        windowManager = new WindowManager(this, TitleBarView.DragArea);
-    }
-
-    private void MainWindowClosed(object sender, WindowEventArgs args)
-    {
-        // Must dispose it before window is completely closed
-        windowManager?.Dispose();
+        ExtendedWindow.Initialize(this, TitleBarView.DragArea);
     }
 }

src/Snap.Hutao/Snap.Hutao/Migrations/20220924135810_AddAvatarInfo.Designer.cs

@@ -0,0 +1,190 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Snap.Hutao.Context.Database;
+
+#nullable disable
+
+namespace Snap.Hutao.Migrations
+{
+    [DbContext(typeof(AppDbContext))]
+    [Migration("20220924135810_AddAvatarInfo")]
+    partial class AddAvatarInfo
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.9");
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ArchiveId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Current")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTimeOffset>("Time")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.HasIndex("ArchiveId");
+
+                    b.ToTable("achievements");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.AchievementArchive", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSelected")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.ToTable("achievement_archives");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.AvatarInfo", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Info")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Uid")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.ToTable("avatar_infos");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaArchive", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSelected")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Uid")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.ToTable("gacha_archives");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ArchiveId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("GachaType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ItemId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("QueryType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTimeOffset>("Time")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.HasIndex("ArchiveId");
+
+                    b.ToTable("gacha_items");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.SettingEntry", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Key");
+
+                    b.ToTable("settings");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.User", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Cookie")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsSelected")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("InnerId");
+
+                    b.ToTable("users");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.Achievement", b =>
+                {
+                    b.HasOne("Snap.Hutao.Model.Entity.AchievementArchive", "Archive")
+                        .WithMany()
+                        .HasForeignKey("ArchiveId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Archive");
+                });
+
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaItem", b =>
+                {
+                    b.HasOne("Snap.Hutao.Model.Entity.GachaArchive", "Archive")
+                        .WithMany()
+                        .HasForeignKey("ArchiveId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Archive");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/Migrations/20220924135810_AddAvatarInfo.cs

@@ -0,0 +1,32 @@
+// <auto-generated />
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Snap.Hutao.Migrations
+{
+    public partial class AddAvatarInfo : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "avatar_infos",
+                columns: table => new
+                {
+                    InnerId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Uid = table.Column<string>(type: "TEXT", nullable: false),
+                    Info = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_avatar_infos", x => x.InnerId);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "avatar_infos");
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/Migrations/AppDbContextModelSnapshot.cs

@@ -63,6 +63,25 @@ namespace Snap.Hutao.Migrations
                     b.ToTable("achievement_archives");
                 });
 
+            modelBuilder.Entity("Snap.Hutao.Model.Entity.AvatarInfo", b =>
+                {
+                    b.Property<Guid>("InnerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Info")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Uid")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("InnerId");
+
+                    b.ToTable("avatar_infos");
+                });
+
             modelBuilder.Entity("Snap.Hutao.Model.Entity.GachaArchive", b =>
                 {
                     b.Property<Guid>("InnerId")

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/AffixScore.cs

@@ -0,0 +1,31 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 词条评分
+/// </summary>
+public struct AffixScore
+{
+    /// <summary>
+    /// 构造一个新的圣遗物评分
+    /// </summary>
+    /// <param name="score">评分</param>
+    /// <param name="weight">最大值</param>
+    public AffixScore(double score, double weight)
+    {
+        Score = score;
+        Weight = weight;
+    }
+
+    /// <summary>
+    /// 评分
+    /// </summary>
+    public double Score { get; }
+
+    /// <summary>
+    /// 权重
+    /// </summary>
+    public double Weight { get; }
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Avatar.cs

@@ -0,0 +1,77 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 角色信息
+/// </summary>
+public class Avatar
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; } = default!;
+
+    /// <summary>
+    /// 图标
+    /// </summary>
+    public Uri Icon { get; set; } = default!;
+
+    /// <summary>
+    /// 侧面图标
+    /// </summary>
+    public Uri SideIcon { get; set; } = default!;
+
+    /// <summary>
+    /// 星级
+    /// </summary>
+    public ItemQuality Quality { get; set; }
+
+    /// <summary>
+    /// 等级
+    /// </summary>
+    public string Level { get; set; } = default!;
+
+    /// <summary>
+    /// 好感度等级
+    /// </summary>
+    public int FetterLevel { get; set; }
+
+    /// <summary>
+    /// 武器
+    /// </summary>
+    public Weapon Weapon { get; set; } = default!;
+
+    /// <summary>
+    /// 圣遗物列表
+    /// </summary>
+    public List<Reliquary> Reliquaries { get; set; } = default!;
+
+    /// <summary>
+    /// 命之座列表
+    /// </summary>
+    public List<Constellation> Constellations { get; set; } = default!;
+
+    /// <summary>
+    /// 技能列表
+    /// </summary>
+    public List<Skill> Skills { get; set; } = default!;
+
+    /// <summary>
+    /// 属性
+    /// </summary>
+    public List<Pair2<string, string, string?>> Properties { get; set; } = default!;
+
+    /// <summary>
+    /// 评分
+    /// </summary>
+    public string Score { get; set; } = default!;
+
+    /// <summary>
+    /// 双爆评分
+    /// </summary>
+    public string CritScore { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Constellation.cs

@@ -0,0 +1,15 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 命座信息
+/// </summary>
+public class Constellation : NameIconDescription
+{
+    /// <summary>
+    /// 是否激活
+    /// </summary>
+    public bool IsActiviated { get; set; }
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/EquipBase.cs

@@ -0,0 +1,27 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 装备基类
+/// </summary>
+public class EquipBase : NameIconDescription
+{
+    /// <summary>
+    /// 等级
+    /// </summary>
+    public string Level { get; set; } = default!;
+
+    /// <summary>
+    /// 品质
+    /// </summary>
+    public ItemQuality Quality { get; set; }
+
+    /// <summary>
+    /// 主属性
+    /// </summary>
+    public Pair<string, string> MainProperty { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/NameIconDescription.cs

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 名称与描述抽象
+/// </summary>
+public abstract class NameIconDescription
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; } = default!;
+
+    /// <summary>
+    /// 图标
+    /// </summary>
+    public Uri Icon { get; set; } = default!;
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public string Description { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Player.cs

@@ -0,0 +1,35 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 玩家信息
+/// </summary>
+public class Player
+{
+    /// <summary>
+    /// 昵称
+    /// </summary>
+    public string Nickname { get; set; } = default!;
+
+    /// <summary>
+    /// 等级
+    /// </summary>
+    public int Level { get; set; }
+
+    /// <summary>
+    /// 签名
+    /// </summary>
+    public string Signature { get; set; } = default!;
+
+    /// <summary>
+    /// 完成成就数
+    /// </summary>
+    public int FinishAchievementNumber { get; set; }
+
+    /// <summary>
+    /// 深渊层间
+    /// </summary>
+    public string SipralAbyssFloorLevel { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Reliquary.cs

@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 圣遗物
+/// </summary>
+public class Reliquary : EquipBase
+{
+    /// <summary>
+    /// 副属性列表
+    /// </summary>
+    public List<ReliquarySubProperty> SubProperties { get; set; } = default!;
+
+    /// <summary>
+    /// 评分
+    /// </summary>
+    public double Score { get; set; }
+
+    /// <summary>
+    /// 格式化评分
+    /// </summary>
+    public string ScoreFormatted { get => $"{Score:F2}"; }
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/ReliquarySubProperty.cs

@@ -0,0 +1,52 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 圣遗物副词条
+/// </summary>
+public class ReliquarySubProperty
+{
+    /// <summary>
+    /// 构造副属性
+    /// </summary>
+    /// <param name="name">名称</param>
+    /// <param name="value">值</param>
+    /// <param name="score">评分</param>
+    public ReliquarySubProperty(string name, string value, double score)
+    {
+        Name = name;
+        Value = value;
+        Score = score;
+
+        // only 0.2 | 0.4 | 0.6 | 0.8 | 1.0
+        Opacity = score switch
+        {
+            < 25 => 0.25,
+            < 50 => 0.5,
+            < 75 => 0.75,
+            _ => 1,
+        };
+    }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; }
+
+    /// <summary>
+    /// 值
+    /// </summary>
+    public string Value { get; }
+
+    /// <summary>
+    /// 评分
+    /// </summary>
+    public double Score { get; }
+
+    /// <summary>
+    /// 透明度
+    /// </summary>
+    public double Opacity { get; }
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Skill.cs

@@ -0,0 +1,17 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Metadata;
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 天赋
+/// </summary>
+public class Skill : NameIconDescription
+{
+    /// <summary>
+    /// 技能属性
+    /// </summary>
+    public LevelParam<string, ParameterInfo> Info { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Summary.cs

@@ -0,0 +1,20 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 玩家与角色列表的包装器
+/// </summary>
+public class Summary
+{
+    /// <summary>
+    /// 玩家信息
+    /// </summary>
+    public Player Player { get; set; } = default!;
+
+    /// <summary>
+    /// 角色列表
+    /// </summary>
+    public List<Avatar> Avatars { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Weapon.cs

@@ -0,0 +1,30 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Binding.AvatarProperty;
+
+/// <summary>
+/// 武器
+/// </summary>
+public class Weapon : EquipBase
+{
+    /// <summary>
+    /// 副属性
+    /// </summary>
+    public Pair<string, string> SubProperty { get; set; } = default!;
+
+    /// <summary>
+    /// 精炼属性
+    /// </summary>
+    public string AffixLevel { get; set; } = default!;
+
+    /// <summary>
+    /// 精炼名称
+    /// </summary>
+    public string AffixName { get; set; } = default!;
+
+    /// <summary>
+    /// 精炼被动
+    /// </summary>
+    public string AffixDescription { get; set; } = default!;
+}

src/Snap.Hutao/Snap.Hutao/Model/Binding/Gacha/GachaStatistics.cs

@@ -8,11 +8,6 @@ namespace Snap.Hutao.Model.Binding.Gacha;
 /// </summary>
 public class GachaStatistics
 {
-    /// <summary>
-    /// 默认的空祈愿统计
-    /// </summary>
-    public static readonly GachaStatistics Default = new();
-
     /// <summary>
     /// 角色活动
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Model/Binding/User.cs

@@ -2,8 +2,10 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Extension;
+using Snap.Hutao.Web.Hoyolab;
 using Snap.Hutao.Web.Hoyolab.Bbs.User;
 using Snap.Hutao.Web.Hoyolab.Takumi.Binding;
+using EntityUser = Snap.Hutao.Model.Entity.User;
 
 namespace Snap.Hutao.Model.Binding;
 
@@ -12,7 +14,7 @@ namespace Snap.Hutao.Model.Binding;
 /// </summary>
 public class User : Observable
 {
-    private readonly Entity.User inner;
+    private readonly EntityUser inner;
 
     private UserGameRole? selectedUserGameRole;
     private bool isInitialized;
@@ -21,7 +23,7 @@ public class User : Observable
     /// 构造一个新的绑定视图用户
     /// </summary>
     /// <param name="user">用户实体</param>
-    private User(Entity.User user)
+    private User(EntityUser user)
     {
         inner = user;
     }
@@ -45,15 +47,15 @@ public class User : Observable
         private set => Set(ref selectedUserGameRole, value);
     }
 
-    /// <inheritdoc cref="Entity.User.IsSelected"/>
+    /// <inheritdoc cref="EntityUser.IsSelected"/>
     public bool IsSelected
     {
         get => inner.IsSelected;
         set => inner.IsSelected = value;
     }
 
-    /// <inheritdoc cref="Entity.User.Cookie"/>
-    public string? Cookie
+    /// <inheritdoc cref="EntityUser.Cookie"/>
+    public Cookie Cookie
     {
         get => inner.Cookie;
         set => inner.Cookie = value;
@@ -62,7 +64,7 @@ public class User : Observable
     /// <summary>
     /// 内部的用户实体
     /// </summary>
-    public Entity.User Entity { get => inner; }
+    public EntityUser Entity { get => inner; }
 
     /// <summary>
     /// 是否初始化完成
@@ -70,27 +72,62 @@ public class User : Observable
     public bool IsInitialized { get => isInitialized; }
 
     /// <summary>
-    /// 初始化用户
+    /// 从数据库恢复用户
     /// </summary>
-    /// <param name="inner">用户实体</param>
+    /// <param name="inner">数据库实体</param>
     /// <param name="userClient">用户客户端</param>
     /// <param name="userGameRoleClient">角色客户端</param>
     /// <param name="token">取消令牌</param>
     /// <returns>用户是否初始化完成，若Cookie失效会返回 <see langword="false"/> </returns>
-    internal static async Task<User?> CreateAsync(Entity.User inner, UserClient userClient, UserGameRoleClient userGameRoleClient, CancellationToken token = default)
+    internal static async Task<User?> ResumeAsync(
+        EntityUser inner,
+        UserClient userClient,
+        BindingClient userGameRoleClient,
+        CancellationToken token = default)
     {
         User user = new(inner);
-        bool successful = await user.InitializeAsync(userClient, userGameRoleClient, token).ConfigureAwait(false);
+        bool successful = await user.InitializeCoreAsync(userClient, userGameRoleClient, token).ConfigureAwait(false);
         return successful ? user : null;
     }
 
-    private async Task<bool> InitializeAsync(UserClient userClient, UserGameRoleClient userGameRoleClient, CancellationToken token = default)
+    /// <summary>
+    /// 创建并初始化用户
+    /// </summary>
+    /// <param name="cookie">cookie</param>
+    /// <param name="userClient">用户客户端</param>
+    /// <param name="userGameRoleClient">角色客户端</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>用户是否初始化完成，若Cookie失效会返回 <see langword="null"/> </returns>
+    internal static async Task<User?> CreateAsync(
+        Cookie cookie,
+        UserClient userClient,
+        BindingClient userGameRoleClient,
+        CancellationToken token = default)
+    {
+        User user = new(EntityUser.Create(cookie));
+        bool successful = await user.InitializeCoreAsync(userClient, userGameRoleClient, token).ConfigureAwait(false);
+        return successful ? user : null;
+    }
+
+    private async Task<bool> InitializeCoreAsync(
+        UserClient userClient,
+        BindingClient userGameRoleClient,
+        CancellationToken token = default)
     {
         if (isInitialized)
         {
             return true;
         }
 
+        await InitializeUserInfoAndUserGameRolesAsync(userClient, userGameRoleClient, token).ConfigureAwait(false);
+
+        isInitialized = true;
+
+        return UserInfo != null && UserGameRoles.Any();
+    }
+
+    private async Task InitializeUserInfoAndUserGameRolesAsync(UserClient userClient, BindingClient userGameRoleClient, CancellationToken token)
+    {
         UserInfo = await userClient
             .GetUserFullInfoAsync(this, token)
             .ConfigureAwait(false);
@@ -100,9 +137,5 @@ public class User : Observable
             .ConfigureAwait(false);
 
         SelectedUserGameRole = UserGameRoles.FirstOrFirstOrDefault(role => role.IsChosen);
-
-        isInitialized = true;
-
-        return UserInfo != null && UserGameRoles.Any();
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Entity/AvatarInfo.cs

@@ -0,0 +1,42 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Snap.Hutao.Model.Entity;
+
+/// <summary>
+/// 角色信息表
+/// </summary>
+[Table("avatar_infos")]
+public class AvatarInfo
+{
+    /// <summary>
+    /// 内部Id
+    /// </summary>
+    [Key]
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public Guid InnerId { get; set; }
+
+    /// <summary>
+    /// Uid
+    /// </summary>
+    public string Uid { get; set; } = default!;
+
+    /// <summary>
+    /// 角色的信息
+    /// </summary>
+    public Web.Enka.Model.AvatarInfo Info { get; set; } = default!;
+
+    /// <summary>
+    /// 创建一个新的实体角色信息
+    /// </summary>
+    /// <param name="uid">uid</param>
+    /// <param name="info">角色信息</param>
+    /// <returns>实体角色信息</returns>
+    public static AvatarInfo Create(string uid, Web.Enka.Model.AvatarInfo info)
+    {
+        return new() { Uid = uid, Info = info };
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Entity/Configuration/AvatarInfoConfiguration.cs

@@ -0,0 +1,21 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Snap.Hutao.Model.Entity.Configuration;
+
+/// <summary>
+/// 角色信息配置
+/// </summary>
+internal class AvatarInfoConfiguration : IEntityTypeConfiguration<AvatarInfo>
+{
+    /// <inheritdoc/>
+    public void Configure(EntityTypeBuilder<AvatarInfo> builder)
+    {
+        builder.Property(e => e.Info)
+            .HasColumnType("TEXT")
+            .HasConversion<JsonTextValueConverter<Web.Enka.Model.AvatarInfo>>();
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Entity/Configuration/JsonTextValueConverter.cs

@@ -0,0 +1,24 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Snap.Hutao.Core;
+
+namespace Snap.Hutao.Model.Entity.Configuration;
+
+/// <summary>
+/// Json文本转换器
+/// </summary>
+/// <typeparam name="TProperty">实体类型</typeparam>
+internal class JsonTextValueConverter<TProperty> : ValueConverter<TProperty, string>
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonTextValueConverter{TProperty}"/> class.
+    /// </summary>
+    public JsonTextValueConverter()
+        : base(
+            obj => JsonSerializer.Serialize(obj, CoreEnvironment.JsonOptions),
+            str => JsonSerializer.Deserialize<TProperty>(str, CoreEnvironment.JsonOptions)!)
+    {
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Entity/Configuration/UserConfiguration.cs

@@ -0,0 +1,24 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Snap.Hutao.Web.Hoyolab;
+
+namespace Snap.Hutao.Model.Entity.Configuration;
+
+/// <summary>
+/// 用户配置
+/// </summary>
+internal class UserConfiguration : IEntityTypeConfiguration<User>
+{
+    /// <inheritdoc/>
+    public void Configure(EntityTypeBuilder<User> builder)
+    {
+        builder.Property(e => e.Cookie)
+            .HasColumnType("TEXT")
+            .HasConversion(
+                e => e == null ? string.Empty : e.ToString(),
+                e => Cookie.Parse(e));
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Entity/GachaItem.cs

@@ -1,7 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Extension;
 using Snap.Hutao.Model.InterChange.GachaLog;
+using Snap.Hutao.Model.Metadata.Abstraction;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -58,6 +60,17 @@ public class GachaItem
     /// </summary>
     public long Id { get; set; }
 
+    /// <summary>
+    /// 获取物品类型字符串
+    /// </summary>
+    /// <param name="itemId">物品Id</param>
+    /// <returns>物品类型字符串</returns>
+    public static string GetItemTypeStringByItemId(int itemId)
+    {
+        int idLength = itemId.Place();
+        return idLength == 8 ? "角色" : idLength == 5 ? "武器" : "未知";
+    }
+
     /// <summary>
     /// 构造一个新的数据库祈愿物品
     /// </summary>
@@ -111,4 +124,24 @@ public class GachaItem
             _ => configType,
         };
     }
+
+    /// <summary>
+    /// 转换到UIGF物品
+    /// </summary>
+    /// <param name="nameQuality">物品</param>
+    /// <returns>UIGF 物品</returns>
+    public UIGFItem ToUIGFItem(INameQuality nameQuality)
+    {
+        return new()
+        {
+            GachaType = GachaType,
+            Count = 1,
+            Time = Time,
+            Name = nameQuality.Name,
+            ItemType = GetItemTypeStringByItemId(ItemId),
+            Rank = nameQuality.Quality,
+            Id = Id,
+            UIGFGachaType = QueryType,
+        };
+    }
 }

src/Snap.Hutao/Snap.Hutao/Model/Entity/User.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Database;
+using Snap.Hutao.Web.Hoyolab;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
@@ -28,14 +29,14 @@ public class User : ISelectable
     /// <summary>
     /// 用户的Cookie
     /// </summary>
-    public string? Cookie { get; set; }
+    public Cookie Cookie { get; set; } = default!;
 
     /// <summary>
     /// 创建一个新的用户
     /// </summary>
     /// <param name="cookie">cookie</param>
     /// <returns>新创建的用户</returns>
-    public static User Create(string cookie)
+    public static User Create(Cookie cookie)
     {
         return new() { Cookie = cookie };
     }

src/Snap.Hutao/Snap.Hutao/Model/InterChange/Achievement/UIAFInfo.cs

@@ -28,7 +28,7 @@ public class UIAFInfo
     public DateTimeOffset ExportDateTime
     {
         // Hot fix | 1.0.31 | UIAF.Info.ExportTimestamp can be milliseconds
-        get => DateTimeOffsetExtensions.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
+        get => DateTimeOffsetExtension.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
     }
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGF.cs

@@ -9,9 +9,14 @@ namespace Snap.Hutao.Model.InterChange.GachaLog;
 /// </summary>
 public class UIGF
 {
+    /// <summary>
+    /// 当前发行的版本
+    /// </summary>
+    public const string CurrentVersion = "v2.2";
+
     private static readonly List<string> SupportedVersion = new()
     {
-        "v2.2",
+        "v2.1", CurrentVersion,
     };
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGFInfo.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Core;
 using Snap.Hutao.Extension;
 
 namespace Snap.Hutao.Model.InterChange.GachaLog;
@@ -33,7 +34,7 @@ public class UIGFInfo
     /// </summary>
     public DateTimeOffset ExportDateTime
     {
-        get => DateTimeOffsetExtensions.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
+        get => DateTimeOffsetExtension.FromUnixTime(ExportTimestamp, DateTimeOffset.MinValue);
     }
 
     /// <summary>
@@ -53,4 +54,22 @@ public class UIGFInfo
     /// </summary>
     [JsonPropertyName("uigf_version")]
     public string UIGFVersion { get; set; } = default!;
+
+    /// <summary>
+    /// 构造一个新的专用 UIGF 信息
+    /// </summary>
+    /// <param name="uid">uid</param>
+    /// <returns>专用 UIGF 信息</returns>
+    public static UIGFInfo Create(string uid)
+    {
+        return new()
+        {
+            Uid = uid,
+            Language = "zh-cn",
+            ExportTimestamp = DateTimeOffset.Now.ToUnixTimeSeconds(),
+            ExportApp = "胡桃",
+            ExportAppVersion = CoreEnvironment.Version.ToString(),
+            UIGFVersion = UIGF.CurrentVersion,
+        };
+    }
 }

src/Snap.Hutao/Snap.Hutao/Model/InterChange/GachaLog/UIGFItem.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using MiniExcelLibs.Attributes;
+using Snap.Hutao.Core.Json.Converter;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 
 namespace Snap.Hutao.Model.InterChange.GachaLog;
@@ -16,6 +17,6 @@ public class UIGFItem : GachaLogItem
     /// </summary>
     [ExcelColumn(Name = "uigf_gacha_type")]
     [JsonPropertyName("uigf_gacha_type")]
-    [JsonConverter(typeof(JsonStringEnumConverter))]
+    [JsonConverter(typeof(EnumStringValueConverter<GachaConfigType>))]
     public GachaConfigType UIGFGachaType { get; set; } = default!;
 }

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/AchievementInfoStatus.cs

@@ -5,10 +5,15 @@ namespace Snap.Hutao.Model.Intrinsic;
 
 /// <summary>
 /// 成就信息状态
-/// https://github.com/Grasscutters/Grasscutter/blob/development/proto/AchievementInfo.proto
+/// https://github.com/Grasscutters/Grasscutter/blob/development/src/generated/main/java/emu/grasscutter/net/proto/AchievementInfoOuterClass.java#L163
 /// </summary>
 public enum AchievementInfoStatus
 {
+    /// <summary>
+    /// 未识别
+    /// </summary>
+    UNRECOGNIZED = -1,
+
     /// <summary>
     /// 非法值
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/FightProperty.cs

@@ -24,8 +24,10 @@ public enum FightProperty
     FIGHT_PROP_BASE_HP = 1,
 
     /// <summary>
-    /// 生命值加成
+    /// 小生命值加成
     /// </summary>
+    [Description("生命值")]
+    [Format(FormatMethod.Integer)]
     FIGHT_PROP_HP = 2,
 
     /// <summary>
@@ -45,6 +47,8 @@ public enum FightProperty
     /// <summary>
     /// 攻击力加成
     /// </summary>
+    [Description("攻击力")]
+    [Format(FormatMethod.Integer)]
     FIGHT_PROP_ATTACK = 5,
 
     /// <summary>
@@ -64,6 +68,8 @@ public enum FightProperty
     /// <summary>
     /// 防御力加成
     /// </summary>
+    [Description("防御力")]
+    [Format(FormatMethod.Integer)]
     FIGHT_PROP_DEFENSE = 8,
 
     /// <summary>
@@ -387,6 +393,8 @@ public enum FightProperty
     /// <summary>
     /// 最大生命值
     /// </summary>
+    [Description("生命值")]
+    [Format(FormatMethod.Integer)]
     FIGHT_PROP_MAX_HP = 2000,
 
     /// <summary>

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/ItemType.cs

@@ -15,7 +15,7 @@ public enum ItemType
     ITEM_NONE = 0,
 
     /// <summary>
-    /// 贵重道具
+    /// 虚拟道具
     /// </summary>
     ITEM_VIRTUAL = 1,
 

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/PlayerProperty.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-namespace Snap.Hutao.Web.Enka.Model;
+namespace Snap.Hutao.Model.Intrinsic;
 
 /// <summary>
 /// 玩家属性

src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/WeaponType.cs

@@ -21,6 +21,7 @@ public enum WeaponType
     WEAPON_SWORD_ONE_HAND = 1,
 
     #region Not Used
+
     /// <summary>
     /// ?
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Abstraction/INameQuality.cs

@@ -0,0 +1,22 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Model.Metadata.Abstraction;
+
+/// <summary>
+/// 物品与星级
+/// </summary>
+public interface INameQuality
+{
+    /// <summary>
+    /// 名称
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// 星级
+    /// </summary>
+    ItemQuality Quality { get; }
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Abstraction/ISummaryItemSource.cs

@@ -0,0 +1,27 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Binding.Gacha;
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Model.Metadata.Abstraction;
+
+/// <summary>
+/// 指示该类为简述统计物品的源
+/// </summary>
+public interface ISummaryItemSource
+{
+    /// <summary>
+    /// 星级
+    /// </summary>
+    ItemQuality Quality { get; }
+
+    /// <summary>
+    /// 转换到简述统计物品
+    /// </summary>
+    /// <param name="lastPull">距上个五星</param>
+    /// <param name="time">时间</param>
+    /// <param name="isUp">是否为Up物品</param>
+    /// <returns>简述统计物品</returns>
+    SummaryItem ToSummaryItem(int lastPull, DateTimeOffset time, bool isUp);
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Annotation/EnumExtensions.cs

@@ -16,7 +16,7 @@ internal static class EnumExtensions
     /// <typeparam name="TEnum">枚举的类型</typeparam>
     /// <param name="enum">枚举值</param>
     /// <returns>描述</returns>
-    internal static FormatMethod GetFormat<TEnum>(this TEnum @enum)
+    internal static FormatMethod GetFormatMethod<TEnum>(this TEnum @enum)
         where TEnum : struct, Enum
     {
         string enumName = Must.NotNull(Enum.GetName(@enum)!);

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/Avatar.cs

@@ -12,7 +12,7 @@ namespace Snap.Hutao.Model.Metadata.Avatar;
 /// <summary>
 /// 角色
 /// </summary>
-public class Avatar : IStatisticsItemSource
+public class Avatar : IStatisticsItemSource, ISummaryItemSource, INameQuality
 {
     /// <summary>
     /// Id
@@ -93,7 +93,7 @@ public class Avatar : IStatisticsItemSource
         return new()
         {
             Name = Name,
-            Icon = AvatarIconConverter.NameToUri(Icon),
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
             Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
             Quality = Quality,
         };
@@ -109,7 +109,7 @@ public class Avatar : IStatisticsItemSource
         return new()
         {
             Name = Name,
-            Icon = AvatarIconConverter.NameToUri(Icon),
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
             Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
             Quality = Quality,
             Count = count,
@@ -128,7 +128,7 @@ public class Avatar : IStatisticsItemSource
         return new()
         {
             Name = Name,
-            Icon = AvatarIconConverter.NameToUri(Icon),
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
             Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
             Quality = Quality,
             Time = time,

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/AvatarIds.cs

@@ -0,0 +1,67 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Metadata.Avatar;
+
+/// <summary>
+/// 角色ID
+/// </summary>
+[SuppressMessage("", "SA1600")]
+public static class AvatarIds
+{
+    public const int Ayaka = 10000002;
+    public const int Qin = 10000003;
+    public const int Lisa = 10000006;
+    public const int Barbara = 10000014;
+    public const int Kaeya = 10000015;
+    public const int Diluc = 10000016;
+    public const int Razor = 10000020;
+    public const int Ambor = 10000021;
+    public const int Venti = 10000022;
+    public const int Xiangling = 10000023;
+    public const int Beidou = 10000024;
+    public const int Xingqiu = 10000025;
+    public const int Xiao = 10000026;
+    public const int Ningguang = 10000027;
+    public const int Klee = 10000029;
+    public const int Zhongli = 10000030;
+    public const int Fischl = 10000031;
+    public const int Bennett = 10000032;
+    public const int Tartaglia = 10000033;
+    public const int Noel = 10000034;
+    public const int Qiqi = 10000035;
+    public const int Chongyun = 10000036;
+    public const int Ganyu = 10000037;
+    public const int Albedo = 10000038;
+    public const int Diona = 10000039;
+    public const int Mona = 10000041;
+    public const int Keqing = 10000042;
+    public const int Sucrose = 10000043;
+    public const int Xinyan = 10000044;
+    public const int Rosaria = 10000045;
+    public const int Hutao = 10000046;
+    public const int Kazuha = 10000047;
+    public const int Feiyan = 10000048;
+    public const int Yoimiya = 10000049;
+    public const int Tohma = 10000050;
+    public const int Eula = 10000051;
+    public const int Shougun = 10000052;
+    public const int Sayu = 10000053;
+    public const int Kokomi = 10000054;
+    public const int Gorou = 10000055;
+    public const int Sara = 10000056;
+    public const int Itto = 10000057;
+    public const int Yae = 10000058;
+    public const int Heizou = 10000059;
+    public const int Yelan = 10000060;
+    public const int Aloy = 10000062;
+    public const int Shenhe = 10000063;
+    public const int Yunjin = 10000064;
+    public const int Shinobu = 10000065;
+    public const int Ayato = 10000066;
+    public const int Collei = 10000067;
+    public const int Dori = 10000068;
+    public const int Tighnari = 10000069;
+    public const int Cyno = 10000071;
+    public const int Candace = 10000072;
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/Costume.cs

@@ -27,4 +27,14 @@ public class Costume
     /// 是否为默认
     /// </summary>
     public bool IsDefault { get; set; }
+
+    /// <summary>
+    /// 图标
+    /// </summary>
+    public string? Icon { get; set; }
+
+    /// <summary>
+    /// 侧面图标
+    /// </summary>
+    public string? SideIcon { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/SkillDepot.cs

@@ -24,7 +24,7 @@ public class SkillDepot
     public IList<ProudableSkill> Inherents { get; set; } = default!;
 
     /// <summary>
-    /// 全部天赋
+    /// 全部天赋,包括固有天赋
     /// </summary>
     public IList<ProudableSkill> CompositeSkills
     {
@@ -36,6 +36,24 @@ public class SkillDepot
     /// </summary>
     public IList<SkillBase> Talents { get; set; } = default!;
 
+    /// <summary>
+    /// 获取无固有天赋的技能列表
+    /// </summary>
+    /// <returns>天赋列表</returns>
+    public IEnumerable<ProudableSkill> GetCompositeSkillsNoInherents()
+    {
+        foreach (ProudableSkill skill in Skills)
+        {
+            // skip skills like Mona's & Ayaka's shift
+            if (skill.Proud.Parameters.Count > 1)
+            {
+                yield return skill;
+            }
+        }
+
+        yield return EnergySkill;
+    }
+
     private IEnumerable<ProudableSkill> GetCompositeSkills()
     {
         foreach (ProudableSkill skill in Skills)

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AchievementIconConverter.cs

@@ -1,26 +1,20 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 角色头像转换器
 /// </summary>
-internal class AchievementIconConverter : IValueConverter
+internal class AchievementIconConverter : ValueConverterBase<string, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/AchievementIcon/{0}.png";
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        return new Uri(string.Format(BaseUrl, value));
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return new Uri(string.Format(BaseUrl, from));
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarIconConverter.cs

@@ -1,14 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 角色头像转换器
 /// </summary>
-internal class AvatarIconConverter : IValueConverter
+internal class AvatarIconConverter : ValueConverterBase<string, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/AvatarIcon/{0}.png";
 
@@ -17,20 +17,14 @@ internal class AvatarIconConverter : IValueConverter
     /// </summary>
     /// <param name="name">名称</param>
     /// <returns>链接</returns>
-    public static Uri NameToUri(string name)
+    public static Uri IconNameToUri(string name)
     {
         return new Uri(string.Format(BaseUrl, name));
     }
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        return NameToUri((string)value);
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return IconNameToUri(from);
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarNameCardPicConverter.cs

@@ -1,36 +1,29 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 角色名片转换器
 /// </summary>
-internal class AvatarNameCardPicConverter : IValueConverter
+internal class AvatarNameCardPicConverter : ValueConverterBase<Avatar.Avatar?, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/NameCardPic/UI_NameCardPic_{0}_P.png";
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(Avatar.Avatar? avatar)
     {
-        if (value == null)
+        if (avatar == null)
         {
             return null!;
         }
 
-        Avatar.Avatar avatar = (Avatar.Avatar)value;
-        string avatarName = ReplaceSpecialCaseNaming(avatar.Icon[14..]);
+        string avatarName = ReplaceSpecialCaseNaming(avatar.Icon["UI_AvatarIcon_".Length..]);
         return new Uri(string.Format(BaseUrl, avatarName));
     }
 
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
-    }
-
     private static string ReplaceSpecialCaseNaming(string avatarName)
     {
         return avatarName switch

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/AvatarSideIconConverter.cs

@@ -1,26 +1,20 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 角色侧面头像转换器
 /// </summary>
-internal class AvatarSideIconConverter : IValueConverter
+internal class AvatarSideIconConverter : ValueConverterBase<string, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/AvatarIcon/{0}.png";
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        return new Uri(string.Format(BaseUrl, value));
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return new Uri(string.Format(BaseUrl, from));
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescParamDescriptor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 using Snap.Hutao.Model.Metadata.Avatar;
 using System.Text.RegularExpressions;
 
@@ -10,40 +10,44 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 /// <summary>
 /// 描述参数解析器
 /// </summary>
-internal class DescParamDescriptor : IValueConverter
+internal sealed class DescParamDescriptor : ValueConverterBase<DescParam, IList<LevelParam<string, ParameterInfo>>>
 {
-    /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    /// <summary>
+    /// 获取特定等级的解释
+    /// </summary>
+    /// <param name="from">源</param>
+    /// <param name="level">等级</param>
+    /// <returns>特定等级的解释</returns>
+    public static LevelParam<string, ParameterInfo> Convert(DescParam from, int level)
     {
-        DescParam rawDescParam = (DescParam)value;
-
-        // Spilt rawDesc into two parts: desc and format
-        IList<DescFormat> parsedDescriptions = rawDescParam.Descriptions
-            .Select(desc =>
-            {
-                string[] parts = desc.Split('|', 2);
-                return new DescFormat(parts[0], parts[1]);
-            })
+        // DO NOT INLINE!
+        // Cache the formats
+        IList<DescFormat> formats = from.Descriptions
+            .Select(desc => new DescFormat(desc))
             .ToList();
 
-        IList<LevelParam<string, ParameterInfo>> parameters = rawDescParam.Parameters
-            .Select(param =>
+        LevelParam<int, double> param = from.Parameters.Single(param => param.Level == level);
+
+        return new LevelParam<string, ParameterInfo>($"Lv.{param.Level}", GetParameterInfos(formats, param.Parameters));
+    }
+
+    /// <inheritdoc/>
+    public override IList<LevelParam<string, ParameterInfo>> Convert(DescParam from)
     {
-                IList<ParameterInfo> parameters = GetFormattedParameters(parsedDescriptions, param.Parameters);
-                return new LevelParam<string, ParameterInfo>() { Level = param.Level.ToString(), Parameters = parameters };
-            })
+        // DO NOT INLINE!
+        // Cache the formats
+        IList<DescFormat> formats = from.Descriptions
+            .Select(desc => new DescFormat(desc))
+            .ToList();
+
+        IList<LevelParam<string, ParameterInfo>> parameters = from.Parameters
+            .Select(param => new LevelParam<string, ParameterInfo>(param.Level.ToString(), GetParameterInfos(formats, param.Parameters)))
             .ToList();
 
         return parameters;
     }
 
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
-    }
-
-    private static IList<ParameterInfo> GetFormattedParameters(IList<DescFormat> formats, IList<double> param)
+    private static IList<ParameterInfo> GetParameterInfos(IList<DescFormat> formats, IList<double> param)
     {
         List<ParameterInfo> results = new();
 
@@ -63,25 +67,12 @@ internal class DescParamDescriptor : IValueConverter
     {
         if (match.Success)
         {
+            // remove parentheses and split by {value:format}
             string[] parts = match.Value[1..^1].Split(':', 2);
 
-            int index = int.Parse(parts[0][5..]) - 1;
-            if (parts[1] == "I")
-            {
-                return ((int)param[index]).ToString();
-            }
+            int index = int.Parse(parts[0]["param".Length..]) - 1;
 
-            if (parts[1] == "F1P")
-            {
-                return string.Format("{0:P1}", param[index]);
-            }
-
-            if (parts[1] == "F2P")
-            {
-                return string.Format("{0:P2}", param[index]);
-            }
-
-            return string.Format($"{{0:{parts[1]}}}", param[index]);
+            return string.Format(new ParameterFormat(), $"{{0:{parts[1]}}}", param[index]);
         }
         else
         {
@@ -89,12 +80,15 @@ internal class DescParamDescriptor : IValueConverter
         }
     }
 
-    private class DescFormat
+    private sealed class DescFormat
     {
-        public DescFormat(string description, string format)
+        public DescFormat(string desc)
         {
-            Description = description;
-            Format = format;
+            // Spilt rawDesc into two parts: desc and format
+            string[] parts = desc.Split('|', 2);
+
+            Description = parts[0];
+            Format = parts[1];
         }
 
         public string Description { get; set; }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/ElementNameIconConverter.cs

@@ -1,14 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 元素名称图标转换器
 /// </summary>
-internal class ElementNameIconConverter : IValueConverter
+internal class ElementNameIconConverter : ValueConverterBase<string, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/IconElement/UI_Icon_Element_{0}.png";
 
@@ -35,14 +35,8 @@ internal class ElementNameIconConverter : IValueConverter
     }
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        return ElementNameToIconUri((string)value);
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return ElementNameToIconUri(from);
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/EquipIconConverter.cs

@@ -1,14 +1,14 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 武器图片转换器
 /// </summary>
-internal class EquipIconConverter : IValueConverter
+internal class EquipIconConverter : ValueConverterBase<string, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/EquipIcon/{0}.png";
 
@@ -17,20 +17,14 @@ internal class EquipIconConverter : IValueConverter
     /// </summary>
     /// <param name="name">名称</param>
     /// <returns>链接</returns>
-    public static Uri NameToUri(string name)
+    public static Uri IconNameToUri(string name)
     {
         return new Uri(string.Format(BaseUrl, name));
     }
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        return NameToUri((string)value);
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return IconNameToUri(from);
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/PropertyInfoDescriptor.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 using Snap.Hutao.Extension;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Annotation;
@@ -11,17 +11,79 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 /// <summary>
 /// 基础属性翻译器
 /// </summary>
-internal class PropertyInfoDescriptor : IValueConverter
+internal class PropertyInfoDescriptor : ValueConverterBase<PropertyInfo, IList<LevelParam<string, ParameterInfo>>?>
 {
+    /// <summary>
+    /// 格式化对
+    /// </summary>
+    /// <param name="property">属性</param>
+    /// <param name="value">值</param>
+    /// <returns>对</returns>
+    public static Pair<string, string> FormatPair(FightProperty property, double value)
+    {
+        return new(property.GetDescription(), FormatValue(property, value));
+    }
+
+    /// <summary>
+    /// 格式化 对2
+    /// </summary>
+    /// <param name="name">属性名称</param>
+    /// <param name="method">方法</param>
+    /// <param name="value1">值1</param>
+    /// <param name="value2">值2</param>
+    /// <returns>对2</returns>
+    public static Pair2<string, string, string?> FormatIntegerPair2(string name, FormatMethod method, double value1, double value2)
+    {
+        return new(name, FormatValue(method, value1), $"[+{FormatValue(method, value2)}]");
+    }
+
+    /// <summary>
+    /// 格式化 对2
+    /// </summary>
+    /// <param name="name">属性名称</param>
+    /// <param name="method">方法</param>
+    /// <param name="value">值</param>
+    /// <returns>对2</returns>
+    public static Pair2<string, string, string?> FormatIntegerPair2(string name, FormatMethod method, double value)
+    {
+        return new(name, FormatValue(method, value), null);
+    }
+
+    /// <summary>
+    /// 格式化战斗属性
+    /// </summary>
+    /// <param name="property">战斗属性</param>
+    /// <param name="value">值</param>
+    /// <returns>格式化的值</returns>
+    public static string FormatValue(FightProperty property, double value)
+    {
+        return FormatValue(property.GetFormatMethod(), value);
+    }
+
+    /// <summary>
+    /// 格式化战斗属性
+    /// </summary>
+    /// <param name="method">格式化方法</param>
+    /// <param name="value">值</param>
+    /// <returns>格式化的值</returns>
+    public static string FormatValue(FormatMethod method, double value)
+    {
+        string valueFormatted = method switch
+        {
+            FormatMethod.Integer => Math.Round((double)value, MidpointRounding.AwayFromZero).ToString(),
+            FormatMethod.Percent => string.Format("{0:P1}", value),
+            _ => value.ToString(),
+        };
+        return valueFormatted;
+    }
+
     /// <inheritdoc/>
-    public object? Convert(object value, Type targetType, object parameter, string language)
+    public override IList<LevelParam<string, ParameterInfo>> Convert(PropertyInfo from)
     {
-        if (value is PropertyInfo rawDescParam)
-        {
-            IList<LevelParam<string, ParameterInfo>> parameters = rawDescParam.Parameters
+        IList<LevelParam<string, ParameterInfo>> parameters = from.Parameters
             .Select(param =>
             {
-                IList<ParameterInfo> parameters = GetFormattedParameters(param.Parameters, rawDescParam.Properties);
+                IList<ParameterInfo> parameters = GetParameterInfos(param.Parameters, from.Properties);
                 return new LevelParam<string, ParameterInfo>() { Level = param.Level, Parameters = parameters };
             })
             .ToList();
@@ -29,30 +91,14 @@ internal class PropertyInfoDescriptor : IValueConverter
         return parameters;
     }
 
-        return null;
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
-    }
-
-    private static IList<ParameterInfo> GetFormattedParameters(IList<double> parameters, IList<FightProperty> properties)
+    private static IList<ParameterInfo> GetParameterInfos(IList<double> parameters, IList<FightProperty> properties)
     {
         List<ParameterInfo> results = new();
 
         for (int index = 0; index < parameters.Count; index++)
         {
             double param = parameters[index];
-            FormatMethod method = properties[index].GetFormat();
-
-            string valueFormatted = method switch
-            {
-                FormatMethod.Integer => Math.Round((double)param, MidpointRounding.AwayFromZero).ToString(),
-                FormatMethod.Percent => string.Format("{0:P1}", param),
-                _ => param.ToString(),
-            };
+            string valueFormatted = FormatValue(properties[index], param);
 
             results.Add(new ParameterInfo { Description = properties[index].GetDescription(), Parameter = valueFormatted });
         }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs

@@ -0,0 +1,28 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Control;
+using Snap.Hutao.Model.Intrinsic;
+using Windows.UI;
+
+namespace Snap.Hutao.Model.Metadata.Converter;
+
+/// <summary>
+/// 品质颜色转换器
+/// </summary>
+internal class QualityColorConverter : ValueConverterBase<ItemQuality, Color>
+{
+    /// <inheritdoc/>
+    public override Color Convert(ItemQuality from)
+    {
+        return from switch
+        {
+            ItemQuality.QUALITY_WHITE => Color.FromArgb(0xFF, 0x72, 0x77, 0x8B),
+            ItemQuality.QUALITY_GREEN => Color.FromArgb(0xFF, 0x2A, 0x8F, 0x72),
+            ItemQuality.QUALITY_BLUE => Color.FromArgb(0xFF, 0x51, 0x80, 0xCB),
+            ItemQuality.QUALITY_PURPLE => Color.FromArgb(0xFF, 0xA1, 0x56, 0xE0),
+            ItemQuality.QUALITY_ORANGE or ItemQuality.QUALITY_ORANGE_SP => Color.FromArgb(0xFF, 0xBC, 0x69, 0x32),
+            _ => Color.FromArgb(0x00, 0x00, 0x00, 0x00),
+        };
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityConverter.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 using Snap.Hutao.Model.Intrinsic;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
@@ -9,14 +9,14 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 /// <summary>
 /// 物品等级转换器
 /// </summary>
-internal class QualityConverter : IValueConverter
+internal class QualityConverter : ValueConverterBase<ItemQuality, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/Bg/UI_{0}.png";
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(ItemQuality from)
     {
-        string? name = value.ToString();
+        string? name = from.ToString();
         if (name == nameof(ItemQuality.QUALITY_ORANGE_SP))
         {
             name = "QUALITY_RED";
@@ -24,10 +24,4 @@ internal class QualityConverter : IValueConverter
 
         return new Uri(string.Format(BaseUrl, name));
     }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
-    }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/RelicIconConverter.cs

@@ -0,0 +1,30 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Control;
+
+namespace Snap.Hutao.Model.Metadata.Converter;
+
+/// <summary>
+/// 武器图片转换器
+/// </summary>
+internal class RelicIconConverter : ValueConverterBase<string, Uri>
+{
+    private const string BaseUrl = "https://static.snapgenshin.com/RelicIcon/{0}.png";
+
+    /// <summary>
+    /// 名称转Uri
+    /// </summary>
+    /// <param name="name">名称</param>
+    /// <returns>链接</returns>
+    public static Uri IconNameToUri(string name)
+    {
+        return new Uri(string.Format(BaseUrl, name));
+    }
+
+    /// <inheritdoc/>
+    public override Uri Convert(string from)
+    {
+        return IconNameToUri(from);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/SkillIconConverter.cs

@@ -1,36 +1,38 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
 
 /// <summary>
 /// 技能图标转换器
 /// </summary>
-internal class SkillIconConverter : IValueConverter
+internal class SkillIconConverter : ValueConverterBase<string, Uri>
 {
     private const string SkillUrl = "https://static.snapgenshin.com/Skill/{0}.png";
     private const string TalentUrl = "https://static.snapgenshin.com/Talent/{0}.png";
 
-    /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    /// <summary>
+    /// 名称转Uri
+    /// </summary>
+    /// <param name="name">名称</param>
+    /// <returns>链接</returns>
+    public static Uri IconNameToUri(string name)
     {
-        string target = (string)value;
-
-        if (target.StartsWith("UI_Talent_"))
+        if (name.StartsWith("UI_Talent_"))
         {
-            return new Uri(string.Format(TalentUrl, target));
+            return new Uri(string.Format(TalentUrl, name));
         }
         else
         {
-            return new Uri(string.Format(SkillUrl, target));
+            return new Uri(string.Format(SkillUrl, name));
         }
     }
 
     /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(string from)
     {
-        throw Must.NeverHappen();
+        return IconNameToUri(from);
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/WeaponTypeIconConverter.cs

@@ -1,7 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Data;
+using Snap.Hutao.Control;
 using Snap.Hutao.Model.Intrinsic;
 
 namespace Snap.Hutao.Model.Metadata.Converter;
@@ -9,7 +9,7 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 /// <summary>
 /// 元素名称图标转换器
 /// </summary>
-internal class WeaponTypeIconConverter : IValueConverter
+internal class WeaponTypeIconConverter : ValueConverterBase<WeaponType, Uri>
 {
     private const string BaseUrl = "https://static.snapgenshin.com/Skill/Skill_A_{0}.png";
 
@@ -34,14 +34,8 @@ internal class WeaponTypeIconConverter : IValueConverter
     }
 
     /// <inheritdoc/>
-    public object Convert(object value, Type targetType, object parameter, string language)
+    public override Uri Convert(WeaponType from)
     {
-        return WeaponTypeToIconUri((WeaponType)value);
-    }
-
-    /// <inheritdoc/>
-    public object ConvertBack(object value, Type targetType, object parameter, string language)
-    {
-        throw Must.NeverHappen();
+        return WeaponTypeToIconUri(from);
     }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/LevelParam.cs

@@ -10,6 +10,25 @@ namespace Snap.Hutao.Model.Metadata;
 /// <typeparam name="TParam">参数的类型</typeparam>
 public class LevelParam<TLevel, TParam>
 {
+    /// <summary>
+    /// 默认的构造器
+    /// </summary>
+    [JsonConstructor]
+    public LevelParam()
+    {
+    }
+
+    /// <summary>
+    /// 构造一个新的等级与参数
+    /// </summary>
+    /// <param name="level">等级</param>
+    /// <param name="parameters">参数</param>
+    public LevelParam(TLevel level, IList<TParam> parameters)
+    {
+        Level = level;
+        Parameters = parameters;
+    }
+
     /// <summary>
     /// 等级
     /// </summary>

src/Snap.Hutao/Snap.Hutao/Model/Metadata/ParameterFormat.cs

@@ -0,0 +1,45 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Metadata;
+
+/// <summary>
+/// 参数格式化器
+/// </summary>
+internal class ParameterFormat : IFormatProvider, ICustomFormatter
+{
+    /// <inheritdoc/>
+    public string Format(string? fmt, object? arg, IFormatProvider? formatProvider)
+    {
+        if (fmt != null)
+        {
+            switch (fmt.Length)
+            {
+                case 3: // FnP
+                    return string.Format($"{{0:P{fmt[1]}}}", arg);
+                case 2: // Fn
+                    return string.Format($"{{0:{fmt}}}", arg);
+                case 1: // P I
+                    switch (fmt[0])
+                    {
+                        case 'P':
+                            return string.Format($"{{0:P0}}", arg);
+                        case 'I':
+                            return arg == null ? "0" : ((IConvertible)arg).ToInt32(null).ToString();
+                    }
+
+                    break;
+            }
+        }
+
+        return arg?.ToString() ?? string.Empty;
+    }
+
+    /// <inheritdoc/>
+    public object? GetFormat(Type? formatType)
+    {
+        return formatType == typeof(ICustomFormatter)
+            ? this
+            : null;
+    }
+}

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Reliquary/Reliquary.cs

@@ -18,7 +18,7 @@ public class Reliquary
     /// <summary>
     /// 允许出现的等级
     /// </summary>
-    public IEnumerable<ItemQuality> RankLevels { get; set; } = default!;
+    public ItemQuality RankLevel { get; set; } = default!;
 
     /// <summary>
     /// 套装Id

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Reliquary/ReliquaryLevel.cs

@@ -0,0 +1,29 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Json.Converter;
+using Snap.Hutao.Model.Intrinsic;
+
+namespace Snap.Hutao.Model.Metadata.Reliquary;
+
+/// <summary>
+/// 圣遗物等级
+/// </summary>
+public class ReliquaryLevel
+{
+    /// <summary>
+    /// 品质
+    /// </summary>
+    public ItemQuality Quality { get; set; }
+
+    /// <summary>
+    /// 等级 1-21
+    /// </summary>
+    public int Level { get; set; }
+
+    /// <summary>
+    /// 属性
+    /// </summary>
+    [JsonConverter(typeof(StringEnumKeyDictionaryConverter))]
+    public IDictionary<FightProperty, double> Properties { get; set; } = default!;
+}