fix hutao statistics unavailable

src/Snap.Hutao/.editorconfig

@@ -110,6 +110,7 @@ dotnet_diagnostic.SA1642.severity = none
 
 dotnet_diagnostic.IDE0005.severity = warning
 dotnet_diagnostic.IDE0060.severity = none
+dotnet_diagnostic.IDE0290.severity = none
 
 # SA1208: System using directives should be placed before other using directives
 dotnet_diagnostic.SA1208.severity = none
@@ -320,8 +321,7 @@ dotnet_diagnostic.CA2227.severity = suggestion
 
 # CA2251: 使用 “string.Equals”
 dotnet_diagnostic.CA2251.severity = suggestion
-
-csharp_style_prefer_primary_constructors = false:none
+csharp_style_prefer_primary_constructors = true:suggestion
 
 [*.vb]
 #### 命名样式 ####

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

@@ -10,6 +10,8 @@ using Snap.Hutao.Core.LifeCycle.InterProcess;
 using Snap.Hutao.Core.Logging;
 using Snap.Hutao.Core.Shell;
 using System.Diagnostics;
+using System.Text;
+using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;
 
 namespace Snap.Hutao;
 

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

@@ -28,21 +28,4 @@ internal static class FrameworkElementExtension
         frameworkElement.IsRightTapEnabled = false;
         frameworkElement.IsTabStop = false;
     }
-
-    public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
-        where TDataContext : class
-    {
-        IServiceProvider service = serviceProvider ?? Ioc.Default;
-        try
-        {
-            frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
-        }
-        catch (Exception ex)
-        {
-
-            ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
-            logger?.LogError(ex, "Failed to initialize DataContext");
-            throw;
-        }
-    }
 }

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

@@ -35,7 +35,7 @@ internal sealed class CachedImage : Implementation.ImageEx
 
         try
         {
-            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.

src/Snap.Hutao/Snap.Hutao/Control/Layout/UniformStaggeredLayout.cs

@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Windows.Foundation;
 

src/Snap.Hutao/Snap.Hutao/Control/Panel/HorizontalEqualPanel.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
-using System.Runtime.InteropServices;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
@@ -19,14 +18,13 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
         {
             // ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
             double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
-            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
             double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
         }
 
         return base.MeasureOverride(availableSize);
@@ -34,14 +32,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
-        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
+        int itemCount = Children.Count;
+        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
         double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
 
         double offset = 0;
-        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
+        foreach (UIElement child in Children)
         {
-            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
             offset += actualItemWidth + Spacing;
         }
 
@@ -51,8 +49,7 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
     private static void OnLoaded(object sender, RoutedEventArgs e)
     {
         HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
-        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
+        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
     }
 
     private static void OnSizeChanged(object sender, SizeChangedEventArgs e)

src/Snap.Hutao/Snap.Hutao/Control/Panel/UniformPanel.cs

@@ -2,6 +2,8 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;

src/Snap.Hutao/Snap.Hutao/Control/ScopedPage.cs

@@ -15,7 +15,7 @@ internal class ScopedPage : Page
 {
     private readonly RoutedEventHandler unloadEventHandler;
     private readonly CancellationTokenSource viewCancellationTokenSource = new();
-    private readonly IServiceScope pageScope;
+    private readonly IServiceScope currentScope;
 
     private bool inFrame = true;
 
@@ -23,7 +23,7 @@ internal class ScopedPage : Page
     {
         unloadEventHandler = OnUnloaded;
         Unloaded += unloadEventHandler;
-        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
     }
 
     public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -44,17 +44,9 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        try
-        {
-            IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
-            viewModel.CancellationToken = viewCancellationTokenSource.Token;
-            DataContext = viewModel;
-        }
-        catch (Exception ex)
-        {
-            pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
-            throw;
-        }
+        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
+        viewModel.CancellationToken = viewCancellationTokenSource.Token;
+        DataContext = viewModel;
     }
 
     /// <inheritdoc/>
@@ -103,7 +95,7 @@ internal class ScopedPage : Page
                 viewModel.IsViewDisposed = true;
 
                 // Dispose the scope
-                pageScope.Dispose();
+                currentScope.Dispose();
             }
         }
     }

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

@@ -5,9 +5,6 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
 using Snap.Hutao.Core.IO;
 using Snap.Hutao.Core.IO.Hashing;
 using Snap.Hutao.Core.Logging;
-using Snap.Hutao.ViewModel.Guide;
-using Snap.Hutao.Web.Request.Builder;
-using Snap.Hutao.Web.Request.Builder.Abstraction;
 using System.Collections.Concurrent;
 using System.Collections.Frozen;
 using System.IO;
@@ -39,7 +36,6 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
     private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
 
     private readonly IHttpClientFactory httpClientFactory;
-    private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
     private readonly IServiceProvider serviceProvider;
     private readonly ILogger<ImageCache> logger;
 
@@ -173,49 +169,38 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
         HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
         while (retryCount < 3)
         {
-            HttpRequestMessageBuilder requestMessageBuilder = httpRequestMessageBuilderFactory
-                .Create()
-                .SetRequestUri(uri)
-
-                // These headers are only available for our own api
-                .SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
-                .Get();
-
-            using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
+            using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
             {
-                using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
+                if (message.RequestMessage is { RequestUri: { } target } && target != uri)
                 {
-                    if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
-                    {
-                        logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
-                    }
+                    logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
+                }
 
-                    if (responseMessage.IsSuccessStatusCode)
+                if (message.IsSuccessStatusCode)
+                {
+                    using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
                     {
-                        using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                        using (FileStream fileStream = File.Create(baseFile))
                         {
-                            using (FileStream fileStream = File.Create(baseFile))
-                            {
-                                await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
-                                return;
-                            }
+                            await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
+                            return;
                         }
                     }
+                }
 
-                    switch (responseMessage.StatusCode)
-                    {
-                        case HttpStatusCode.TooManyRequests:
-                            {
-                                retryCount++;
-                                TimeSpan delay = responseMessage.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
-                                logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
-                                await Task.Delay(delay).ConfigureAwait(false);
-                                break;
-                            }
+                switch (message.StatusCode)
+                {
+                    case HttpStatusCode.TooManyRequests:
+                        {
+                            retryCount++;
+                            TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
+                            logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
+                            await Task.Delay(delay).ConfigureAwait(false);
+                            break;
+                        }
 
-                        default:
-                            return;
-                    }
+                    default:
+                        return;
                 }
             }
         }

src/Snap.Hutao/Snap.Hutao/Core/Collection/TwoEnumerbleEnumerator.cs

@@ -1,32 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Core.Collection;
-
-internal sealed class TwoEnumerbleEnumerator<TFirst, TSecond> : IDisposable
-{
-    private readonly IEnumerator<TFirst> firstEnumerator;
-    private readonly IEnumerator<TSecond> secondEnumerator;
-
-    public TwoEnumerbleEnumerator(IEnumerable<TFirst> firstEnumerable, IEnumerable<TSecond> secondEnumerable)
-    {
-        firstEnumerator = firstEnumerable.GetEnumerator();
-        secondEnumerator = secondEnumerable.GetEnumerator();
-    }
-
-    public (TFirst First, TSecond Second) Current { get => (firstEnumerator.Current, secondEnumerator.Current); }
-
-    public bool MoveNext(ref bool moveFirst, ref bool moveSecond)
-    {
-        moveFirst = moveFirst && firstEnumerator.MoveNext();
-        moveSecond = moveSecond && secondEnumerator.MoveNext();
-
-        return moveFirst || moveSecond;
-    }
-
-    public void Dispose()
-    {
-        firstEnumerator.Dispose();
-        secondEnumerator.Dispose();
-    }
-}

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

@@ -13,6 +13,13 @@ namespace Snap.Hutao.Core.Database;
 [HighQuality]
 internal static class DbSetExtension
 {
+    /// <summary>
+    /// 添加并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
     public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -20,13 +27,27 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步添加并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
         dbSet.Add(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
     }
 
+    /// <summary>
+    /// 添加列表并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entities">实体</param>
+    /// <returns>影响条数</returns>
     public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
         where TEntity : class
     {
@@ -34,13 +55,27 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
+    /// <summary>
+    /// 异步添加列表并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entities">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
         where TEntity : class
     {
         dbSet.AddRange(entities);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
     }
 
+    /// <summary>
+    /// 移除并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
     public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -48,13 +83,27 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步移除并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
         dbSet.Remove(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
     }
 
+    /// <summary>
+    /// 更新并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
     public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
@@ -62,11 +111,18 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
+    /// <summary>
+    /// 异步更新并保存
+    /// </summary>
+    /// <typeparam name="TEntity">实体类型</typeparam>
+    /// <param name="dbSet">数据库集</param>
+    /// <param name="entity">实体</param>
+    /// <returns>影响条数</returns>
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
         where TEntity : class
     {
         dbSet.Update(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
+        return dbSet.SaveChangesAndClearChangeTrackerAsync();
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -80,11 +136,11 @@ internal static class DbSetExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
+    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
         where TEntity : class
     {
         DbContext dbContext = dbSet.Context();
-        int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
+        int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
         dbContext.ChangeTracker.Clear();
         return count;
     }

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoException.cs

@@ -5,43 +5,46 @@ namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
 {
-    public HutaoException(string message, Exception? innerException)
+    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
+        : this(message, innerException)
+    {
+        Kind = kind;
+    }
+
+    private HutaoException(string message, Exception? innerException)
         : base($"{message}\n{innerException?.Message}", innerException)
     {
     }
 
+    public HutaoExceptionKind Kind { get; private set; }
+
     [DoesNotReturn]
-    public static HutaoException Throw(string message, Exception? innerException = default)
+    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
-        throw new HutaoException(message, innerException);
+        throw new HutaoException(kind, message, innerException);
     }
 
-    public static void ThrowIf(bool condition, string message, Exception? innerException = default)
+    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
         if (condition)
         {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
         }
     }
 
-    public static void ThrowIfNot(bool condition, string message, Exception? innerException = default)
+    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
     {
         if (!condition)
         {
-            throw new HutaoException(message, innerException);
+            throw new HutaoException(kind, message, innerException);
         }
     }
 
     [DoesNotReturn]
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
-    }
-
-    [DoesNotReturn]
-    public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
-    {
-        throw new HutaoException(message, innerException);
+        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
+        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
     }
 
     [DoesNotReturn]
@@ -51,12 +54,6 @@ internal sealed class HutaoException : Exception
         throw new InvalidCastException(message, innerException);
     }
 
-    [DoesNotReturn]
-    public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
-    {
-        throw new NotSupportedException(message, innerException);
-    }
-
     [DoesNotReturn]
     public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
     {

src/Snap.Hutao/Snap.Hutao/Core/ExceptionService/HutaoExceptionKind.cs

@@ -9,8 +9,6 @@ internal enum HutaoExceptionKind
 
     // Foundation
     ImageCacheInvalidUri,
-    DatabaseCorrupted,
-    UserdataCorrupted,
 
     // IO
     FileSystemCreateFileInsufficientPermissions,

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Sharding/HttpShardCopyWorker.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.Win32.SafeHandles;
 using Snap.Hutao.Core.Diagnostics;
-using System.Buffers;
 using System.IO;
 using System.Net.Http;
 
@@ -78,36 +77,34 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
                 using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
                 {
                     response.EnsureSuccessStatusCode();
-                    using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent())
+
+                    Memory<byte> buffer = new byte[bufferSize];
+                    using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
                     {
-                        Memory<byte> buffer = memoryOwner.Memory;
-                        using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
+                        int totalBytesRead = 0;
+                        int bytesReadAfterPreviousReport = 0;
+                        do
                         {
-                            int totalBytesRead = 0;
-                            int bytesReadAfterPreviousReport = 0;
-                            do
+                            int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
+                            if (bytesRead <= 0)
                             {
-                                int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
-                                if (bytesRead <= 0)
-                                {
-                                    progress.Report(new(bytesReadAfterPreviousReport));
-                                    bytesReadAfterPreviousReport = 0;
-                                    break;
-                                }
-
-                                await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
-
-                                totalBytesRead += bytesRead;
-                                bytesReadAfterPreviousReport += bytesRead;
-                                if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
-                                {
-                                    progress.Report(new(bytesReadAfterPreviousReport));
-                                    bytesReadAfterPreviousReport = 0;
-                                    stopwatch = ValueStopwatch.StartNew();
-                                }
+                                progress.Report(new(bytesReadAfterPreviousReport));
+                                bytesReadAfterPreviousReport = 0;
+                                break;
+                            }
+
+                            await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
+
+                            totalBytesRead += bytesRead;
+                            bytesReadAfterPreviousReport += bytesRead;
+                            if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
+                            {
+                                progress.Report(new(bytesReadAfterPreviousReport));
+                                bytesReadAfterPreviousReport = 0;
+                                stopwatch = ValueStopwatch.StartNew();
                             }
-                            while (true);
                         }
+                        while (true);
                     }
                 }
             }

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

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Diagnostics;
-using System.Buffers;
 using System.IO;
 
 namespace Snap.Hutao.Core.IO;
@@ -52,30 +51,26 @@ internal class StreamCopyWorker<TStatus>
 
         long totalBytesRead = 0;
         int bytesRead;
+        Memory<byte> buffer = new byte[bufferSize];
 
-        using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
+        do
         {
-            Memory<byte> buffer = memoryOwner.Memory;
-
-            do
+            bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
+            if (bytesRead == 0)
             {
-                bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
-                if (bytesRead is 0)
-                {
-                    progress.Report(statusFactory(totalBytesRead));
-                    break;
-                }
-
-                await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
-
-                totalBytesRead += bytesRead;
-                if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
-                {
-                    progress.Report(statusFactory(totalBytesRead));
-                    stopwatch = ValueStopwatch.StartNew();
-                }
+                progress.Report(statusFactory(totalBytesRead));
+                break;
+            }
+
+            await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
+
+            totalBytesRead += bytesRead;
+            if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
+            {
+                progress.Report(statusFactory(totalBytesRead));
+                stopwatch = ValueStopwatch.StartNew();
             }
-            while (bytesRead > 0);
         }
+        while (bytesRead > 0);
     }
 }

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

@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
         }
         catch (UnauthorizedAccessException ex)
         {
-            HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
+            HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
         }
 
         if (delete)

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

@@ -116,15 +116,15 @@ internal sealed partial class Activation : IActivation
 
         // If it's the first time launch, we show the guide window anyway.
         // Otherwise, we check if there's any unfulfilled resource category present.
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
         {
             if (StaticResource.IsAnyUnfulfilledCategoryPresent())
             {
-                UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin);
+                UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin);
             }
         }
 
-        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
+        if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed)
         {
             await taskContext.SwitchToMainThreadAsync();
             serviceProvider.GetRequiredService<GuideWindow>();

src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/InterProcess/PrivateNamedPipeServer.cs

@@ -49,7 +49,7 @@ internal sealed partial class PrivateNamedPipeServer : IDisposable
     {
         byte[] content = new byte[header->ContentLength];
         serverStream.ReadAtLeast(content, header->ContentLength, false);
-        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
         return content;
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Setting/SettingKeys.cs

@@ -20,9 +20,7 @@ internal static class SettingKeys
     #region Application
     public const string LaunchTimes = "LaunchTimes";
     public const string DataFolderPath = "DataFolderPath";
-    public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState1";
-    public const string StaticResourceImageQuality = "StaticResourceImageQuality";
-    public const string StaticResourceImageArchive = "StaticResourceImageArchive";
+    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
     public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever";
     public const string IsAllocConsoleDebugModeEnabled = "IsAllocConsoleDebugModeEnabled2";
     #endregion
@@ -62,10 +60,6 @@ internal static class SettingKeys
     #endregion
 
     #region Obsolete
-
-    [Obsolete("重置新手引导状态")]
-    public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
-
     [Obsolete("重置调试控制台开关")]
     public const string IsAllocConsoleDebugModeEnabledLegacy1 = "IsAllocConsoleDebugModeEnabled";
     #endregion

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

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

src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml

@@ -8,7 +8,7 @@
     xmlns:shvg="using:Snap.Hutao.View.Guide"
     mc:Ignorable="d">
 
-    <Grid x:Name="RootGrid" Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
+    <Grid x:Name="RootGrid">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
             <RowDefinition/>

src/Snap.Hutao/Snap.Hutao/GuideWindow.xaml.cs

@@ -14,10 +14,10 @@ namespace Snap.Hutao;
 internal sealed partial class GuideWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
 {
     private const int MinWidth = 1000;
-    private const int MinHeight = 650;
+    private const int MinHeight = 600;
 
     private const int MaxWidth = 1200;
-    private const int MaxHeight = 800;
+    private const int MaxHeight = 750;
 
     private readonly WindowOptions windowOptions;
 

src/Snap.Hutao/Snap.Hutao/LaunchGameWindow.xaml.cs

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

src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntity.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Entity.Abstraction;
-
-internal interface IAppDbEntity
-{
-    Guid InnerId { get; }
-}

src/Snap.Hutao/Snap.Hutao/Model/Entity/Abstraction/IAppDbEntityHasArchive.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Model.Entity.Abstraction;
-
-internal interface IAppDbEntityHasArchive : IAppDbEntity
-{
-    Guid ArchiveId { get; }
-}

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

@@ -16,8 +16,8 @@ namespace Snap.Hutao.Model.Entity;
 [HighQuality]
 [Table("achievements")]
 [SuppressMessage("", "SA1124")]
-internal sealed class Achievement : IAppDbEntityHasArchive,
-    IEquatable<Achievement>,
+internal sealed class Achievement
+    : IEquatable<Achievement>,
     IDbMappingForeignKeyFrom<Achievement, AchievementId>,
     IDbMappingForeignKeyFrom<Achievement, UIAFItem>
 {

src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs

@@ -19,7 +19,6 @@ internal sealed partial class SettingEntry
     public const string AnnouncementRegion = "AnnouncementRegion";
 
     public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";
-    public const string IsUnobtainedWishItemVisible = "IsUnobtainedWishItemVisible";
 
     public const string GeetestCustomCompositeUrl = "GeetestCustomCompositeUrl";
 

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

@@ -11,6 +11,11 @@ namespace Snap.Hutao.Model.Metadata.Converter;
 [HighQuality]
 internal sealed class AvatarNameCardPicConverter : ValueConverter<Avatar.Avatar?, Uri>
 {
+    /// <summary>
+    /// 从角色转换到名片
+    /// </summary>
+    /// <param name="avatar">角色</param>
+    /// <returns>名片</returns>
     public static Uri AvatarToUri(Avatar.Avatar? avatar)
     {
         if (avatar is null)

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>Open UIAF Json File</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>Multiple identical achievement IDs found in a single achievement archive</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>Buka berkas UIAF Json</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>Terdapat beberapa ID pencapaian yang identik dalam satu arsip pencapaian</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>UIAF Json ファイルを開く</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>複数の同一アチーブメント Idがアーカイブに混在しています</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>打开 UIAF Json 文件</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>한 업적 아카이브에서 Id 동일한 업적 발견됨</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>Abrir arquivo Json UIAF</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>Várias IDs de conquistas idênticas encontradas em um único arquivo de conquistas</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx

@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>打开 UIAF Json 文件</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>单个成就存档内发现多个相同的成就 Id</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
@@ -1382,9 +1382,6 @@
   <data name="ViewGachaLogHeader" xml:space="preserve">
     <value>祈愿记录</value>
   </data>
-  <data name="ViewGuideStaticResourceDownloadSize" xml:space="preserve">
-    <value>预计下载大小：{0}</value>
-  </data>
   <data name="ViewGuideStepAgreementIHaveReadText" xml:space="preserve">
     <value>我已阅读并同意</value>
   </data>
@@ -1400,12 +1397,6 @@
   <data name="ViewGuideStepAgreementTermOfService" xml:space="preserve">
     <value>用户使用协议与法律声明</value>
   </data>
-  <data name="ViewGuideStepCommonSetting" xml:space="preserve">
-    <value>基础设置</value>
-  </data>
-  <data name="ViewGuideStepCommonSettingHint" xml:space="preserve">
-    <value>稍后可以在设置中修改</value>
-  </data>
   <data name="ViewGuideStepDocument" xml:space="preserve">
     <value>文档</value>
   </data>
@@ -1416,7 +1407,7 @@
     <value>安装完成后重启胡桃以查看是否正常生效</value>
   </data>
   <data name="ViewGuideStepEnvironmentFontDescription1" xml:space="preserve">
-    <value>如果上方的图标中存在乱码或方块字，请前往</value>
+    <value>如果上方的图标中存在乱码，请前往</value>
   </data>
   <data name="ViewGuideStepEnvironmentFontDescription2" xml:space="preserve">
     <value>下载并自行安装图标字体</value>
@@ -1433,24 +1424,6 @@
   <data name="ViewGuideStepStaticResource" xml:space="preserve">
     <value>资源</value>
   </data>
-  <data name="ViewGuideStepStaticResourceSetting" xml:space="preserve">
-    <value>图像资源设置</value>
-  </data>
-  <data name="ViewGuideStepStaticResourceSettingHint" xml:space="preserve">
-    <value>* 除非你卸载并重新安装胡桃，否则你将无法更改这些设置</value>
-  </data>
-  <data name="ViewGuideStepStaticResourceSettingMinimumHeader" xml:space="preserve">
-    <value>图片资源包体</value>
-  </data>
-  <data name="ViewGuideStepStaticResourceSettingMinimumOff" xml:space="preserve">
-    <value>完整包体</value>
-  </data>
-  <data name="ViewGuideStepStaticResourceSettingMinimumOn" xml:space="preserve">
-    <value>精简包体</value>
-  </data>
-  <data name="ViewGuideStepStaticResourceSettingQualityHeader" xml:space="preserve">
-    <value>图片资源质量</value>
-  </data>
   <data name="ViewHutaoDatabaseHeader" xml:space="preserve">
     <value>深渊统计</value>
   </data>
@@ -1640,12 +1613,6 @@
   <data name="ViewModelGuideActionStaticResourceBegin" xml:space="preserve">
     <value>下载资源文件中，请稍候</value>
   </data>
-  <data name="ViewModelGuideStaticResourceQualityHigh" xml:space="preserve">
-    <value>高质量</value>
-  </data>
-  <data name="ViewModelGuideStaticResourceQualityRaw" xml:space="preserve">
-    <value>原图</value>
-  </data>
   <data name="ViewModelHutaoPassportEmailNotValidHint" xml:space="preserve">
     <value>请输入正确的邮箱</value>
   </data>
@@ -2702,12 +2669,6 @@
   <data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
     <value>贡献翻译</value>
   </data>
-  <data name="ViewPageSettingUnobtainedWishItemVisibleDescription" xml:space="preserve">
-    <value>在祈愿记录页面角色与武器页签显示未抽取到的祈愿物品</value>
-  </data>
-  <data name="ViewPageSettingUnobtainedWishItemVisibleHeader" xml:space="preserve">
-    <value>未抽取到的祈愿物品</value>
-  </data>
   <data name="ViewPageSettingUpdateCheckAction" xml:space="preserve">
     <value>前往商店</value>
   </data>

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>Открыть UIAF Json файл</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>В одном архиве достижений обнаружено несколько одинаковых идентификаторов достижений</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx

@@ -60,45 +60,45 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
           <xsd:element name="metadata">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0"/>
               </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" use="required" type="xsd:string"/>
+              <xsd:attribute name="type" type="xsd:string"/>
+              <xsd:attribute name="mimetype" type="xsd:string"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
             <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="alias" type="xsd:string"/>
+              <xsd:attribute name="name" type="xsd:string"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="data">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+              <xsd:attribute ref="xml:space"/>
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
             <xsd:complexType>
               <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
+              <xsd:attribute name="name" type="xsd:string" use="required"/>
             </xsd:complexType>
           </xsd:element>
         </xsd:choice>
@@ -653,7 +653,7 @@
   <data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
     <value>打開 UIAF Json 文件</value>
   </data>
-  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
     <value>單個成就存檔內發現多個相同的成就 Id</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceAppDbEntityExtension.cs

@@ -1,35 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.EntityFrameworkCore;
-using Snap.Hutao.Core.Database;
-using Snap.Hutao.Model.Entity.Abstraction;
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal static class AppDbServiceAppDbEntityExtension
-{
-    public static int DeleteByInnerId<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
-        where TEntity : class, IAppDbEntity
-    {
-        return service.Execute(dbset => dbset.ExecuteDeleteWhere(e => e.InnerId == entity.InnerId));
-    }
-
-    public static ValueTask<int> DeleteByInnerIdAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
-        where TEntity : class, IAppDbEntity
-    {
-        return service.ExecuteAsync((dbset, token) => dbset.ExecuteDeleteWhereAsync(e => e.InnerId == entity.InnerId, token), token);
-    }
-
-    public static List<TEntity> ListByArchiveId<TEntity>(this IAppDbService<TEntity> service, Guid archiveId)
-        where TEntity : class, IAppDbEntityHasArchive
-    {
-        return service.Query(query => query.Where(e => e.ArchiveId == archiveId).ToList());
-    }
-
-    public static ValueTask<List<TEntity>> ListByArchiveIdAsync<TEntity>(this IAppDbService<TEntity> service, Guid archiveId, CancellationToken token = default)
-        where TEntity : class, IAppDbEntityHasArchive
-    {
-        return service.QueryAsync((query, token) => query.Where(e => e.ArchiveId == archiveId).ToListAsync(token), token);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceCollectionExtension.cs

@@ -1,47 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.EntityFrameworkCore;
-using System.Collections.ObjectModel;
-using System.Linq.Expressions;
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal static class AppDbServiceCollectionExtension
-{
-    public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service)
-        where TEntity : class
-    {
-        return service.Query(query => query.ToList());
-    }
-
-    public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Where(predicate).ToList());
-    }
-
-    public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.ToListAsync(token), token);
-    }
-
-    public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.Where(predicate).ToListAsync(token), token);
-    }
-
-    public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service)
-        where TEntity : class
-    {
-        return service.Query(query => query.ToObservableCollection());
-    }
-
-    public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Where(predicate).ToObservableCollection());
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/AppDbServiceExtension.cs

@@ -1,152 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.EntityFrameworkCore;
-using Snap.Hutao.Core.Database;
-using Snap.Hutao.Model.Entity.Database;
-using System.Linq.Expressions;
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal static class AppDbServiceExtension
-{
-    public static TResult Execute<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, TResult> func)
-        where TEntity : class
-    {
-        using (IServiceScope scope = service.ServiceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.GetAppDbContext();
-            return func(appDbContext.Set<TEntity>());
-        }
-    }
-
-    public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, ValueTask<TResult>> asyncFunc)
-        where TEntity : class
-    {
-        using (IServiceScope scope = service.ServiceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.GetAppDbContext();
-            return await asyncFunc(appDbContext.Set<TEntity>()).ConfigureAwait(false);
-        }
-    }
-
-    public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, CancellationToken, ValueTask<TResult>> asyncFunc, CancellationToken token)
-        where TEntity : class
-    {
-        using (IServiceScope scope = service.ServiceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.GetAppDbContext();
-            return await asyncFunc(appDbContext.Set<TEntity>(), token).ConfigureAwait(false);
-        }
-    }
-
-    public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, Task<TResult>> asyncFunc)
-        where TEntity : class
-    {
-        using (IServiceScope scope = service.ServiceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.GetAppDbContext();
-            return await asyncFunc(appDbContext.Set<TEntity>()).ConfigureAwait(false);
-        }
-    }
-
-    public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, CancellationToken, Task<TResult>> asyncFunc, CancellationToken token)
-        where TEntity : class
-    {
-        using (IServiceScope scope = service.ServiceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.GetAppDbContext();
-            return await asyncFunc(appDbContext.Set<TEntity>(), token).ConfigureAwait(false);
-        }
-    }
-
-    public static int Add<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
-        where TEntity : class
-    {
-        return service.Execute(dbset => dbset.AddAndSave(entity));
-    }
-
-    public static ValueTask<int> AddAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => dbset.AddAndSaveAsync(entity, token), token);
-    }
-
-    public static int AddRange<TEntity>(this IAppDbService<TEntity> service, IEnumerable<TEntity> entities)
-        where TEntity : class
-    {
-        return service.Execute(dbset => dbset.AddRangeAndSave(entities));
-    }
-
-    public static ValueTask<int> AddRangeAsync<TEntity>(this IAppDbService<TEntity> service, IEnumerable<TEntity> entities, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => dbset.AddRangeAndSaveAsync(entities, token), token);
-    }
-
-    public static TResult Query<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, TResult> func)
-        where TEntity : class
-    {
-        return service.Execute(dbset => func(dbset.AsNoTracking()));
-    }
-
-    public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, ValueTask<TResult>> func)
-        where TEntity : class
-    {
-        return service.ExecuteAsync(dbset => func(dbset.AsNoTracking()));
-    }
-
-    public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, CancellationToken, ValueTask<TResult>> func, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => func(dbset.AsNoTracking(), token), token);
-    }
-
-    public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, Task<TResult>> func)
-        where TEntity : class
-    {
-        return service.ExecuteAsync(dbset => func(dbset.AsNoTracking()));
-    }
-
-    public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, CancellationToken, Task<TResult>> func, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => func(dbset.AsNoTracking(), token), token);
-    }
-
-    public static TEntity Single<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
-        where TEntity : class
-    {
-        return service.Query(query => query.Single(predicate));
-    }
-
-    public static ValueTask<TEntity> SingleAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.QueryAsync((query, token) => query.SingleAsync(predicate, token), token);
-    }
-
-    public static int Update<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
-        where TEntity : class
-    {
-        return service.Execute(dbset => dbset.UpdateAndSave(entity));
-    }
-
-    public static ValueTask<int> UpdateAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => dbset.UpdateAndSaveAsync(entity, token), token);
-    }
-
-    public static int Delete<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
-        where TEntity : class
-    {
-        return service.Execute(dbset => dbset.RemoveAndSave(entity));
-    }
-
-    public static ValueTask<int> DeleteAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
-        where TEntity : class
-    {
-        return service.ExecuteAsync((dbset, token) => dbset.RemoveAndSaveAsync(entity, token), token);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/DbStoreOptions.cs

@@ -14,10 +14,20 @@ namespace Snap.Hutao.Service.Abstraction;
 /// 数据库存储选项的设置
 /// </summary>
 [ConstructorGenerated]
-internal abstract partial class DbStoreOptions : ObservableObject
+internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbStoreOptions>
 {
     private readonly IServiceProvider serviceProvider;
 
+    /// <inheritdoc/>
+    public DbStoreOptions Value { get => this; }
+
+    /// <summary>
+    /// 从数据库中获取字符串数据
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns>值</returns>
     protected string GetOption(ref string? storage, string key, string defaultValue = "")
     {
         return GetOption(ref storage, key, () => defaultValue);
@@ -39,6 +49,13 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return storage;
     }
 
+    /// <summary>
+    /// 从数据库中获取bool数据
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns>值</returns>
     protected bool GetOption(ref bool? storage, string key, bool defaultValue = false)
     {
         return GetOption(ref storage, key, () => defaultValue);
@@ -61,6 +78,13 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return storage.Value;
     }
 
+    /// <summary>
+    /// 从数据库中获取int数据
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns>值</returns>
     protected int GetOption(ref int? storage, string key, int defaultValue = 0)
     {
         return GetOption(ref storage, key, () => defaultValue);
@@ -83,6 +107,15 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return storage.Value;
     }
 
+    /// <summary>
+    /// 从数据库中获取任何类型的数据
+    /// </summary>
+    /// <typeparam name="T">数据的类型</typeparam>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="deserializer">反序列化器</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns>值</returns>
     [return: NotNull]
     protected T GetOption<T>(ref T? storage, string key, Func<string, T> deserializer, [DisallowNull] T defaultValue)
     {
@@ -127,6 +160,13 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return storage;
     }
 
+    /// <summary>
+    /// 将值存入数据库
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="value">值</param>
+    /// <param name="propertyName">属性名称</param>
     protected void SetOption(ref string? storage, string key, string? value, [CallerMemberName] string? propertyName = null)
     {
         if (!SetProperty(ref storage, value, propertyName))
@@ -142,6 +182,14 @@ internal abstract partial class DbStoreOptions : ObservableObject
         }
     }
 
+    /// <summary>
+    /// 将值存入数据库
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="value">值</param>
+    /// <param name="propertyName">属性名称</param>
+    /// <returns>是否设置了值</returns>
     protected bool SetOption(ref bool? storage, string key, bool value, [CallerMemberName] string? propertyName = null)
     {
         bool set = SetProperty(ref storage, value, propertyName);
@@ -160,6 +208,13 @@ internal abstract partial class DbStoreOptions : ObservableObject
         return set;
     }
 
+    /// <summary>
+    /// 将值存入数据库
+    /// </summary>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="value">值</param>
+    /// <param name="propertyName">属性名称</param>
     protected void SetOption(ref int? storage, string key, int value, [CallerMemberName] string? propertyName = null)
     {
         if (!SetProperty(ref storage, value, propertyName))
@@ -175,6 +230,15 @@ internal abstract partial class DbStoreOptions : ObservableObject
         }
     }
 
+    /// <summary>
+    /// 将值存入数据库
+    /// </summary>
+    /// <typeparam name="T">数据的类型</typeparam>
+    /// <param name="storage">存储字段</param>
+    /// <param name="key">键</param>
+    /// <param name="value">值</param>
+    /// <param name="serializer">序列化器</param>
+    /// <param name="propertyName">属性名称</param>
     protected void SetOption<T>(ref T? storage, string key, T value, Func<T, string> serializer, [CallerMemberName] string? propertyName = null)
     {
         if (!SetProperty(ref storage, value, propertyName))

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAnnouncementService.cs

@@ -4,7 +4,7 @@
 using Snap.Hutao.Web.Hoyolab;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
 
-namespace Snap.Hutao.Service.Announcement;
+namespace Snap.Hutao.Service.Abstraction;
 
 /// <summary>
 /// 公告服务

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppDbService.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal interface IAppDbService<TEntity> : IAppInfrastructureService
-    where TEntity : class
-{
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppInfrastructureService.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal interface IAppInfrastructureService
-{
-    IServiceProvider ServiceProvider { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/IAppService.cs

@@ -1,6 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal interface IAppService;

src/Snap.Hutao/Snap.Hutao/Service/Abstraction/ServiceScopeExtension.cs

@@ -1,27 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.EntityFrameworkCore;
-using Snap.Hutao.Model.Entity.Database;
-
-namespace Snap.Hutao.Service.Abstraction;
-
-internal static class ServiceScopeExtension
-{
-    public static TService GetRequiredService<TService>(this IServiceScope scope)
-        where TService : class
-    {
-        return scope.ServiceProvider.GetRequiredService<TService>();
-    }
-
-    public static TDbContext GetDbContext<TDbContext>(this IServiceScope scope)
-        where TDbContext : DbContext
-    {
-        return scope.GetRequiredService<TDbContext>();
-    }
-
-    public static AppDbContext GetAppDbContext(this IServiceScope scope)
-    {
-        return scope.GetDbContext<AppDbContext>();
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementDbBulkOperation.cs

@@ -2,11 +2,9 @@
 // Licensed under the MIT license.
 
 using Microsoft.EntityFrameworkCore;
-using Snap.Hutao.Core.Collection;
 using Snap.Hutao.Core.Database;
 using Snap.Hutao.Model.Entity.Database;
 using Snap.Hutao.Model.InterChange.Achievement;
-using Snap.Hutao.Service.Abstraction;
 using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
@@ -23,155 +21,197 @@ internal sealed partial class AchievementDbBulkOperation
     private readonly IServiceProvider serviceProvider;
     private readonly ILogger<AchievementDbBulkOperation> logger;
 
+    /// <summary>
+    /// 合并
+    /// </summary>
+    /// <param name="archiveId">成就id</param>
+    /// <param name="items">待合并的项</param>
+    /// <param name="aggressive">是否贪婪</param>
+    /// <returns>导入结果</returns>
     public ImportResult Merge(Guid archiveId, IEnumerable<UIAFItem> items, bool aggressive)
     {
-        logger.LogInformation("Perform merge operation for [Archive: {Id}], [Aggressive: {Aggressive}]", archiveId, aggressive);
+        logger.LogInformation("Perform {Method} Operation for archive: {Id}, Aggressive: {Aggressive}", nameof(Merge), archiveId, aggressive);
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            AppDbContext appDbContext = scope.GetAppDbContext();
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
 
             IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
                 .AsNoTracking()
                 .Where(a => a.ArchiveId == archiveId)
                 .OrderBy(a => a.Id);
 
-            (int add, int update) = (0, 0);
+            int add = 0;
+            int update = 0;
 
-            using (TwoEnumerbleEnumerator<EntityAchievement, UIAFItem> enumerator = new(oldData, items))
+            using (IEnumerator<EntityAchievement> entityEnumerator = oldData.GetEnumerator())
             {
-                (bool moveEntity, bool moveUIAF) = (true, true);
-
-                while (true)
+                using (IEnumerator<UIAFItem> uiafEnumerator = items.GetEnumerator())
                 {
-                    if (!enumerator.MoveNext(ref moveEntity, ref moveUIAF))
-                    {
-                        break;
-                    }
+                    bool moveEntity = true;
+                    bool moveUIAF = true;
 
-                    (EntityAchievement? entity, UIAFItem? uiaf) = enumerator.Current;
-
-                    switch (entity, uiaf)
+                    while (true)
                     {
-                        case (null, not null):
-                            appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
-                            add++;
-                            continue;
-                        case (not null, null):
-                            continue; // Skipped
-                        default:
+                        bool moveEntityResult = moveEntity && entityEnumerator.MoveNext();
+                        bool moveUIAFResult = moveUIAF && uiafEnumerator.MoveNext();
+
+                        if (!(moveEntityResult || moveUIAFResult))
+                        {
+                            break;
+                        }
+                        else
+                        {
+                            EntityAchievement? entity = entityEnumerator.Current;
+                            UIAFItem? uiaf = uiafEnumerator.Current;
+
+                            if (entity is null && uiaf is not null)
+                            {
+                                appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
+                                add++;
+                                continue;
+                            }
+                            else if (entity is not null && uiaf is null)
+                            {
+                                // skip
+                                continue;
+                            }
+
                             ArgumentNullException.ThrowIfNull(entity);
                             ArgumentNullException.ThrowIfNull(uiaf);
 
-                            switch (entity.Id.CompareTo(uiaf.Id))
+                            if (entity.Id < uiaf.Id)
                             {
-                                case < 0:
-                                    (moveEntity, moveUIAF) = (true, false);
-                                    break;
-                                case 0:
-                                    (moveEntity, moveUIAF) = (true, true);
-
-                                    if (aggressive)
-                                    {
-                                        appDbContext.Achievements.RemoveAndSave(entity);
-                                        appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
-                                        update++;
-                                    }
-
-                                    break;
-                                case > 0:
-                                    (moveEntity, moveUIAF) = (false, true);
-
-                                    appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
-                                    add++;
-                                    break;
+                                moveEntity = true;
+                                moveUIAF = false;
                             }
+                            else if (entity.Id == uiaf.Id)
+                            {
+                                moveEntity = true;
+                                moveUIAF = true;
 
-                            break;
+                                if (aggressive)
+                                {
+                                    appDbContext.Achievements.RemoveAndSave(entity);
+                                    appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
+                                    update++;
+                                }
+                            }
+                            else
+                            {
+                                // entity.Id > uiaf.Id
+                                moveEntity = false;
+                                moveUIAF = true;
+
+                                appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
+                                add++;
+                            }
+                        }
                     }
                 }
             }
 
-            logger.LogInformation("Merge operation complete, [Add: {Add}], [Update: {Update}]", add, update);
+            logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}", nameof(Merge), add, update);
             return new(add, update, 0);
         }
     }
 
+    /// <summary>
+    /// 覆盖
+    /// </summary>
+    /// <param name="archiveId">成就id</param>
+    /// <param name="items">待覆盖的项</param>
+    /// <returns>导入结果</returns>
     public ImportResult Overwrite(Guid archiveId, IEnumerable<EntityAchievement> items)
     {
-        logger.LogInformation("Perform Overwrite Operation for [Archive: {Id}]", archiveId);
+        logger.LogInformation("Perform {Method} Operation for archive: {Id}", nameof(Overwrite), archiveId);
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            AppDbContext appDbContext = scope.GetAppDbContext();
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
 
             IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
                 .AsNoTracking()
                 .Where(a => a.ArchiveId == archiveId)
                 .OrderBy(a => a.Id);
 
-            (int add, int update, int remove) = (0, 0, 0);
+            int add = 0;
+            int update = 0;
+            int remove = 0;
 
-            using (TwoEnumerbleEnumerator<EntityAchievement, EntityAchievement> enumerator = new(oldData, items))
+            using (IEnumerator<EntityAchievement> oldDataEnumerator = oldData.GetEnumerator())
             {
-                (bool moveOld, bool moveNew) = (true, true);
-
-                while (true)
+                using (IEnumerator<EntityAchievement> newDataEnumerator = items.GetEnumerator())
                 {
-                    if (!enumerator.MoveNext(ref moveOld, ref moveNew))
-                    {
-                        break;
-                    }
+                    bool moveOld = true;
+                    bool moveNew = true;
 
-                    (EntityAchievement? oldEntity, EntityAchievement? newEntity) = enumerator.Current;
-
-                    switch (oldEntity, newEntity)
+                    while (true)
                     {
-                        case (null, not null):
-                            appDbContext.Achievements.AddAndSave(newEntity);
-                            add++;
-                            continue;
-                        case (not null, null):
-                            appDbContext.Achievements.RemoveAndSave(oldEntity);
-                            remove++;
-                            continue;
-                        default:
+                        bool moveOldResult = moveOld && oldDataEnumerator.MoveNext();
+                        bool moveNewResult = moveNew && newDataEnumerator.MoveNext();
+
+                        if (moveOldResult || moveNewResult)
+                        {
+                            EntityAchievement? oldEntity = oldDataEnumerator.Current;
+                            EntityAchievement? newEntity = newDataEnumerator.Current;
+
+                            if (oldEntity is null && newEntity is not null)
+                            {
+                                appDbContext.Achievements.AddAndSave(newEntity);
+                                add++;
+                                continue;
+                            }
+                            else if (oldEntity is not null && newEntity is null)
+                            {
+                                appDbContext.Achievements.RemoveAndSave(oldEntity);
+                                remove++;
+                                continue;
+                            }
+
                             ArgumentNullException.ThrowIfNull(oldEntity);
                             ArgumentNullException.ThrowIfNull(newEntity);
 
-                            switch (oldEntity.Id.CompareTo(newEntity.Id))
+                            if (oldEntity.Id < newEntity.Id)
                             {
-                                case < 0:
-                                    (moveOld, moveNew) = (true, false);
-                                    break;
-                                case 0:
-                                    (moveOld, moveNew) = (true, true);
-
-                                    if (oldEntity.Equals(newEntity))
-                                    {
-                                        // Skip same entry, reduce write operation.
-                                        continue;
-                                    }
-                                    else
-                                    {
-                                        appDbContext.Achievements.RemoveAndSave(oldEntity);
-                                        appDbContext.Achievements.AddAndSave(newEntity);
-                                        update++;
-                                    }
-
-                                    break;
-                                case > 0:
-                                    (moveOld, moveNew) = (false, true);
-
-                                    appDbContext.Achievements.AddAndSave(newEntity);
-                                    add++;
-                                    break;
+                                moveOld = true;
+                                moveNew = false;
+                                appDbContext.Achievements.RemoveAndSave(oldEntity);
+                                remove++;
                             }
+                            else if (oldEntity.Id == newEntity.Id)
+                            {
+                                moveOld = true;
+                                moveNew = true;
 
+                                if (oldEntity.Equals(newEntity))
+                                {
+                                    // skip same entry.
+                                    continue;
+                                }
+                                else
+                                {
+                                    appDbContext.Achievements.RemoveAndSave(oldEntity);
+                                    appDbContext.Achievements.AddAndSave(newEntity);
+                                    update++;
+                                }
+                            }
+                            else
+                            {
+                                // entity.Id > uiaf.Id
+                                moveOld = false;
+                                moveNew = true;
+                                appDbContext.Achievements.AddAndSave(newEntity);
+                                add++;
+                            }
+                        }
+                        else
+                        {
                             break;
+                        }
                     }
                 }
             }
 
-            logger.LogInformation("Overwrite Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", add, update, remove);
+            logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", nameof(Overwrite), add, update, remove);
             return new(add, update, remove);
         }
     }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementDbService.cs

@@ -2,106 +2,167 @@
 // Licensed under the MIT license.
 
 using Microsoft.EntityFrameworkCore;
+using Snap.Hutao.Core.Database;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Entity;
+using Snap.Hutao.Model.Entity.Database;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Abstraction;
 using System.Collections.ObjectModel;
 using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
 
+/// <summary>
+/// 成就数据库服务
+/// </summary>
 [ConstructorGenerated]
 [Injection(InjectAs.Singleton, typeof(IAchievementDbService))]
 internal sealed partial class AchievementDbService : IAchievementDbService
 {
     private readonly IServiceProvider serviceProvider;
 
-    public IServiceProvider ServiceProvider { get => serviceProvider; }
-
     public Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId)
     {
+        Dictionary<AchievementId, EntityAchievement> entities;
         try
         {
-            return this.Query<EntityAchievement, Dictionary<AchievementId, EntityAchievement>>(query => query
-                .Where(a => a.ArchiveId == archiveId)
-                .ToDictionary(a => (AchievementId)a.Id));
+            using (IServiceScope scope = serviceProvider.CreateScope())
+            {
+                AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+                entities = appDbContext.Achievements
+                    .AsNoTracking()
+                    .Where(a => a.ArchiveId == archiveId)
+                    .ToDictionary(a => (AchievementId)a.Id);
+            }
         }
         catch (ArgumentException ex)
         {
-            throw HutaoException.UserdataCorrupted(SH.ServiceAchievementUserdataCorruptedAchievementIdNotUnique, ex);
+            throw ThrowHelper.DatabaseCorrupted(SH.ServiceAchievementUserdataCorruptedInnerIdNotUnique, ex);
+        }
+
+        return entities;
+    }
+
+    public async ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId)
+    {
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return await appDbContext.Achievements
+                .AsNoTracking()
+                .Where(a => a.ArchiveId == archiveId)
+                .Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
+                .CountAsync()
+                .ConfigureAwait(false);
         }
     }
 
-    public ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
-    {
-        return this.QueryAsync<EntityAchievement, int>(
-            (query, token) => query
-                .Where(a => a.ArchiveId == archiveId)
-                .Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
-                .CountAsync(token),
-            token);
-    }
-
     [SuppressMessage("", "CA1305")]
-    public ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default)
+    public async ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take)
     {
-        return this.QueryAsync<EntityAchievement, List<EntityAchievement>>(
-            (query, token) => query
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return await appDbContext.Achievements
+                .AsNoTracking()
                 .Where(a => a.ArchiveId == archiveId)
                 .Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
                 .OrderByDescending(a => a.Time.ToString())
                 .Take(take)
-                .ToListAsync(token),
-            token);
+                .ToListAsync()
+                .ConfigureAwait(false);
+        }
     }
 
     public void OverwriteAchievement(EntityAchievement achievement)
     {
-        this.DeleteByInnerId(achievement);
-        if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
+        using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            this.Add(achievement);
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+
+            // Delete exists one.
+            appDbContext.Achievements.ExecuteDeleteWhere(e => e.InnerId == achievement.InnerId);
+            if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
+            {
+                appDbContext.Achievements.AddAndSave(achievement);
+            }
         }
     }
 
-    public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default)
+    public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement)
     {
-        await this.DeleteByInnerIdAsync(achievement, token).ConfigureAwait(false);
-        if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
+        using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            await this.AddAsync(achievement, token).ConfigureAwait(false);
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+
+            // Delete exists one.
+            await appDbContext.Achievements.ExecuteDeleteWhereAsync(e => e.InnerId == achievement.InnerId).ConfigureAwait(false);
+            if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
+            {
+                await appDbContext.Achievements.AddAndSaveAsync(achievement).ConfigureAwait(false);
+            }
         }
     }
 
     public ObservableCollection<AchievementArchive> GetAchievementArchiveCollection()
     {
-        return this.ObservableCollection<AchievementArchive>();
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return appDbContext.AchievementArchives.AsNoTracking().ToObservableCollection();
+        }
     }
 
-    public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive, CancellationToken token = default)
+    public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive)
     {
-        // It will cascade deleted the achievements.
-        await this.DeleteAsync(archive, token).ConfigureAwait(false);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+
+            // It will cascade deleted the achievements.
+            await appDbContext.AchievementArchives.RemoveAndSaveAsync(archive).ConfigureAwait(false);
+        }
     }
 
     public List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId)
     {
-        return this.ListByArchiveId<EntityAchievement>(archiveId);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            IQueryable<EntityAchievement> result = appDbContext.Achievements.AsNoTracking().Where(i => i.ArchiveId == archiveId);
+            return [.. result];
+        }
     }
 
-    public ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
+    public async ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId)
     {
-        return this.ListByArchiveIdAsync<EntityAchievement>(archiveId, token);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return await appDbContext.Achievements
+                .AsNoTracking()
+                .Where(i => i.ArchiveId == archiveId)
+                .ToListAsync()
+                .ConfigureAwait(false);
+        }
     }
 
     public List<AchievementArchive> GetAchievementArchiveList()
     {
-        return this.List<AchievementArchive>();
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            IQueryable<AchievementArchive> result = appDbContext.AchievementArchives.AsNoTracking();
+            return [.. result];
+        }
     }
 
-    public ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default)
+    public async ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync()
     {
-        return this.ListAsync<AchievementArchive>(token);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            return await appDbContext.AchievementArchives.AsNoTracking().ToListAsync().ConfigureAwait(false);
+        }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Archive.cs

@@ -0,0 +1,79 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Core.Database;
+using Snap.Hutao.Model.Entity;
+using System.Collections.ObjectModel;
+
+namespace Snap.Hutao.Service.Achievement;
+
+/// <summary>
+/// 集合部分
+/// </summary>
+internal sealed partial class AchievementService
+{
+    private ObservableCollection<AchievementArchive>? archiveCollection;
+
+    /// <inheritdoc/>
+    public AchievementArchive? CurrentArchive
+    {
+        get => dbCurrent.Current;
+        set => dbCurrent.Current = value;
+    }
+
+    /// <inheritdoc/>
+    public ObservableCollection<AchievementArchive> ArchiveCollection
+    {
+        get
+        {
+            if (archiveCollection is null)
+            {
+                archiveCollection = achievementDbService.GetAchievementArchiveCollection();
+                CurrentArchive = archiveCollection.SelectedOrDefault();
+            }
+
+            return archiveCollection;
+        }
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask<ArchiveAddResult> AddArchiveAsync(AchievementArchive newArchive)
+    {
+        if (string.IsNullOrWhiteSpace(newArchive.Name))
+        {
+            return ArchiveAddResult.InvalidName;
+        }
+
+        ArgumentNullException.ThrowIfNull(archiveCollection);
+
+        // 查找是否有相同的名称
+        if (archiveCollection.Any(a => a.Name == newArchive.Name))
+        {
+            return ArchiveAddResult.AlreadyExists;
+        }
+
+        // Sync cache
+        await taskContext.SwitchToMainThreadAsync();
+        archiveCollection.Add(newArchive);
+
+        // Sync database
+        await taskContext.SwitchToBackgroundAsync();
+        CurrentArchive = newArchive;
+
+        return ArchiveAddResult.Added;
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
+    {
+        ArgumentNullException.ThrowIfNull(archiveCollection);
+
+        // Sync cache
+        await taskContext.SwitchToMainThreadAsync();
+        archiveCollection.Remove(archive);
+
+        // Sync database
+        await taskContext.SwitchToBackgroundAsync();
+        await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.Interchange.cs

@@ -0,0 +1,64 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Entity;
+using Snap.Hutao.Model.InterChange.Achievement;
+using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
+
+namespace Snap.Hutao.Service.Achievement;
+
+/// <summary>
+/// 数据交换部分
+/// </summary>
+internal sealed partial class AchievementService
+{
+    /// <inheritdoc/>
+    public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategy strategy)
+    {
+        await taskContext.SwitchToBackgroundAsync();
+
+        Guid archiveId = archive.InnerId;
+
+        switch (strategy)
+        {
+            case ImportStrategy.AggressiveMerge:
+                {
+                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
+                }
+
+            case ImportStrategy.LazyMerge:
+                {
+                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
+                }
+
+            case ImportStrategy.Overwrite:
+                {
+                    IEnumerable<EntityAchievement> orederedUIAF = list
+                        .Select(uiaf => EntityAchievement.From(archiveId, uiaf))
+                        .OrderBy(a => a.Id);
+                    return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
+                }
+
+            default:
+                throw Must.NeverHappen();
+        }
+    }
+
+    /// <inheritdoc/>
+    public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
+    {
+        await taskContext.SwitchToBackgroundAsync();
+        List<EntityAchievement> entities = await achievementDbService
+            .GetAchievementListByArchiveIdAsync(archive.InnerId)
+            .ConfigureAwait(false);
+        List<UIAFItem> list = entities.SelectList(UIAFItem.From);
+
+        return new()
+        {
+            Info = UIAFInfo.From(runtimeOptions),
+            List = list,
+        };
+    }
+}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementService.cs

@@ -3,16 +3,17 @@
 
 using Snap.Hutao.Core;
 using Snap.Hutao.Core.Database;
-using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Model.InterChange.Achievement;
 using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.ViewModel.Achievement;
-using System.Collections.ObjectModel;
 using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
+using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
 
+/// <summary>
+/// 成就服务
+/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Scoped, typeof(IAchievementService))]
@@ -24,127 +25,21 @@ internal sealed partial class AchievementService : IAchievementService
     private readonly RuntimeOptions runtimeOptions;
     private readonly ITaskContext taskContext;
 
-    private ObservableCollection<AchievementArchive>? archiveCollection;
-
-    public AchievementArchive? CurrentArchive
-    {
-        get => dbCurrent.Current;
-        set => dbCurrent.Current = value;
-    }
-
-    public ObservableCollection<AchievementArchive> ArchiveCollection
-    {
-        get
-        {
-            if (archiveCollection is null)
-            {
-                archiveCollection = achievementDbService.GetAchievementArchiveCollection();
-                CurrentArchive = archiveCollection.SelectedOrDefault();
-            }
-
-            return archiveCollection;
-        }
-    }
-
-    public List<AchievementView> GetAchievementViewList(AchievementArchive archive, AchievementServiceMetadataContext context)
+    /// <inheritdoc/>
+    public List<AchievementView> GetAchievementViewList(AchievementArchive archive, List<MetadataAchievement> metadata)
     {
         Dictionary<AchievementId, EntityAchievement> entities = achievementDbService.GetAchievementMapByArchiveId(archive.InnerId);
 
-        return context.Achievements.SelectList(meta =>
+        return metadata.SelectList(meta =>
         {
             EntityAchievement entity = entities.GetValueOrDefault(meta.Id) ?? EntityAchievement.From(archive.InnerId, meta.Id);
             return new AchievementView(entity, meta);
         });
     }
 
+    /// <inheritdoc/>
     public void SaveAchievement(AchievementView achievement)
     {
         achievementDbService.OverwriteAchievement(achievement.Entity);
     }
-
-    public async ValueTask<ArchiveAddResultKind> AddArchiveAsync(AchievementArchive newArchive)
-    {
-        if (string.IsNullOrWhiteSpace(newArchive.Name))
-        {
-            return ArchiveAddResultKind.InvalidName;
-        }
-
-        ArgumentNullException.ThrowIfNull(archiveCollection);
-
-        if (archiveCollection.Any(a => a.Name == newArchive.Name))
-        {
-            return ArchiveAddResultKind.AlreadyExists;
-        }
-
-        // Sync cache
-        await taskContext.SwitchToMainThreadAsync();
-        archiveCollection.Add(newArchive);
-
-        // Sync database
-        await taskContext.SwitchToBackgroundAsync();
-        CurrentArchive = newArchive;
-
-        return ArchiveAddResultKind.Added;
-    }
-
-    public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
-    {
-        ArgumentNullException.ThrowIfNull(archiveCollection);
-
-        // Sync cache
-        await taskContext.SwitchToMainThreadAsync();
-        archiveCollection.Remove(archive);
-
-        // Sync database
-        await taskContext.SwitchToBackgroundAsync();
-        await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
-    }
-
-    public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategyKind strategy)
-    {
-        await taskContext.SwitchToBackgroundAsync();
-
-        Guid archiveId = archive.InnerId;
-
-        switch (strategy)
-        {
-            case ImportStrategyKind.AggressiveMerge:
-                {
-                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
-                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
-                }
-
-            case ImportStrategyKind.LazyMerge:
-                {
-                    IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
-                    return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
-                }
-
-            case ImportStrategyKind.Overwrite:
-                {
-                    IEnumerable<EntityAchievement> orederedUIAF = list
-                        .SelectList(uiaf => EntityAchievement.From(archiveId, uiaf))
-                        .SortBy(a => a.Id);
-                    return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
-                }
-
-            default:
-                throw HutaoException.NotSupported();
-        }
-    }
-
-    public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
-    {
-        await taskContext.SwitchToBackgroundAsync();
-        List<EntityAchievement> entities = await achievementDbService
-            .GetAchievementListByArchiveIdAsync(archive.InnerId)
-            .ConfigureAwait(false);
-        List<UIAFItem> list = entities.SelectList(UIAFItem.From);
-
-        return new()
-        {
-            Info = UIAFInfo.From(runtimeOptions),
-            List = list,
-        };
-    }
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementServiceMetadataContext.cs

@@ -1,17 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
-using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
-
-namespace Snap.Hutao.Service.Achievement;
-
-internal sealed class AchievementServiceMetadataContext : IMetadataContext,
-    IMetadataListAchievementSource,
-    IMetadataDictionaryIdAchievementSource
-{
-    public List<MetadataAchievement> Achievements { get; set; } = default!;
-
-    public Dictionary<AchievementId, MetadataAchievement> IdAchievementMap { get; set; } = default!;
-}

src/Snap.Hutao/Snap.Hutao/Service/Achievement/AchievementStatisticsService.cs

@@ -13,34 +13,32 @@ namespace Snap.Hutao.Service.Achievement;
 [Injection(InjectAs.Scoped, typeof(IAchievementStatisticsService))]
 internal sealed partial class AchievementStatisticsService : IAchievementStatisticsService
 {
-    private const int AchievementCardTakeCount = 2;
-
     private readonly IAchievementDbService achievementDbService;
     private readonly ITaskContext taskContext;
 
     /// <inheritdoc/>
-    public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default)
+    public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap)
     {
         await taskContext.SwitchToBackgroundAsync();
 
         List<AchievementStatistics> results = [];
-        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync(token).ConfigureAwait(false))
+        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync().ConfigureAwait(false))
         {
             int finishedCount = await achievementDbService
-                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId, token)
+                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId)
                 .ConfigureAwait(false);
 
-            int totalCount = context.IdAchievementMap.Count;
+            int totalCount = achievementMap.Count;
 
             List<EntityAchievement> achievements = await achievementDbService
-                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, AchievementCardTakeCount, token)
+                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, 2)
                 .ConfigureAwait(false);
 
             results.Add(new()
             {
                 DisplayName = archive.Name,
                 FinishDescription = AchievementStatistics.Format(finishedCount, totalCount, out _),
-                Achievements = achievements.SelectList(entity => new AchievementView(entity, context.IdAchievementMap[entity.Id])),
+                Achievements = achievements.SelectList(entity => new AchievementView(entity, achievementMap[entity.Id])),
             });
         }
 

src/Snap.Hutao/Snap.Hutao/Service/Achievement/ArchiveAddResult.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
 /// 存档添加结果
 /// </summary>
 [HighQuality]
-internal enum ArchiveAddResultKind
+internal enum ArchiveAddResult
 {
     /// <summary>
     /// 添加成功

src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementDbService.cs

@@ -2,33 +2,32 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Abstraction;
 using System.Collections.ObjectModel;
 using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
 
 namespace Snap.Hutao.Service.Achievement;
 
-internal interface IAchievementDbService : IAppDbService<Model.Entity.AchievementArchive>, IAppDbService<EntityAchievement>
+internal interface IAchievementDbService
 {
-    ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive, CancellationToken token = default);
+    ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive);
 
     ObservableCollection<Model.Entity.AchievementArchive> GetAchievementArchiveCollection();
 
     List<Model.Entity.AchievementArchive> GetAchievementArchiveList();
 
-    ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default);
+    ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync();
 
     List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId);
 
-    ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
+    ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId);
 
     Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId);
 
-    ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
+    ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId);
 
-    ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default);
+    ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take);
 
     void OverwriteAchievement(EntityAchievement achievement);
 
-    ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default);
+    ValueTask OverwriteAchievementAsync(EntityAchievement achievement);
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementService.cs

@@ -32,7 +32,13 @@ internal interface IAchievementService
     /// <returns>UIAF</returns>
     ValueTask<UIAF> ExportToUIAFAsync(EntityArchive selectedArchive);
 
-    List<AchievementView> GetAchievementViewList(EntityArchive archive, AchievementServiceMetadataContext context);
+    /// <summary>
+    /// 获取整合的成就
+    /// </summary>
+    /// <param name="archive">用户</param>
+    /// <param name="metadata">元数据</param>
+    /// <returns>整合的成就</returns>
+    List<AchievementView> GetAchievementViewList(EntityArchive archive, List<MetadataAchievement> metadata);
 
     /// <summary>
     /// 异步导入UIAF数据
@@ -41,7 +47,7 @@ internal interface IAchievementService
     /// <param name="list">UIAF数据</param>
     /// <param name="strategy">选项</param>
     /// <returns>导入结果</returns>
-    ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategyKind strategy);
+    ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategy strategy);
 
     /// <summary>
     /// 异步移除存档
@@ -61,5 +67,5 @@ internal interface IAchievementService
     /// </summary>
     /// <param name="newArchive">新存档</param>
     /// <returns>存档添加结果</returns>
-    ValueTask<ArchiveAddResultKind> AddArchiveAsync(EntityArchive newArchive);
+    ValueTask<ArchiveAddResult> AddArchiveAsync(EntityArchive newArchive);
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/IAchievementStatisticsService.cs

@@ -9,5 +9,5 @@ namespace Snap.Hutao.Service.Achievement;
 
 internal interface IAchievementStatisticsService
 {
-    ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default);
+    ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap);
 }

src/Snap.Hutao/Snap.Hutao/Service/Achievement/ImportStrategy.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
 /// 导入策略
 /// </summary>
 [HighQuality]
-internal enum ImportStrategyKind
+internal enum ImportStrategy
 {
     /// <summary>
     /// 贪婪合并

src/Snap.Hutao/Snap.Hutao/Service/AnnouncementService.cs

@@ -3,29 +3,29 @@
 
 using Microsoft.Extensions.Caching.Memory;
 using Snap.Hutao.Core;
-using Snap.Hutao.Service.Announcement;
+using Snap.Hutao.Service.Abstraction;
 using Snap.Hutao.Web.Hoyolab;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
 using Snap.Hutao.Web.Response;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
-using WebAnnouncement = Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement.Announcement;
 
 namespace Snap.Hutao.Service;
 
 /// <inheritdoc/>
 [HighQuality]
 [ConstructorGenerated]
-[Injection(InjectAs.Scoped, typeof(IAnnouncementService))]
+[Injection(InjectAs.Transient, typeof(IAnnouncementService))]
 internal sealed partial class AnnouncementService : IAnnouncementService
 {
     private static readonly string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
 
-    private readonly IServiceScopeFactory serviceScopeFactory;
+    private readonly AnnouncementClient announcementClient;
     private readonly ITaskContext taskContext;
     private readonly IMemoryCache memoryCache;
 
+    /// <inheritdoc/>
     public async ValueTask<AnnouncementWrapper> GetAnnouncementWrapperAsync(string languageCode, Region region, CancellationToken cancellationToken = default)
     {
         // 缓存中存在记录，直接返回
@@ -35,37 +35,29 @@ internal sealed partial class AnnouncementService : IAnnouncementService
         }
 
         await taskContext.SwitchToBackgroundAsync();
+        Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
+            .GetAnnouncementsAsync(languageCode, region, cancellationToken)
+            .ConfigureAwait(false);
 
-        List<AnnouncementContent>? contents;
-        AnnouncementWrapper wrapper;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
+        if (!announcementWrapperResponse.IsOk())
         {
-            AnnouncementClient announcementClient = scope.ServiceProvider.GetRequiredService<AnnouncementClient>();
-
-            Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
-                .GetAnnouncementsAsync(languageCode, region, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (!announcementWrapperResponse.IsOk())
-            {
-                return default!;
-            }
-
-            wrapper = announcementWrapperResponse.Data;
-
-            Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
-                .GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (!announcementContentResponse.IsOk())
-            {
-                return default!;
-            }
-
-            contents = announcementContentResponse.Data.List;
+            return default!;
         }
 
-        Dictionary<int, string> contentMap = contents.ToDictionary(id => id.AnnId, content => content.Content);
+        AnnouncementWrapper wrapper = announcementWrapperResponse.Data;
+        Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
+            .GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
+            .ConfigureAwait(false);
+
+        if (!announcementContentResponse.IsOk())
+        {
+            return default!;
+        }
+
+        List<AnnouncementContent> contents = announcementContentResponse.Data.List;
+
+        Dictionary<int, string> contentMap = contents
+            .ToDictionary(id => id.AnnId, content => content.Content);
 
         // 将活动公告置于前方
         wrapper.List.Reverse();
@@ -80,9 +72,10 @@ internal sealed partial class AnnouncementService : IAnnouncementService
         // 将公告内容联入公告列表
         foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
         {
-            foreach (ref readonly WebAnnouncement item in CollectionsMarshal.AsSpan(listWrapper.List))
+            foreach (ref readonly Announcement item in CollectionsMarshal.AsSpan(listWrapper.List))
             {
-                item.Content = contentMap.GetValueOrDefault(item.AnnId, string.Empty);
+                contentMap.TryGetValue(item.AnnId, out string? rawContent);
+                item.Content = rawContent ?? string.Empty;
             }
         }
 
@@ -90,7 +83,7 @@ internal sealed partial class AnnouncementService : IAnnouncementService
 
         foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
         {
-            foreach (ref readonly WebAnnouncement item in CollectionsMarshal.AsSpan(listWrapper.List))
+            foreach (ref readonly Announcement item in CollectionsMarshal.AsSpan(listWrapper.List))
             {
                 item.Subtitle = new StringBuilder(item.Subtitle)
                     .Replace("\r<br>", string.Empty)
@@ -106,12 +99,12 @@ internal sealed partial class AnnouncementService : IAnnouncementService
     private static void AdjustAnnouncementTime(List<AnnouncementListWrapper> announcementListWrappers, in TimeSpan offset)
     {
         // 活动公告
-        List<WebAnnouncement> activities = announcementListWrappers
+        List<Announcement> activities = announcementListWrappers
             .Single(wrapper => wrapper.TypeId == 1)
             .List;
 
         // 更新公告
-        WebAnnouncement versionUpdate = announcementListWrappers
+        Announcement versionUpdate = announcementListWrappers
             .Single(wrapper => wrapper.TypeId == 2)
             .List
             .Single(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title));
@@ -123,7 +116,7 @@ internal sealed partial class AnnouncementService : IAnnouncementService
 
         DateTimeOffset versionUpdateTime = UnsafeDateTimeOffset.ParseDateTime(versionMatch.Groups[1].ValueSpan, offset);
 
-        foreach (ref readonly WebAnnouncement announcement in CollectionsMarshal.AsSpan(activities))
+        foreach (ref readonly Announcement announcement in CollectionsMarshal.AsSpan(activities))
         {
             if (AnnouncementRegex.PermanentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } permanent)
             {

src/Snap.Hutao/Snap.Hutao/Service/AppOptions.cs

@@ -16,7 +16,6 @@ namespace Snap.Hutao.Service;
 internal sealed partial class AppOptions : DbStoreOptions
 {
     private bool? isEmptyHistoryWishVisible;
-    private bool? isUnobtainedWishItemVisible;
     private BackdropType? backdropType;
     private ElementTheme? elementTheme;
     private BackgroundImageType? backgroundImageType;
@@ -25,16 +24,10 @@ internal sealed partial class AppOptions : DbStoreOptions
 
     public bool IsEmptyHistoryWishVisible
     {
-        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, false);
+        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible);
         set => SetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, value);
     }
 
-    public bool IsUnobtainedWishItemVisible
-    {
-        get => GetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, false);
-        set => SetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, value);
-    }
-
     public List<NameValue<BackdropType>> BackdropTypes { get; } = CollectionsNameValue.FromEnum<BackdropType>(type => type >= 0);
 
     public BackdropType BackdropType

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/AvatarInfoService.cs

@@ -13,6 +13,9 @@ using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
 
+/// <summary>
+/// 角色信息服务
+/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Scoped, typeof(IAvatarInfoService))]
@@ -20,11 +23,12 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService
 {
     private readonly AvatarInfoDbBulkOperation avatarInfoDbBulkOperation;
     private readonly IAvatarInfoDbService avatarInfoDbService;
-    private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly ILogger<AvatarInfoService> logger;
     private readonly IMetadataService metadataService;
     private readonly ISummaryFactory summaryFactory;
+    private readonly EnkaClient enkaClient;
 
+    /// <inheritdoc/>
     public async ValueTask<ValueResult<RefreshResult, Summary?>> GetSummaryAsync(UserAndUid userAndUid, RefreshOption refreshOption, CancellationToken token = default)
     {
         if (await metadataService.InitializeAsync().ConfigureAwait(false))
@@ -88,13 +92,8 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService
 
     private async ValueTask<EnkaResponse?> GetEnkaResponseAsync(PlayerUid uid, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            EnkaClient enkaClient = scope.ServiceProvider.GetRequiredService<EnkaClient>();
-
-            return await enkaClient.GetForwardDataAsync(uid, token).ConfigureAwait(false)
-                ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false);
-        }
+        return await enkaClient.GetForwardDataAsync(uid, token).ConfigureAwait(false)
+            ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false);
     }
 
     private async ValueTask<Summary> GetSummaryCoreAsync(IEnumerable<EntityAvatarInfo> avatarInfos, CancellationToken token)

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/AvatarViewBuilder.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal sealed class AvatarViewBuilder : IAvatarViewBuilder
-{
-    public ViewModel.AvatarProperty.AvatarView AvatarView { get; } = new();
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/AvatarViewBuilderExtension.cs

@@ -1,260 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction.Extension;
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Avatar;
-using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.AvatarProperty;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal static class AvatarViewBuilderExtension
-{
-    public static TBuilder ApplyCostumeIconOrDefault<TBuilder>(this TBuilder builder, Web.Enka.Model.AvatarInfo avatarInfo, Avatar avatar)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (avatarInfo.CostumeId.TryGetValue(out CostumeId id))
-        {
-            Costume costume = avatar.Costumes.Single(c => c.Id == id);
-
-            // Set to costume icon
-            builder.AvatarView.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
-            builder.AvatarView.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
-        }
-        else
-        {
-            builder.AvatarView.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
-            builder.AvatarView.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetCalculatorRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetCalculatorRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetCalculatorRefreshTimeFormat<TBuilder>(this TBuilder builder, string calculatorRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.CalculatorRefreshTimeFormat = calculatorRefreshTimeFormat);
-    }
-
-    public static TBuilder SetConstellations<TBuilder>(this TBuilder builder, List<Skill> talents, List<SkillId>? talentIds)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetConstellations(CreateConstellations(talents, talentIds.EmptyIfNull()));
-
-        static List<ConstellationView> CreateConstellations(List<Skill> talents, List<SkillId> talentIds)
-        {
-            // TODO: use builder here
-            return talents.SelectList(talent => new ViewModel.AvatarProperty.ConstellationView()
-            {
-                Name = talent.Name,
-                Icon = SkillIconConverter.IconNameToUri(talent.Icon),
-                Description = talent.Description,
-                IsActivated = talentIds.Contains(talent.Id),
-            });
-        }
-    }
-
-    public static TBuilder SetConstellations<TBuilder>(this TBuilder builder, List<ConstellationView> constellations)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Constellations = constellations);
-    }
-
-    public static TBuilder SetCritScore<TBuilder>(this TBuilder builder, Dictionary<FightProperty, float>? fightPropMap)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetCritScore(ScoreCrit(fightPropMap));
-
-        static float ScoreCrit(Dictionary<FightProperty, float>? fightPropMap)
-        {
-            if (fightPropMap.IsNullOrEmpty())
-            {
-                return 0F;
-            }
-
-            float cr = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL];
-            float cd = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL_HURT];
-
-            return 100 * ((cr * 2) + cd);
-        }
-    }
-
-    public static TBuilder SetCritScore<TBuilder>(this TBuilder builder, float critScore)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetCritScore($"{critScore:F2}");
-    }
-
-    public static TBuilder SetCritScore<TBuilder>(this TBuilder builder, string critScore)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.CritScore = critScore);
-    }
-
-    public static TBuilder SetElement<TBuilder>(this TBuilder builder, ElementType element)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Element = element);
-    }
-
-    public static TBuilder SetFetterLevel<TBuilder>(this TBuilder builder, FetterLevel? level)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (level.TryGetValue(out FetterLevel value))
-        {
-            return builder.Configure(b => b.AvatarView.FetterLevel = value);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetFetterLevel<TBuilder>(this TBuilder builder, uint level)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.FetterLevel = level);
-    }
-
-    public static TBuilder SetGameRecordRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetGameRecordRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetGameRecordRefreshTimeFormat<TBuilder>(this TBuilder builder, string gameRecordRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.GameRecordRefreshTimeFormat = gameRecordRefreshTimeFormat);
-    }
-
-    public static TBuilder SetId<TBuilder>(this TBuilder builder, AvatarId id)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Id = id);
-    }
-
-    public static TBuilder SetLevelNumber<TBuilder>(this TBuilder builder, uint? levelNumber)
-        where TBuilder : IAvatarViewBuilder
-    {
-        if (levelNumber.TryGetValue(out uint value))
-        {
-            return builder.Configure(b => b.AvatarView.LevelNumber = value);
-        }
-
-        return builder;
-    }
-
-    public static TBuilder SetName<TBuilder>(this TBuilder builder, string name)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Name = name);
-    }
-
-    public static TBuilder SetNameCard<TBuilder>(this TBuilder builder, Uri nameCard)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.NameCard = nameCard);
-    }
-
-    public static TBuilder SetProperties<TBuilder>(this TBuilder builder, List<AvatarProperty> properties)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Properties = properties);
-    }
-
-    public static TBuilder SetQuality<TBuilder>(this TBuilder builder, QualityType quality)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Quality = quality);
-    }
-
-    public static TBuilder SetReliquaries<TBuilder>(this TBuilder builder, List<ReliquaryView> reliquaries)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Reliquaries = reliquaries);
-    }
-
-    public static TBuilder SetScore<TBuilder>(this TBuilder builder, float score)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetScore($"{score:F2}");
-    }
-
-    public static TBuilder SetScore<TBuilder>(this TBuilder builder, string score)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Score = score);
-    }
-
-    public static TBuilder SetShowcaseRefreshTimeFormat<TBuilder>(this TBuilder builder, DateTimeOffset refreshTime, Func<object?, string> format, string defaultValue)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetShowcaseRefreshTimeFormat(refreshTime == DateTimeOffsetExtension.DatebaseDefaultTime ? defaultValue : format(refreshTime.ToLocalTime()));
-    }
-
-    public static TBuilder SetShowcaseRefreshTimeFormat<TBuilder>(this TBuilder builder, string showcaseRefreshTimeFormat)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.ShowcaseRefreshTimeFormat = showcaseRefreshTimeFormat);
-    }
-
-    public static TBuilder SetSkills<TBuilder>(this TBuilder builder, Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.SetSkills(CreateSkills(skillLevelMap, proudSkillExtraLevelMap, proudSkills));
-
-        static List<SkillView> CreateSkills(Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
-        {
-            if (skillLevelMap.IsNullOrEmpty())
-            {
-                return [];
-            }
-
-            Dictionary<SkillId, SkillLevel> skillExtraLeveledMap = new(skillLevelMap);
-
-            if (proudSkillExtraLevelMap is not null)
-            {
-                foreach ((SkillGroupId groupId, SkillLevel extraLevel) in proudSkillExtraLevelMap)
-                {
-                    skillExtraLeveledMap.IncreaseValue(proudSkills.Single(p => p.GroupId == groupId).Id, extraLevel);
-                }
-            }
-
-            return proudSkills.SelectList(proudableSkill =>
-            {
-                SkillId skillId = proudableSkill.Id;
-
-                // TODO: use builder here
-                return new SkillView()
-                {
-                    Name = proudableSkill.Name,
-                    Icon = SkillIconConverter.IconNameToUri(proudableSkill.Icon),
-                    Description = proudableSkill.Description,
-
-                    GroupId = proudableSkill.GroupId,
-                    LevelNumber = skillLevelMap[skillId],
-                    Info = DescriptionsParametersDescriptor.Convert(proudableSkill.Proud, skillExtraLeveledMap[skillId]),
-                };
-            });
-        }
-    }
-
-    public static TBuilder SetSkills<TBuilder>(this TBuilder builder, List<SkillView> skills)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Skills = skills);
-    }
-
-    public static TBuilder SetWeapon<TBuilder>(this TBuilder builder, WeaponView? weapon)
-        where TBuilder : IAvatarViewBuilder
-    {
-        return builder.Configure(b => b.AvatarView.Weapon = weapon);
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/Builder/IAvatarViewBuilder.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Core.Abstraction;
-
-namespace Snap.Hutao.Service.AvatarInfo.Factory.Builder;
-
-internal interface IAvatarViewBuilder : IBuilder
-{
-    ViewModel.AvatarProperty.AvatarView AvatarView { get; }
-}

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/ISummaryFactory.cs

@@ -5,8 +5,17 @@ using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 简述工厂
+/// </summary>
 [HighQuality]
 internal interface ISummaryFactory
 {
+    /// <summary>
+    /// 异步创建简述对象
+    /// </summary>
+    /// <param name="avatarInfos">角色列表</param>
+    /// <param name="token">取消令牌</param>
+    /// <returns>简述对象</returns>
     ValueTask<Summary> CreateAsync(IEnumerable<Model.Entity.AvatarInfo> avatarInfos, CancellationToken token);
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryAvatarFactory.cs

@@ -5,9 +5,8 @@ using Snap.Hutao.Model;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Intrinsic.Format;
 using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Service.AvatarInfo.Factory.Builder;
+using Snap.Hutao.Model.Primitive;
 using Snap.Hutao.Web.Enka.Model;
-using System.Runtime.InteropServices;
 using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar;
 using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon;
@@ -18,6 +17,9 @@ using PropertyWeapon = Snap.Hutao.ViewModel.AvatarProperty.WeaponView;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 单个角色工厂
+/// </summary>
 [HighQuality]
 internal sealed class SummaryAvatarFactory
 {
@@ -25,11 +27,16 @@ internal sealed class SummaryAvatarFactory
     private readonly DateTimeOffset showcaseRefreshTime;
     private readonly DateTimeOffset gameRecordRefreshTime;
     private readonly DateTimeOffset calculatorRefreshTime;
-    private readonly SummaryFactoryMetadataContext context;
+    private readonly SummaryMetadataContext metadataContext;
 
-    public SummaryAvatarFactory(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
+    /// <summary>
+    /// 构造一个新的角色工厂
+    /// </summary>
+    /// <param name="metadataContext">元数据上下文</param>
+    /// <param name="avatarInfo">角色信息</param>
+    public SummaryAvatarFactory(SummaryMetadataContext metadataContext, EntityAvatarInfo avatarInfo)
     {
-        this.context = context;
+        this.metadataContext = metadataContext;
         this.avatarInfo = avatarInfo.Info;
 
         showcaseRefreshTime = avatarInfo.ShowcaseRefreshTime;
@@ -37,51 +44,84 @@ internal sealed class SummaryAvatarFactory
         calculatorRefreshTime = avatarInfo.CalculatorRefreshTime;
     }
 
-    public static PropertyAvatar Create(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
-    {
-        return new SummaryAvatarFactory(context, avatarInfo).Create();
-    }
-
+    /// <summary>
+    /// 创建角色
+    /// </summary>
+    /// <returns>角色</returns>
     public PropertyAvatar Create()
     {
         ReliquaryAndWeapon reliquaryAndWeapon = ProcessEquip(avatarInfo.EquipList.EmptyIfNull());
-        MetadataAvatar avatar = context.IdAvatarMap[avatarInfo.AvatarId];
+        MetadataAvatar avatar = metadataContext.IdAvatarMap[avatarInfo.AvatarId];
 
-        PropertyAvatar propertyAvatar = new AvatarViewBuilder()
-            .SetId(avatar.Id)
-            .SetName(avatar.Name)
-            .SetQuality(avatar.Quality)
-            .SetNameCard(AvatarNameCardPicConverter.AvatarToUri(avatar))
-            .SetElement(ElementNameIconConverter.ElementNameToElementType(avatar.FetterInfo.VisionBefore))
-            .SetConstellations(avatar.SkillDepot.Talents, avatarInfo.TalentIdList)
-            .SetSkills(avatarInfo.SkillLevelMap, avatarInfo.ProudSkillExtraLevelMap, avatar.SkillDepot.CompositeSkillsNoInherents())
-            .SetFetterLevel(avatarInfo.FetterInfo?.ExpLevel)
-            .SetProperties(SummaryAvatarProperties.Create(avatarInfo.FightPropMap))
-            .SetCritScore(avatarInfo.FightPropMap)
-            .SetLevelNumber(avatarInfo.PropMap?[PlayerProperty.PROP_LEVEL].Value)
-            .SetWeapon(reliquaryAndWeapon.Weapon)
-            .SetReliquaries(reliquaryAndWeapon.Reliquaries)
-            .SetScore(reliquaryAndWeapon.Reliquaries.Sum(r => r.Score))
-            .SetShowcaseRefreshTimeFormat(showcaseRefreshTime, SH.FormatServiceAvatarInfoSummaryShowcaseRefreshTimeFormat, SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed)
-            .SetGameRecordRefreshTimeFormat(gameRecordRefreshTime, SH.FormatServiceAvatarInfoSummaryGameRecordRefreshTimeFormat, SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed)
-            .SetCalculatorRefreshTimeFormat(calculatorRefreshTime, SH.FormatServiceAvatarInfoSummaryCalculatorRefreshTimeFormat, SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed)
-            .ApplyCostumeIconOrDefault(avatarInfo, avatar)
-            .AvatarView;
+        PropertyAvatar propertyAvatar = new()
+        {
+            // metadata part
+            Id = avatar.Id,
+            Name = avatar.Name,
+            Quality = avatar.Quality,
+            NameCard = AvatarNameCardPicConverter.AvatarToUri(avatar),
+            Element = ElementNameIconConverter.ElementNameToElementType(avatar.FetterInfo.VisionBefore),
 
+            // webinfo & metadata mixed part
+            Constellations = SummaryHelper.CreateConstellations(avatar.SkillDepot.Talents, avatarInfo.TalentIdList),
+            Skills = SummaryHelper.CreateSkills(avatarInfo.SkillLevelMap, avatarInfo.ProudSkillExtraLevelMap, avatar.SkillDepot.CompositeSkillsNoInherents()),
+
+            // webinfo part
+            FetterLevel = avatarInfo.FetterInfo?.ExpLevel ?? 0U,
+            Properties = SummaryAvatarProperties.Create(avatarInfo.FightPropMap),
+            CritScore = $"{SummaryHelper.ScoreCrit(avatarInfo.FightPropMap):F2}",
+            LevelNumber = avatarInfo.PropMap?[PlayerProperty.PROP_LEVEL].Value ?? 0U,
+
+            // processed webinfo part
+            Weapon = reliquaryAndWeapon.Weapon,
+            Reliquaries = reliquaryAndWeapon.Reliquaries,
+            Score = $"{reliquaryAndWeapon.Reliquaries.Sum(r => r.Score):F2}",
+
+            // times
+            ShowcaseRefreshTimeFormat = showcaseRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryShowcaseNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryShowcaseRefreshTimeFormat(showcaseRefreshTime.ToLocalTime()),
+            GameRecordRefreshTimeFormat = gameRecordRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryGameRecordNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryGameRecordRefreshTimeFormat(gameRecordRefreshTime.ToLocalTime()),
+            CalculatorRefreshTimeFormat = calculatorRefreshTime == DateTimeOffsetExtension.DatebaseDefaultTime
+                ? SH.ServiceAvatarInfoSummaryCalculatorNotRefreshed
+                : SH.FormatServiceAvatarInfoSummaryCalculatorRefreshTimeFormat(calculatorRefreshTime.ToLocalTime()),
+        };
+
+        ApplyCostumeIconOrDefault(ref propertyAvatar, avatar);
         return propertyAvatar;
     }
 
+    private void ApplyCostumeIconOrDefault(ref PropertyAvatar propertyAvatar, MetadataAvatar avatar)
+    {
+        if (avatarInfo.CostumeId.TryGetValue(out CostumeId id))
+        {
+            Model.Metadata.Avatar.Costume costume = avatar.Costumes.Single(c => c.Id == id);
+
+            // Set to costume icon
+            propertyAvatar.Icon = AvatarIconConverter.IconNameToUri(costume.FrontIcon);
+            propertyAvatar.SideIcon = AvatarIconConverter.IconNameToUri(costume.SideIcon);
+        }
+        else
+        {
+            propertyAvatar.Icon = AvatarIconConverter.IconNameToUri(avatar.Icon);
+            propertyAvatar.SideIcon = AvatarIconConverter.IconNameToUri(avatar.SideIcon);
+        }
+    }
+
     private ReliquaryAndWeapon ProcessEquip(List<Equip> equipments)
     {
         List<PropertyReliquary> reliquaryList = [];
         PropertyWeapon? weapon = null;
 
-        foreach (ref readonly Equip equip in CollectionsMarshal.AsSpan(equipments))
+        foreach (Equip equip in equipments)
         {
             switch (equip.Flat.ItemType)
             {
                 case ItemType.ITEM_RELIQUARY:
-                    reliquaryList.Add(SummaryReliquaryFactory.Create(context, avatarInfo, equip));
+                    SummaryReliquaryFactory summaryReliquaryFactory = new(metadataContext, avatarInfo, equip);
+                    reliquaryList.Add(summaryReliquaryFactory.CreateReliquary());
                     break;
                 case ItemType.ITEM_WEAPON:
                     weapon = CreateWeapon(equip);
@@ -94,7 +134,7 @@ internal sealed class SummaryAvatarFactory
 
     private PropertyWeapon CreateWeapon(Equip equip)
     {
-        MetadataWeapon weapon = context.IdWeaponMap[equip.ItemId];
+        MetadataWeapon weapon = metadataContext.IdWeaponMap[equip.ItemId];
 
         // AffixMap can be null when it's a white weapon.
         ArgumentNullException.ThrowIfNull(equip.Weapon);
@@ -128,9 +168,7 @@ internal sealed class SummaryAvatarFactory
             // EquipBase
             Level = $"Lv.{equip.Weapon.Level.Value}",
             Quality = weapon.Quality,
-            MainProperty = mainStat is not null
-                ? FightPropertyFormat.ToNameValue(mainStat.AppendPropId, mainStat.StatValue)
-                : NameValueDefaults.String,
+            MainProperty = mainStat is not null ? FightPropertyFormat.ToNameValue(mainStat.AppendPropId, mainStat.StatValue) : NameValueDefaults.String,
 
             // Weapon
             Id = weapon.Id,

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Service.Metadata;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
@@ -21,18 +20,23 @@ internal sealed partial class SummaryFactory : ISummaryFactory
     /// <inheritdoc/>
     public async ValueTask<Summary> CreateAsync(IEnumerable<Model.Entity.AvatarInfo> avatarInfos, CancellationToken token)
     {
-        SummaryFactoryMetadataContext context = await metadataService
-            .GetContextAsync<SummaryFactoryMetadataContext>(token)
-            .ConfigureAwait(false);
+        SummaryMetadataContext metadataContext = new()
+        {
+            IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false),
+            IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false),
+            IdReliquaryAffixWeightMap = await metadataService.GetIdToReliquaryAffixWeightMapAsync(token).ConfigureAwait(false),
+            IdReliquaryMainAffixMap = await metadataService.GetIdToReliquaryMainPropertyMapAsync(token).ConfigureAwait(false),
+            IdReliquarySubAffixMap = await metadataService.GetIdToReliquarySubAffixMapAsync(token).ConfigureAwait(false),
+            ReliquaryLevels = await metadataService.GetReliquaryLevelListAsync(token).ConfigureAwait(false),
+            Reliquaries = await metadataService.GetReliquaryListAsync(token).ConfigureAwait(false),
+        };
 
         IOrderedEnumerable<AvatarView> avatars = avatarInfos
             .Where(a => !AvatarIds.IsPlayer(a.Info.AvatarId))
-            .Select(a => SummaryAvatarFactory.Create(context, a))
+            .Select(a => new SummaryAvatarFactory(metadataContext, a).Create())
             .OrderByDescending(a => a.LevelNumber)
-            .ThenByDescending(a => a.FetterLevel)
-            .ThenBy(a => a.Element);
+            .ThenBy(a => a.Name);
 
-        // TODO: thenby weapon type
         return new()
         {
             Avatars = [.. avatars],

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs

@@ -1,7 +1,11 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Model.Intrinsic;
+using Snap.Hutao.Model.Metadata.Avatar;
+using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Primitive;
+using Snap.Hutao.ViewModel.AvatarProperty;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
@@ -11,6 +15,66 @@ namespace Snap.Hutao.Service.AvatarInfo.Factory;
 [HighQuality]
 internal static class SummaryHelper
 {
+    /// <summary>
+    /// 创建命之座
+    /// </summary>
+    /// <param name="talents">全部命座</param>
+    /// <param name="talentIds">激活的命座列表</param>
+    /// <returns>命之座</returns>
+    public static List<ConstellationView> CreateConstellations(List<Skill> talents, List<SkillId>? talentIds)
+    {
+        talentIds ??= [];
+
+        return talents.SelectList(talent => new ConstellationView()
+        {
+            Name = talent.Name,
+            Icon = SkillIconConverter.IconNameToUri(talent.Icon),
+            Description = talent.Description,
+            IsActivated = talentIds.Contains(talent.Id),
+        });
+    }
+
+    /// <summary>
+    /// 创建技能组
+    /// </summary>
+    /// <param name="skillLevelMap">技能等级映射</param>
+    /// <param name="proudSkillExtraLevelMap">额外提升等级映射</param>
+    /// <param name="proudSkills">技能列表</param>
+    /// <returns>技能</returns>
+    public static List<SkillView> CreateSkills(Dictionary<SkillId, SkillLevel>? skillLevelMap, Dictionary<SkillGroupId, SkillLevel>? proudSkillExtraLevelMap, List<ProudableSkill> proudSkills)
+    {
+        if (skillLevelMap.IsNullOrEmpty())
+        {
+            return [];
+        }
+
+        Dictionary<SkillId, SkillLevel> skillExtraLeveledMap = new(skillLevelMap);
+
+        if (proudSkillExtraLevelMap is not null)
+        {
+            foreach ((SkillGroupId groupId, SkillLevel extraLevel) in proudSkillExtraLevelMap)
+            {
+                skillExtraLeveledMap.IncreaseValue(proudSkills.Single(p => p.GroupId == groupId).Id, extraLevel);
+            }
+        }
+
+        return proudSkills.SelectList(proudableSkill =>
+        {
+            SkillId skillId = proudableSkill.Id;
+
+            return new SkillView()
+            {
+                Name = proudableSkill.Name,
+                Icon = SkillIconConverter.IconNameToUri(proudableSkill.Icon),
+                Description = proudableSkill.Description,
+
+                GroupId = proudableSkill.GroupId,
+                LevelNumber = skillLevelMap[skillId],
+                Info = DescriptionsParametersDescriptor.Convert(proudableSkill.Proud, skillExtraLeveledMap[skillId]),
+            };
+        });
+    }
+
     /// <summary>
     /// 获取副属性对应的最大属性的Id
     /// </summary>
@@ -68,4 +132,22 @@ internal static class SummaryHelper
             _ => throw Must.NeverHappen($"Unexpected AppendId: {appendId.Value} Delta: {delta}"),
         };
     }
+
+    /// <summary>
+    /// 获取双爆评分
+    /// </summary>
+    /// <param name="fightPropMap">属性</param>
+    /// <returns>评分</returns>
+    public static float ScoreCrit(Dictionary<FightProperty, float>? fightPropMap)
+    {
+        if (fightPropMap.IsNullOrEmpty())
+        {
+            return 0F;
+        }
+
+        float cr = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL];
+        float cd = fightPropMap[FightProperty.FIGHT_PROP_CRITICAL_HURT];
+
+        return 100 * ((cr * 2) + cd);
+    }
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryMetadataContext.cs

@@ -4,33 +4,51 @@
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Metadata.Reliquary;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar;
 using MetadataReliquary = Snap.Hutao.Model.Metadata.Reliquary.Reliquary;
 using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
+/// <summary>
+/// 简述元数据上下文
+/// 包含了所有制造简述需要的元数据
+/// </summary>
 [HighQuality]
-internal sealed class SummaryFactoryMetadataContext : IMetadataContext,
-    IMetadataDictionaryIdAvatarSource,
-    IMetadataDictionaryIdWeaponSource,
-    IMetadataDictionaryIdReliquaryAffixWeightSource,
-    IMetadataDictionaryIdReliquaryMainPropertySource,
-    IMetadataDictionaryIdReliquarySubAffixSource,
-    IMetadataListReliquaryMainAffixLevelSource
+internal sealed class SummaryMetadataContext
 {
+    /// <summary>
+    /// 角色映射
+    /// </summary>
     public Dictionary<AvatarId, MetadataAvatar> IdAvatarMap { get; set; } = default!;
 
+    /// <summary>
+    /// 武器映射
+    /// </summary>
     public Dictionary<WeaponId, MetadataWeapon> IdWeaponMap { get; set; } = default!;
 
+    /// <summary>
+    /// 权重映射
+    /// </summary>
     public Dictionary<AvatarId, ReliquaryAffixWeight> IdReliquaryAffixWeightMap { get; set; } = default!;
 
-    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainPropertyMap { get; set; } = default!;
+    /// <summary>
+    /// 圣遗物主属性映射
+    /// </summary>
+    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainAffixMap { get; set; } = default!;
 
+    /// <summary>
+    /// 圣遗物副属性映射
+    /// </summary>
     public Dictionary<ReliquarySubAffixId, ReliquarySubAffix> IdReliquarySubAffixMap { get; set; } = default!;
 
-    public List<ReliquaryMainAffixLevel> ReliquaryMainAffixLevels { get; set; } = default!;
+    /// <summary>
+    /// 圣遗物等级
+    /// </summary>
+    public List<ReliquaryMainAffixLevel> ReliquaryLevels { get; set; } = default!;
 
+    /// <summary>
+    /// 圣遗物
+    /// </summary>
     public List<MetadataReliquary> Reliquaries { get; set; } = default!;
 }

src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs

@@ -19,23 +19,28 @@ namespace Snap.Hutao.Service.AvatarInfo.Factory;
 [HighQuality]
 internal sealed class SummaryReliquaryFactory
 {
-    private readonly SummaryFactoryMetadataContext metadataContext;
+    private readonly SummaryMetadataContext metadataContext;
     private readonly ModelAvatarInfo avatarInfo;
     private readonly Web.Enka.Model.Equip equip;
 
-    public SummaryReliquaryFactory(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
+    /// <summary>
+    /// 构造一个新的圣遗物工厂
+    /// </summary>
+    /// <param name="metadataContext">元数据上下文</param>
+    /// <param name="avatarInfo">角色信息</param>
+    /// <param name="equip">圣遗物</param>
+    public SummaryReliquaryFactory(SummaryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
     {
         this.metadataContext = metadataContext;
         this.avatarInfo = avatarInfo;
         this.equip = equip;
     }
 
-    public static ReliquaryView Create(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
-    {
-        return new SummaryReliquaryFactory(metadataContext, avatarInfo, equip).Create();
-    }
-
-    public ReliquaryView Create()
+    /// <summary>
+    /// 构造圣遗物
+    /// </summary>
+    /// <returns>圣遗物</returns>
+    public ReliquaryView CreateReliquary()
     {
         MetadataReliquary reliquary = metadataContext.Reliquaries.Single(r => r.Ids.Contains(equip.ItemId));
 
@@ -64,8 +69,8 @@ internal sealed class SummaryReliquaryFactory
             ArgumentNullException.ThrowIfNull(equip.Flat.ReliquarySubstats);
             result.ComposedSubProperties = CreateComposedSubProperties(equip.Reliquary.AppendPropIdList);
 
-            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryMainAffixLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
-            FightProperty property = metadataContext.IdReliquaryMainPropertyMap[equip.Reliquary.MainPropId];
+            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
+            FightProperty property = metadataContext.IdReliquaryMainAffixMap[equip.Reliquary.MainPropId];
 
             result.MainProperty = FightPropertyFormat.ToNameValue(property, relicLevel.PropertyMap[property]);
             result.Score = ScoreReliquary(property, reliquary, relicLevel, subProperty);
@@ -141,7 +146,7 @@ internal sealed class SummaryReliquaryFactory
             // 从喵插件抓取的圣遗物评分权重
             // 部分复杂的角色暂时使用了默认值
             ReliquaryAffixWeight affixWeight = metadataContext.IdReliquaryAffixWeightMap.GetValueOrDefault(avatarInfo.AvatarId, ReliquaryAffixWeight.Default);
-            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryMainAffixLevels.Where(r => r.Rank == reliquary.RankLevel).MaxBy(r => r.Level);
+            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryLevels.Where(r => r.Rank == reliquary.RankLevel).MaxBy(r => r.Level);
             ArgumentNullException.ThrowIfNull(maxRelicLevel);
 
             float percent = relicLevel.PropertyMap[property] / maxRelicLevel.PropertyMap[property];

src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs

@@ -46,17 +46,11 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
         {
             DailyNoteEntry newEntry = DailyNoteEntry.From(userAndUid);
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse;
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                IGameRecordClient gameRecordClient = scope.ServiceProvider
-                    .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                    .Create(PlayerUid.IsOversea(roleUid));
-
-                dailyNoteResponse = await gameRecordClient
-                    .GetDailyNoteAsync(userAndUid)
-                    .ConfigureAwait(false);
-            }
+            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
+                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
+                .Create(PlayerUid.IsOversea(roleUid))
+                .GetDailyNoteAsync(userAndUid)
+                .ConfigureAwait(false);
 
             if (dailyNoteResponse.IsOk())
             {
@@ -123,17 +117,11 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
                 continue;
             }
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse;
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                IGameRecordClient gameRecordClient = serviceProvider
-                    .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                    .Create(PlayerUid.IsOversea(entry.Uid));
-
-                dailyNoteResponse = await gameRecordClient
-                    .GetDailyNoteAsync(new(entry.User, entry.Uid))
-                    .ConfigureAwait(false);
-            }
+            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
+                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
+                .Create(PlayerUid.IsOversea(entry.Uid))
+                .GetDailyNoteAsync(new(entry.User, entry.Uid))
+                .ConfigureAwait(false);
 
             if (dailyNoteResponse.IsOk())
             {

src/Snap.Hutao/Snap.Hutao/Service/Discord/DiscordController.cs

@@ -4,7 +4,6 @@
 using Snap.Discord.GameSDK.ABI;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Text.Unicode;
 
 namespace Snap.Hutao.Service.Discord;
@@ -159,7 +158,7 @@ internal static class DiscordController
         static unsafe void DebugWriteDiscordMessage(void* state, DiscordLogLevel logLevel, sbyte* ptr)
         {
             ReadOnlySpan<byte> utf8 = MemoryMarshal.CreateReadOnlySpanFromNullTerminated((byte*)ptr);
-            string message = Encoding.UTF8.GetString(utf8);
+            string message = System.Text.Encoding.UTF8.GetString(utf8);
             System.Diagnostics.Debug.WriteLine($"[Discord.GameSDK]:[{logLevel}]:{message}");
         }
     }
@@ -225,18 +224,18 @@ internal static class DiscordController
         }
     }
 
-    private static unsafe void SetString(sbyte* reference, int length, in ReadOnlySpan<char> source)
+    private static unsafe void SetString(sbyte* reference, int length, string source)
     {
-        Span<byte> bytes = new(reference, length);
-        bytes.Clear();
-        Utf8.FromUtf16(source, bytes, out _, out _);
+        Span<sbyte> sbytes = new(reference, length);
+        sbytes.Clear();
+        Utf8.FromUtf16(source.AsSpan(), MemoryMarshal.Cast<sbyte, byte>(sbytes), out _, out _);
     }
 
     private static unsafe void SetString(sbyte* reference, int length, in ReadOnlySpan<byte> source)
     {
-        Span<byte> bytes = new(reference, length);
-        bytes.Clear();
-        source.CopyTo(bytes);
+        Span<sbyte> sbytes = new(reference, length);
+        sbytes.Clear();
+        source.CopyTo(MemoryMarshal.Cast<sbyte, byte>(sbytes));
     }
 
     private struct DiscordAsyncAction

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/Factory/GachaStatisticsFactory.cs

@@ -3,7 +3,6 @@
 
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Weapon;
 using Snap.Hutao.Service.Metadata;
@@ -11,7 +10,6 @@ using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.GachaLog;
 using Snap.Hutao.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using Snap.Hutao.Web.Hutao.GachaLog;
-using System.Collections.Frozen;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Service.GachaLog.Factory;
@@ -24,24 +22,7 @@ namespace Snap.Hutao.Service.GachaLog.Factory;
 [Injection(InjectAs.Scoped, typeof(IGachaStatisticsFactory))]
 internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
 {
-    private static readonly FrozenSet<uint> BlueStandardWeaponIdsSet = FrozenSet.ToFrozenSet(
-    [
-        11301U, 11302U, 11306U,
-        12301U, 12302U, 12305U,
-        13303U,
-        14301U, 14302U, 14304U,
-        15301U, 15302U, 15304U
-    ]);
-
-    private static readonly FrozenSet<uint> PurpleStandardWeaponIdsSet = FrozenSet.ToFrozenSet(
-    [
-        11401U, 11402U, 11403U, 11405U,
-        12401U, 12402U, 12403U, 12405U,
-        13401U, 13407U,
-        14401U, 14402U, 14403U, 14409U,
-        15401U, 15402U, 15403U, 15405U
-    ]);
-
+    private readonly IMetadataService metadataService;
     private readonly HomaGachaLogClient homaGachaLogClient;
     private readonly ITaskContext taskContext;
     private readonly AppOptions options;
@@ -52,7 +33,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         await taskContext.SwitchToBackgroundAsync();
 
         List<HistoryWishBuilder> historyWishBuilders = context.GachaEvents.SelectList(gachaEvent => new HistoryWishBuilder(gachaEvent, context));
-        return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options);
+        return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options.IsEmptyHistoryWishVisible);
     }
 
     private static GachaStatistics CreateCore(
@@ -61,7 +42,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         List<Model.Entity.GachaItem> items,
         List<HistoryWishBuilder> historyWishBuilders,
         in GachaLogServiceMetadataContext context,
-        AppOptions appOptions)
+        bool isEmptyHistoryWishVisible)
     {
         TypedWishSummaryBuilderContext standardContext = TypedWishSummaryBuilderContext.StandardWish(taskContext, gachaLogClient);
         TypedWishSummaryBuilder standardWishBuilder = new(standardContext);
@@ -81,45 +62,6 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         Dictionary<Weapon, int> purpleWeaponCounter = [];
         Dictionary<Weapon, int> blueWeaponCounter = [];
 
-        if (appOptions.IsUnobtainedWishItemVisible)
-        {
-            orangeAvatarCounter = context.IdAvatarMap.Values
-                .Where(avatar => avatar.Quality == QualityType.QUALITY_ORANGE)
-                .ToDictionary(avatar => avatar, _ => 0);
-            purpleAvatarCounter = context.IdAvatarMap.Values
-               .Where(avatar => avatar.Quality == QualityType.QUALITY_PURPLE)
-               .ToDictionary(avatar => avatar, _ => 0);
-            orangeWeaponCounter = context.IdWeaponMap.Values
-               .Where(weapon => weapon.Quality == QualityType.QUALITY_ORANGE)
-               .ToDictionary(weapon => weapon, _ => 0);
-
-            HashSet<Weapon> purpleWeapons = [];
-            foreach (uint weaponId in PurpleStandardWeaponIdsSet)
-            {
-                purpleWeapons.Add(context.IdWeaponMap[weaponId]);
-            }
-
-            foreach (GachaEvent gachaEvent in context.GachaEvents)
-            {
-                if (gachaEvent.Type is GachaType.ActivityWeapon)
-                {
-                    foreach (uint weaponId in gachaEvent.UpPurpleList)
-                    {
-                        purpleWeapons.Add(context.IdWeaponMap[weaponId]);
-                    }
-                }
-            }
-
-            HashSet<Weapon> blueWeapons = [];
-            foreach (uint weaponId in BlueStandardWeaponIdsSet)
-            {
-                blueWeapons.Add(context.IdWeaponMap[weaponId]);
-            }
-
-            purpleWeaponCounter = purpleWeapons.ToDictionary(weapon => weapon, _ => 0);
-            blueWeaponCounter = blueWeapons.ToDictionary(weapon => weapon, _ => 0);
-        }
-
         // Pre group builders
         Dictionary<GachaType, List<HistoryWishBuilder>> historyWishBuilderMap = historyWishBuilders
             .GroupBy(b => b.ConfigType)
@@ -206,7 +148,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         {
             // history
             HistoryWishes = historyWishBuilders
-                .Where(b => appOptions.IsEmptyHistoryWishVisible || (!b.IsEmpty))
+                .Where(b => isEmptyHistoryWishVisible || (!b.IsEmpty))
                 .OrderByDescending(builder => builder.From)
                 .ThenBy(builder => builder.ConfigType, GachaTypeComparer.Shared)
                 .Select(builder => builder.ToHistoryWish())

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsAddress.cs

@@ -19,12 +19,12 @@ internal static class GameFpsAddress
     public static unsafe void UnsafeFindFpsAddress(GameFpsUnlockerContext state, in RequiredGameModule requiredGameModule)
     {
         bool readOk = UnsafeReadModulesMemory(state.GameProcess, requiredGameModule, out VirtualMemory localMemory);
-        HutaoException.ThrowIfNot(readOk, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
+        HutaoException.ThrowIfNot(readOk, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
 
         using (localMemory)
         {
             int offset = IndexOfPattern(localMemory.AsSpan()[(int)requiredGameModule.UnityPlayer.Size..]);
-            HutaoException.ThrowIfNot(offset >= 0, SH.ServiceGameUnlockerInterestedPatternNotFound);
+            HutaoException.ThrowIfNot(offset >= 0, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerInterestedPatternNotFound);
 
             byte* pLocalMemory = (byte*)localMemory.Pointer;
             ref readonly Module unityPlayer = ref requiredGameModule.UnityPlayer;
@@ -76,7 +76,7 @@ internal static class GameFpsAddress
     {
         value = 0;
         bool result = ReadProcessMemory((HANDLE)process.Handle, (void*)baseAddress, ref value, out _);
-        HutaoException.ThrowIfNot(result, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
+        HutaoException.ThrowIfNot(result, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
         return result;
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Game/Unlocker/GameFpsUnlocker.cs

@@ -30,10 +30,10 @@ internal sealed class GameFpsUnlocker : IGameFpsUnlocker
     /// <inheritdoc/>
     public async ValueTask<bool> UnlockAsync(CancellationToken token = default)
     {
-        HutaoException.ThrowIfNot(context.IsUnlockerValid, "This Unlocker is invalid");
+        HutaoException.ThrowIfNot(context.IsUnlockerValid, HutaoExceptionKind.GameFpsUnlockingFailed, "This Unlocker is invalid");
         (FindModuleResult result, RequiredGameModule gameModule) = await GameProcessModule.FindModuleAsync(context).ConfigureAwait(false);
-        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
-        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, SH.ServiceGameUnlockerFindModuleNoModuleFound);
+        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
+        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleNoModuleFound);
 
         GameFpsAddress.UnsafeFindFpsAddress(context, gameModule);
         context.Report();

src/Snap.Hutao/Snap.Hutao/Service/Hutao/IHutaoAsAService.cs

@@ -1,11 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Web.Hutao.HutaoAsAService;
 using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Hutao;
 
 internal interface IHutaoAsAService
 {
-    ValueTask<ObservableCollection<Web.Hutao.HutaoAsAService.Announcement>> GetHutaoAnnouncementCollectionAsync(CancellationToken token = default);
+    ValueTask<ObservableCollection<Announcement>> GetHutaoAnnouncementCollectionAsync(CancellationToken token = default);
 }

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdAchievementSource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdAchievementSource
-{
-    public Dictionary<AchievementId, Model.Metadata.Achievement.Achievement> IdAchievementMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquaryAffixWeightSource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquaryAffixWeightSource
-{
-    public Dictionary<AvatarId, ReliquaryAffixWeight> IdReliquaryAffixWeightMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquaryMainPropertySource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquaryMainPropertySource
-{
-    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainPropertyMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataDictionaryIdReliquarySubAffixSource.cs

@@ -1,12 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataDictionaryIdReliquarySubAffixSource
-{
-    public Dictionary<ReliquarySubAffixId, ReliquarySubAffix> IdReliquarySubAffixMap { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListAchievementSource.cs

@@ -1,9 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListAchievementSource
-{
-    public List<Model.Metadata.Achievement.Achievement> Achievements { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListReliquaryMainAffixLevelSource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListReliquaryMainAffixLevelSource
-{
-    public List<ReliquaryMainAffixLevel> ReliquaryMainAffixLevels { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/IMetadataListReliquarySource.cs

@@ -1,11 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Metadata.Reliquary;
-
-namespace Snap.Hutao.Service.Metadata.ContextAbstraction;
-
-internal interface IMetadataListReliquarySource
-{
-    public List<Reliquary> Reliquaries { get; set; }
-}

src/Snap.Hutao/Snap.Hutao/Service/Metadata/ContextAbstraction/MetadataServiceContextExtension.cs

@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Snap.Hutao.Model.Metadata.Avatar;
 using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Metadata.Weapon;
@@ -19,39 +18,19 @@ internal static class MetadataServiceContextExtension
 
         // List
         {
-            if (context is IMetadataListAchievementSource listAchievementSource)
+            if (context is IMetadataListMaterialSource listMaterialSource)
             {
-                listAchievementSource.Achievements = await metadataService.GetAchievementListAsync(token).ConfigureAwait(false);
+                listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
             }
 
             if (context is IMetadataListGachaEventSource listGachaEventSource)
             {
                 listGachaEventSource.GachaEvents = await metadataService.GetGachaEventListAsync(token).ConfigureAwait(false);
             }
-
-            if (context is IMetadataListMaterialSource listMaterialSource)
-            {
-                listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataListReliquaryMainAffixLevelSource listReliquaryMainAffixLevelSource)
-            {
-                listReliquaryMainAffixLevelSource.ReliquaryMainAffixLevels = await metadataService.GetReliquaryMainAffixLevelListAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataListReliquarySource listReliquarySource)
-            {
-                listReliquarySource.Reliquaries = await metadataService.GetReliquaryListAsync(token).ConfigureAwait(false);
-            }
         }
 
         // Dictionary
         {
-            if (context is IMetadataDictionaryIdAchievementSource dictionaryIdAchievementSource)
-            {
-                dictionaryIdAchievementSource.IdAchievementMap = await metadataService.GetIdToAchievementMapAsync(token).ConfigureAwait(false);
-            }
-
             if (context is IMetadataDictionaryIdAvatarSource dictionaryIdAvatarSource)
             {
                 dictionaryIdAvatarSource.IdAvatarMap = await metadataService.GetIdToAvatarMapAsync(token).ConfigureAwait(false);
@@ -62,21 +41,6 @@ internal static class MetadataServiceContextExtension
                 dictionaryIdMaterialSource.IdMaterialMap = await metadataService.GetIdToMaterialMapAsync(token).ConfigureAwait(false);
             }
 
-            if (context is IMetadataDictionaryIdReliquaryAffixWeightSource dictionaryIdReliquaryAffixWeightSource)
-            {
-                dictionaryIdReliquaryAffixWeightSource.IdReliquaryAffixWeightMap = await metadataService.GetIdToReliquaryAffixWeightMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryIdReliquaryMainPropertySource dictionaryIdReliquaryMainPropertySource)
-            {
-                dictionaryIdReliquaryMainPropertySource.IdReliquaryMainPropertyMap = await metadataService.GetIdToReliquaryMainPropertyMapAsync(token).ConfigureAwait(false);
-            }
-
-            if (context is IMetadataDictionaryIdReliquarySubAffixSource dictionaryIdReliquarySubAffixSource)
-            {
-                dictionaryIdReliquarySubAffixSource.IdReliquarySubAffixMap = await metadataService.GetIdToReliquarySubAffixMapAsync(token).ConfigureAwait(false);
-            }
-
             if (context is IMetadataDictionaryIdWeaponSource dictionaryIdWeaponSource)
             {
                 dictionaryIdWeaponSource.IdWeaponMap = await metadataService.GetIdToWeaponMapAsync(token).ConfigureAwait(false);

src/Snap.Hutao/Snap.Hutao/Service/Metadata/MetadataServiceListExtension.cs

@@ -80,7 +80,7 @@ internal static class MetadataServiceListExtension
         return metadataService.FromCacheOrFileAsync<List<ReliquaryMainAffix>>(FileNameReliquaryMainAffix, token);
     }
 
-    public static ValueTask<List<ReliquaryMainAffixLevel>> GetReliquaryMainAffixLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
+    public static ValueTask<List<ReliquaryMainAffixLevel>> GetReliquaryLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
         return metadataService.FromCacheOrFileAsync<List<ReliquaryMainAffixLevel>>(FileNameReliquaryMainAffixLevel, token);
     }

src/Snap.Hutao/Snap.Hutao/Service/SignIn/SignInService.cs

@@ -16,22 +16,31 @@ internal sealed partial class SignInService : ISignInService
 
     public async ValueTask<ValueResult<bool, string>> ClaimRewardAsync(UserAndUid userAndUid, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
+        ISignInClient signInClient = serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<ISignInClient>>()
+            .Create(userAndUid.User.IsOversea);
+
+        Response<Reward> rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false);
+
+        if (rewardResponse.IsOk())
         {
-            ISignInClient signInClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<ISignInClient>>()
-                .Create(userAndUid.User.IsOversea);
-
-            Response<Reward> rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false);
-
-            if (!rewardResponse.IsOk())
-            {
-                return new(false, SH.ServiceSignInRewardListRequestFailed);
-            }
-
             Response<SignInResult> resultResponse = await signInClient.SignAsync(userAndUid, token).ConfigureAwait(false);
 
-            if (!resultResponse.IsOk(showInfoBar: false))
+            if (resultResponse.IsOk(showInfoBar: false))
+            {
+                Response<SignInRewardInfo> infoResponse = await signInClient.GetInfoAsync(userAndUid, token).ConfigureAwait(false);
+                if (infoResponse.IsOk())
+                {
+                    int index = infoResponse.Data.TotalSignDay - 1;
+                    Award award = rewardResponse.Data.Awards[index];
+                    return new(true, SH.FormatServiceSignInSuccessRewardFormat(award.Name, award.Count));
+                }
+                else
+                {
+                    return new(false, SH.ServiceSignInInfoRequestFailed);
+                }
+            }
+            else
             {
                 string message = resultResponse.Message;
 
@@ -47,16 +56,10 @@ internal sealed partial class SignInService : ISignInService
 
                 return new(false, SH.FormatServiceSignInClaimRewardFailedFormat(message));
             }
-
-            Response<SignInRewardInfo> infoResponse = await signInClient.GetInfoAsync(userAndUid, token).ConfigureAwait(false);
-            if (!infoResponse.IsOk())
-            {
-                return new(false, SH.ServiceSignInInfoRequestFailed);
-            }
-
-            int index = infoResponse.Data.TotalSignDay - 1;
-            Award award = rewardResponse.Data.Awards[index];
-            return new(true, SH.FormatServiceSignInSuccessRewardFormat(award.Name, award.Count));
+        }
+        else
+        {
+            return new(false, SH.ServiceSignInRewardListRequestFailed);
         }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs

@@ -21,9 +21,8 @@ namespace Snap.Hutao.Service.SpiralAbyss;
 [Injection(InjectAs.Scoped, typeof(ISpiralAbyssRecordService))]
 internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordService
 {
-    //private readonly IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory;
+    private readonly IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory;
     private readonly ISpiralAbyssRecordDbService spiralAbyssRecordDbService;
-    private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly IMetadataService metadataService;
     private readonly ITaskContext taskContext;
 
@@ -77,69 +76,54 @@ internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordServi
     /// <inheritdoc/>
     public async ValueTask RefreshSpiralAbyssAsync(UserAndUid userAndUid)
     {
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
+        // request the index first
+        await gameRecordClientFactory
+            .Create(userAndUid.User.IsOversea)
+            .GetPlayerInfoAsync(userAndUid)
+            .ConfigureAwait(false);
 
-            // request the index first
-            await gameRecordClientFactory
-                .Create(userAndUid.User.IsOversea)
-                .GetPlayerInfoAsync(userAndUid)
-                .ConfigureAwait(false);
-
-            await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Last).ConfigureAwait(false);
-            await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Current).ConfigureAwait(false);
-        }
+        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Last).ConfigureAwait(false);
+        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Current).ConfigureAwait(false);
     }
 
     private async ValueTask RefreshSpiralAbyssCoreAsync(UserAndUid userAndUid, SpiralAbyssSchedule schedule)
     {
-        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
+        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response = await gameRecordClientFactory
+            .Create(userAndUid.User.IsOversea)
+            .GetSpiralAbyssAsync(userAndUid, schedule)
+            .ConfigureAwait(false);
+
+        if (response.IsOk())
         {
-            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
+            Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss webSpiralAbyss = response.Data;
 
-            response = await gameRecordClientFactory
-                .Create(userAndUid.User.IsOversea)
-                .GetSpiralAbyssAsync(userAndUid, schedule)
-                .ConfigureAwait(false);
+            ArgumentNullException.ThrowIfNull(spiralAbysses);
+            ArgumentNullException.ThrowIfNull(metadataContext);
+
+            int index = spiralAbysses.FirstIndexOf(s => s.ScheduleId == webSpiralAbyss.ScheduleId);
+            if (index >= 0)
+            {
+                await taskContext.SwitchToBackgroundAsync();
+                SpiralAbyssView view = spiralAbysses[index];
+
+                SpiralAbyssEntry targetEntry;
+                if (view.Entity is not null)
+                {
+                    view.Entity.SpiralAbyss = webSpiralAbyss;
+                    await spiralAbyssRecordDbService.UpdateSpiralAbyssEntryAsync(view.Entity).ConfigureAwait(false);
+                    targetEntry = view.Entity;
+                }
+                else
+                {
+                    SpiralAbyssEntry newEntry = SpiralAbyssEntry.From(userAndUid.Uid.Value, webSpiralAbyss);
+                    await spiralAbyssRecordDbService.AddSpiralAbyssEntryAsync(newEntry).ConfigureAwait(false);
+                    targetEntry = newEntry;
+                }
+
+                await taskContext.SwitchToMainThreadAsync();
+                spiralAbysses.RemoveAt(index);
+                spiralAbysses.Insert(index, SpiralAbyssView.From(targetEntry, metadataContext));
+            }
         }
-
-        if (!response.IsOk())
-        {
-            return;
-        }
-
-        Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss webSpiralAbyss = response.Data;
-
-        ArgumentNullException.ThrowIfNull(spiralAbysses);
-        ArgumentNullException.ThrowIfNull(metadataContext);
-
-        int index = spiralAbysses.FirstIndexOf(s => s.ScheduleId == webSpiralAbyss.ScheduleId);
-        if (index < 0)
-        {
-            return;
-        }
-
-        await taskContext.SwitchToBackgroundAsync();
-        SpiralAbyssView view = spiralAbysses[index];
-
-        SpiralAbyssEntry targetEntry;
-        if (view.Entity is not null)
-        {
-            view.Entity.SpiralAbyss = webSpiralAbyss;
-            await spiralAbyssRecordDbService.UpdateSpiralAbyssEntryAsync(view.Entity).ConfigureAwait(false);
-            targetEntry = view.Entity;
-        }
-        else
-        {
-            SpiralAbyssEntry newEntry = SpiralAbyssEntry.From(userAndUid.Uid.Value, webSpiralAbyss);
-            await spiralAbyssRecordDbService.AddSpiralAbyssEntryAsync(newEntry).ConfigureAwait(false);
-            targetEntry = newEntry;
-        }
-
-        await taskContext.SwitchToMainThreadAsync();
-        spiralAbysses.RemoveAt(index);
-        spiralAbysses.Insert(index, SpiralAbyssView.From(targetEntry, metadataContext));
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/User/UserInitializationService.cs

@@ -68,7 +68,6 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return false;
         }
 
-        // TODO: sharing scope
         if (!await TrySetUserLTokenAsync(user, token).ConfigureAwait(false))
         {
             return false;
@@ -101,17 +100,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return true;
         }
 
-        Response<LTokenWrapper> lTokenResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IPassportClient passportClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-                .Create(user.IsOversea);
-
-            lTokenResponse = await passportClient
-                .GetLTokenBySTokenAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<LTokenWrapper> lTokenResponse = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
+            .Create(user.IsOversea)
+            .GetLTokenBySTokenAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (lTokenResponse.IsOk())
         {
@@ -138,17 +131,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             }
         }
 
-        Response<UidCookieToken> cookieTokenResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IPassportClient passportClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-                .Create(user.IsOversea);
-
-            cookieTokenResponse = await passportClient
-                .GetCookieAccountInfoBySTokenAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<UidCookieToken> cookieTokenResponse = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
+            .Create(user.IsOversea)
+            .GetCookieAccountInfoBySTokenAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (cookieTokenResponse.IsOk())
         {
@@ -170,17 +157,11 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserInfoAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<UserFullInfoWrapper> response;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IUserClient userClient = scope.ServiceProvider
-                .GetRequiredService<IOverseaSupportFactory<IUserClient>>()
-                .Create(user.IsOversea);
-
-            response = await userClient
-                .GetUserFullInfoAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<UserFullInfoWrapper> response = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IUserClient>>()
+            .Create(user.IsOversea)
+            .GetUserFullInfoAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (response.IsOk())
         {
@@ -195,16 +176,10 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserGameRolesAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<ListWrapper<UserGameRole>> userGameRolesResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            BindingClient bindingClient = scope.ServiceProvider
-                .GetRequiredService<BindingClient>();
-
-            userGameRolesResponse = await bindingClient
-                .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
-                .ConfigureAwait(false);
-        }
+        Response<ListWrapper<UserGameRole>> userGameRolesResponse = await serviceProvider
+            .GetRequiredService<BindingClient>()
+            .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
+            .ConfigureAwait(false);
 
         if (userGameRolesResponse.IsOk())
         {

src/Snap.Hutao/Snap.Hutao/Service/User/UserService.cs

@@ -93,17 +93,11 @@ internal sealed partial class UserService : IUserService, IUserServiceUnsafe
     public async ValueTask<bool> RefreshCookieTokenAsync(Model.Entity.User user)
     {
         // TODO: 提醒其他组件此用户的Cookie已更改
-        Response<UidCookieToken> cookieTokenResponse;
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            IPassportClient passportClient = serviceProvider
-                .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-                .Create(user.IsOversea);
-
-            cookieTokenResponse = await passportClient
-                .GetCookieAccountInfoBySTokenAsync(user)
-                .ConfigureAwait(false);
-        }
+        Response<UidCookieToken> cookieTokenResponse = await serviceProvider
+            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
+            .Create(user.IsOversea)
+            .GetCookieAccountInfoBySTokenAsync(user)
+            .ConfigureAwait(false);
 
         if (!cookieTokenResponse.IsOk())
         {

src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj

@@ -35,24 +35,22 @@
     <Configurations>Debug;Release</Configurations>
     <!--
       Required for .NET 8 MSIX packaging
-
+      
       10.2.4.1 Security - Software Dependencies
       Products may depend on non-integrated software (such as another product or module)
       to deliver primary functionality only as long as the additional required software
-      is disclosed within the first two lines of the description in the Store.
+      is disclosed within the first two lines of the description in the Store. 
     -->
     <SelfContained>true</SelfContained>
     <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
     <WindowsAppSdkUndockedRegFreeWinRTInitialize>false</WindowsAppSdkUndockedRegFreeWinRTInitialize>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <GarbageCollectionAdaptationMode>1</GarbageCollectionAdaptationMode>
   </PropertyGroup>
 
   <ItemGroup>
 	<AppxManifest Include="Package.appxmanifest" Condition="'$(ConfigurationName)'!='Debug'" />
 	<AppxManifest Include="Package.development.appxmanifest" Condition="'$(ConfigurationName)'=='Debug'" />
   </ItemGroup>
-
+  
   <!-- Included Files -->
   <ItemGroup>
     <None Remove="Assets\LargeTile.scale-100.png" />
@@ -153,6 +151,7 @@
     <None Remove="View\Control\DescParamComboBox.xaml" />
     <None Remove="View\Control\Elevation.xaml" />
     <None Remove="View\Control\HutaoStatisticsCard.xaml" />
+    <None Remove="View\Control\HutaoStatisticsPanel.xaml" />
     <None Remove="View\Control\ItemIcon.xaml" />
     <None Remove="View\Control\LaunchGameResourceExpander.xaml" />
     <None Remove="View\Control\LoadingView.xaml" />
@@ -205,7 +204,7 @@
     <None Remove="View\TitleView.xaml" />
     <None Remove="View\UserView.xaml" />
   </ItemGroup>
-
+  
   <!-- Analyzer Files -->
   <ItemGroup>
     <AdditionalFiles Include="CodeMetricsConfig.txt" />
@@ -220,7 +219,7 @@
     <AdditionalFiles Include="Resource\Localization\SH.ru.resx" />
     <AdditionalFiles Include="Resource\Localization\SH.zh-Hant.resx" />
   </ItemGroup>
-
+  
   <!-- Assets Files -->
   <ItemGroup>
     <Content Update="Assets\Logo.ico" />
@@ -305,8 +304,8 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -321,7 +320,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240404000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240311000" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
     <PackageReference Include="Snap.Discord.GameSDK" Version="1.6.0" />
     <PackageReference Include="Snap.Hutao.Deployment.Runtime" Version="1.16.0">
@@ -349,6 +348,14 @@
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
     <ProjectCapability Include="Msix" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="View\Control\HutaoStatisticsPanel.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <ItemGroup>
     <Page Update="View\Dialog\LaunchGameConfigurationFixDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -389,37 +396,37 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="Control\Theme\ScrollViewer.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="Control\Theme\FlyoutStyle.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportUnregisterDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportResetPasswordDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportRegisterDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportLoginDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -569,13 +576,13 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+	
   <ItemGroup>
     <Page Update="IdentifyMonitorWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+	
   <ItemGroup>
     <Page Update="View\Control\HutaoStatisticsCard.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -617,7 +624,7 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-
+  
   <!-- Pages -->
   <ItemGroup>
     <Page Update="View\Dialog\LaunchGamePackageConvertDialog.xaml">

src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml

@@ -52,13 +52,9 @@
                     Grid.Row="0"
                     HorizontalAlignment="Right"
                     Text="{Binding DisplayName}"/>
-                <Viewbox
-                    Grid.Row="1"
-                    HorizontalAlignment="Left"
-                    StretchDirection="DownOnly">
+                <Viewbox Grid.Row="1" StretchDirection="DownOnly">
                     <TextBlock
                         Margin="0,4,0,0"
-                        HorizontalAlignment="Left"
                         Style="{StaticResource TitleTextBlockStyle}"
                         Text="{Binding FinishDescription}"/>
                 </Viewbox>

src/Snap.Hutao/Snap.Hutao/View/Card/AchievementCard.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.View.Card;
 
@@ -16,7 +15,7 @@ internal sealed partial class AchievementCard : Button
     /// </summary>
     public AchievementCard()
     {
-        this.InitializeDataContext<ViewModel.Achievement.AchievementViewModelSlim>();
+        DataContext = Ioc.Default.GetRequiredService<ViewModel.Achievement.AchievementViewModelSlim>();
         InitializeComponent();
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Card/DailyNoteCard.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.View.Card;
 
@@ -16,7 +15,7 @@ internal sealed partial class DailyNoteCard : Button
     /// </summary>
     public DailyNoteCard()
     {
-        this.InitializeDataContext<ViewModel.DailyNote.DailyNoteViewModelSlim>();
+        DataContext = Ioc.Default.GetRequiredService<ViewModel.DailyNote.DailyNoteViewModelSlim>();
         InitializeComponent();
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.View.Card;
 
@@ -16,7 +15,7 @@ internal sealed partial class GachaStatisticsCard : Button
     /// </summary>
     public GachaStatisticsCard()
     {
-        this.InitializeDataContext<ViewModel.GachaLog.GachaLogViewModelSlim>();
+        DataContext = Ioc.Default.GetRequiredService<ViewModel.GachaLog.GachaLogViewModelSlim>();
         InitializeComponent();
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Card/LaunchGameCard.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.View.Card;
 
@@ -16,7 +15,7 @@ internal sealed partial class LaunchGameCard : Button
     /// </summary>
     public LaunchGameCard()
     {
-        this.InitializeDataContext<ViewModel.Game.LaunchGameViewModelSlim>();
+        DataContext = Ioc.Default.GetRequiredService<ViewModel.Game.LaunchGameViewModelSlim>();
         InitializeComponent();
     }
 }

src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsPanel.xaml

@@ -0,0 +1,13 @@
+<shcp:HorizontalEqualPanel
+    x:Class="Snap.Hutao.View.Control.HutaoStatisticsPanel"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:shcp="using:Snap.Hutao.Control.Panel"
+    xmlns:shvc="using:Snap.Hutao.View.Control"
+    mc:Ignorable="d">
+    <shvc:HutaoStatisticsCard DataContext="{x:Bind Statistics.AvatarEvent}"/>
+    <shvc:HutaoStatisticsCard DataContext="{x:Bind Statistics.AvatarEvent2}"/>
+    <shvc:HutaoStatisticsCard DataContext="{x:Bind Statistics.WeaponEvent}"/>
+</shcp:HorizontalEqualPanel>

src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsPanel.xaml.cs

@@ -0,0 +1,38 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml;
+using Snap.Hutao.Control.Panel;
+using Snap.Hutao.ViewModel.GachaLog;
+
+namespace Snap.Hutao.View.Control;
+
+[DependencyProperty("Statistics", typeof(HutaoStatistics), default, nameof(OnStatisticsChanged))]
+internal sealed partial class HutaoStatisticsPanel : HorizontalEqualPanel
+{
+    public HutaoStatisticsPanel()
+    {
+        InitializeComponent();
+
+        if (DataContext is HutaoStatistics statistics && statistics.Chronicled is { } chronicled)
+        {
+            Children.Add(new HutaoStatisticsCard
+            {
+                DataContext = chronicled,
+            });
+        }
+    }
+
+    private static void OnStatisticsChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    {
+        HutaoStatisticsPanel panel = (HutaoStatisticsPanel)obj;
+
+        if (args.NewValue is HutaoStatistics { Chronicled: { } chronicled })
+        {
+            panel.Children.Add(new HutaoStatisticsCard
+            {
+                DataContext = chronicled,
+            });
+        }
+    }
+}

src/Snap.Hutao/Snap.Hutao/View/Dialog/AchievementImportDialog.xaml.cs

@@ -34,11 +34,11 @@ internal sealed partial class AchievementImportDialog : ContentDialog
     /// 异步获取导入选项
     /// </summary>
     /// <returns>导入选项</returns>
-    public async ValueTask<ValueResult<bool, ImportStrategyKind>> GetImportStrategyAsync()
+    public async ValueTask<ValueResult<bool, ImportStrategy>> GetImportStrategyAsync()
     {
         await taskContext.SwitchToMainThreadAsync();
         ContentDialogResult result = await ShowAsync();
-        ImportStrategyKind strategy = (ImportStrategyKind)ImportModeSelector.SelectedIndex;
+        ImportStrategy strategy = (ImportStrategy)ImportModeSelector.SelectedIndex;
 
         return new(result == ContentDialogResult.Primary, strategy);
     }

src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml

@@ -49,7 +49,7 @@
             <RowDefinition/>
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
-        <cwc:SwitchPresenter ContentTransitions="{ThemeResource EntranceThemeTransitions}" Value="{Binding State, Mode=OneWay}">
+        <cwc:SwitchPresenter Value="{Binding State, Mode=OneWay}">
             <cwc:Case Value="{shcm:UInt32 Value=0}">
                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                     <GridView
@@ -125,11 +125,10 @@
                     <StackPanel
                         Margin="16"
                         HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Spacing="{ThemeResource SettingsCardSpacing}">
+                        VerticalAlignment="Center">
                         <TextBlock
                             Margin="1,0,0,5"
-                            Style="{StaticResource TitleTextBlockStyle}"
+                            Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                             Text="Segoe Fluent Icons"/>
                         <StackPanel
                             Margin="0,8"
@@ -156,10 +155,7 @@
                             <Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentFontDescription2}"/>
                         </TextBlock>
                         <TextBlock Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentAfterInstallDescription}"/>
-                        <TextBlock
-                            Margin="1,32,0,5"
-                            Style="{StaticResource TitleTextBlockStyle}"
-                            Text="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
+                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingWebview2Header}"/>
                         <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{Binding RuntimeOptions.WebView2Version}"/>
                         <TextBlock>
                             <Run Text="{shcm:ResourceString Name=ViewGuideStepEnvironmentWebView2Description1}"/>
@@ -173,78 +169,6 @@
                 </Grid>
             </cwc:Case>
             <cwc:Case Value="{shcm:UInt32 Value=3}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-                    <StackPanel
-                        Grid.Row="0"
-                        Margin="16"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageSettingHomeAnnouncementRegionHeader}"/>
-                        <ListView
-                            MinWidth="320"
-                            Margin="0,8,0,0"
-                            DisplayMemberPath="Name"
-                            ItemsSource="{Binding AppOptions.LazyRegions.Value}"
-                            SelectedItem="{Binding SelectedRegion, Mode=TwoWay}"/>
-                    </StackPanel>
-
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="16"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        HorizontalTextAlignment="Center"
-                        Opacity="0.7"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{shcm:ResourceString Name=ViewGuideStepCommonSettingHint}"/>
-                </Grid>
-            </cwc:Case>
-            <cwc:Case Value="{shcm:UInt32 Value=4}">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition Height="auto"/>
-                    </Grid.RowDefinitions>
-
-                    <StackPanel
-                        Grid.Row="0"
-                        Margin="16"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center">
-                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{shcm:ResourceString Name=ViewGuideStepStaticResourceSettingQualityHeader}"/>
-                        <ListView
-                            MinWidth="320"
-                            Margin="0,8,0,32"
-                            DisplayMemberPath="Name"
-                            ItemsSource="{Binding StaticResourceOptions.ImageQualities}"
-                            SelectedItem="{Binding StaticResourceOptions.ImageQuality, Mode=TwoWay}"/>
-                        <TextBlock Style="{StaticResource SubtitleTextBlockStyle}" Text="{shcm:ResourceString Name=ViewGuideStepStaticResourceSettingMinimumHeader}"/>
-                        <ListView
-                            MinWidth="320"
-                            Margin="0,8,0,32"
-                            DisplayMemberPath="Name"
-                            ItemsSource="{Binding StaticResourceOptions.ImageArchives}"
-                            SelectedItem="{Binding StaticResourceOptions.ImageArchive, Mode=TwoWay}"/>
-                        
-                        <TextBlock Margin="0,16,0,0" Text="{Binding StaticResourceOptions.SizeInformationText, Mode=OneWay}"/>
-                    </StackPanel>
-
-                    <TextBlock
-                        Grid.Row="1"
-                        Margin="16"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                        HorizontalTextAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{shcm:ResourceString Name=ViewGuideStepStaticResourceSettingHint}"/>
-                </Grid>
-            </cwc:Case>
-            <cwc:Case Value="{shcm:UInt32 Value=5}">
                 <StackPanel Margin="32,0" HorizontalAlignment="Left">
                     <TextBlock
                         Margin="1,16,0,5"
@@ -266,23 +190,12 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <cwc:Segmented
                     Margin="16"
-                    HorizontalAlignment="Center"
                     IsHitTestVisible="False"
                     SelectedIndex="{Binding State, Mode=TwoWay}">
-                    <!--
                     <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepLanguage}" Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/>
                     <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepDocument}" Icon="{shcm:FontIcon Glyph=&#xF28B;}"/>
                     <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepEnvironment}" Icon="{shcm:FontIcon Glyph=&#xE81E;}"/>
-                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepCommonSetting}" Icon="{shcm:FontIcon Glyph=&#xE713;}"/>
-                    <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepStaticResourceSetting}" Icon="{shcm:FontIcon Glyph=&#xE8BA;}"/>
                     <cwc:SegmentedItem Content="{shcm:ResourceString Name=ViewGuideStepStaticResource}" Icon="{shcm:FontIcon Glyph=&#xE8B9;}"/>
-                    -->
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xF2B7;}"/>
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xF28B;}"/>
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xE81E;}"/>
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xE713;}"/>
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xE8BA;}"/>
-                    <cwc:SegmentedItem Icon="{shcm:FontIcon Glyph=&#xE8B9;}"/>
                 </cwc:Segmented>
                 <Button
                     Command="{Binding NextOrCompleteCommand}"

src/Snap.Hutao/Snap.Hutao/View/Guide/GuideView.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.ViewModel.Guide;
 
 namespace Snap.Hutao.View.Guide;
@@ -14,7 +13,7 @@ internal sealed partial class GuideView : UserControl
 {
     public GuideView()
     {
-        this.InitializeDataContext<GuideViewModel>();
         InitializeComponent();
+        DataContext = Ioc.Default.GetRequiredService<GuideViewModel>();
     }
 }

src/Snap.Hutao/Snap.Hutao/View/MainView.xaml.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.View.Page;
 using Snap.Hutao.ViewModel;
@@ -24,11 +23,12 @@ internal sealed partial class MainView : UserControl
     {
         IServiceProvider serviceProvider = Ioc.Default;
 
-        this.InitializeDataContext<MainViewModel>(serviceProvider);
+        MainViewModel mainViewModel = serviceProvider.GetRequiredService<MainViewModel>();
 
+        DataContext = mainViewModel;
         InitializeComponent();
 
-        (DataContext as MainViewModel)?.Initialize(new BackgroundImagePresenterAccessor(BackgroundImagePresenter));
+        mainViewModel.Initialize(new BackgroundImagePresenterAccessor(BackgroundImagePresenter));
 
         navigationService = serviceProvider.GetRequiredService<INavigationService>();
         if (navigationService is INavigationInitialization navigationInitialization)