Update Snap.Hutao.csproj

This reverts commit d4bd610fe2.

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

@@ -10,8 +10,6 @@ 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,4 +28,21 @@ 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), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
+            HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), 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,7 +4,6 @@
 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,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml;
+using System.Runtime.InteropServices;
 using Windows.Foundation;
 
 namespace Snap.Hutao.Control.Panel;
@@ -18,13 +19,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size MeasureOverride(Size availableSize)
     {
-        foreach (UIElement child in Children)
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
             // 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) / Children.Count;
+            double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
             double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
-            child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
+            visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
         }
 
         return base.MeasureOverride(availableSize);
@@ -32,14 +34,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
 
     protected override Size ArrangeOverride(Size finalSize)
     {
-        int itemCount = Children.Count;
-        double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
+        List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
+        double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
         double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
 
         double offset = 0;
-        foreach (UIElement child in Children)
+        foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
         {
-            child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
+            visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
             offset += actualItemWidth + Spacing;
         }
 
@@ -49,7 +51,8 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
     private static void OnLoaded(object sender, RoutedEventArgs e)
     {
         HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
-        panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
+        int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
+        panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
     }
 
     private static void OnSizeChanged(object sender, SizeChangedEventArgs e)

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

@@ -2,8 +2,6 @@
 // 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 currentScope;
+    private readonly IServiceScope pageScope;
 
     private bool inFrame = true;
 
@@ -23,7 +23,7 @@ internal class ScopedPage : Page
     {
         unloadEventHandler = OnUnloaded;
         Unloaded += unloadEventHandler;
-        currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
+        pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
     }
 
     public async ValueTask NotifyRecipientAsync(INavigationData extra)
@@ -44,9 +44,17 @@ internal class ScopedPage : Page
     protected void InitializeWith<TViewModel>()
         where TViewModel : class, IViewModel
     {
-        IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
-        viewModel.CancellationToken = viewCancellationTokenSource.Token;
-        DataContext = viewModel;
+        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;
+        }
     }
 
     /// <inheritdoc/>
@@ -95,7 +103,7 @@ internal class ScopedPage : Page
                 viewModel.IsViewDisposed = true;
 
                 // Dispose the scope
-                currentScope.Dispose();
+                pageScope.Dispose();
             }
         }
     }

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

@@ -0,0 +1,32 @@
+// 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,13 +13,6 @@ 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
     {
@@ -27,27 +20,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <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)
+    public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Add(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <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
     {
@@ -55,27 +34,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <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)
+    public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.AddRange(entities);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <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
     {
@@ -83,27 +48,13 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <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)
+    public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Remove(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
-    /// <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
     {
@@ -111,18 +62,11 @@ internal static class DbSetExtension
         return dbSet.SaveChangesAndClearChangeTracker();
     }
 
-    /// <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)
+    public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
         where TEntity : class
     {
         dbSet.Update(entity);
-        return dbSet.SaveChangesAndClearChangeTrackerAsync();
+        return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -136,11 +80,11 @@ internal static class DbSetExtension
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
+    private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
         where TEntity : class
     {
         DbContext dbContext = dbSet.Context();
-        int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
+        int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
         dbContext.ChangeTracker.Clear();
         return count;
     }

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

@@ -5,46 +5,43 @@ namespace Snap.Hutao.Core.ExceptionService;
 
 internal sealed class HutaoException : Exception
 {
-    public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
-        : this(message, innerException)
-    {
-        Kind = kind;
-    }
-
-    private HutaoException(string message, Exception? innerException)
+    public HutaoException(string message, Exception? innerException)
         : base($"{message}\n{innerException?.Message}", innerException)
     {
     }
 
-    public HutaoExceptionKind Kind { get; private set; }
-
     [DoesNotReturn]
-    public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static HutaoException Throw(string message, Exception? innerException = default)
     {
-        throw new HutaoException(kind, message, innerException);
+        throw new HutaoException(message, innerException);
     }
 
-    public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static void ThrowIf(bool condition, string message, Exception? innerException = default)
     {
         if (condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
-    public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
+    public static void ThrowIfNot(bool condition, string message, Exception? innerException = default)
     {
         if (!condition)
         {
-            throw new HutaoException(kind, message, innerException);
+            throw new HutaoException(message, innerException);
         }
     }
 
     [DoesNotReturn]
     public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
     {
-        string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
-        throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
+        throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
+    }
+
+    [DoesNotReturn]
+    public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
+    {
+        throw new HutaoException(message, innerException);
     }
 
     [DoesNotReturn]
@@ -54,6 +51,12 @@ 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,6 +9,8 @@ internal enum HutaoExceptionKind
 
     // Foundation
     ImageCacheInvalidUri,
+    DatabaseCorrupted,
+    UserdataCorrupted,
 
     // IO
     FileSystemCreateFileInsufficientPermissions,

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

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

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, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
+        HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
         return content;
     }
 

src/Snap.Hutao/Snap.Hutao/Core/Shell/ShellLinkInterop.cs

@@ -20,23 +20,23 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
 
     public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
     {
-        string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
+        string elevatedLauncherPath = Path.Combine(runtimeOptions.DataFolder, "Snap.Hutao.Elevated.Launcher.exe");
 
         try
         {
-            Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
-            StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
-            await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
+            Uri elevatedLauncherUri = "ms-appx:///Snap.Hutao.Elevated.Launcher.exe".ToUri();
+            StorageFile launcherFile = await StorageFile.GetFileFromApplicationUriAsync(elevatedLauncherUri);
+            await launcherFile.OverwriteCopyAsync(elevatedLauncherPath).ConfigureAwait(false);
         }
         catch
         {
             return false;
         }
 
-        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath);
+        return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(elevatedLauncherPath);
     }
 
-    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath)
+    private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string elevatedLauncherPath)
     {
         bool result = false;
 
@@ -44,16 +44,9 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
         HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
         if (SUCCEEDED(hr))
         {
-            pShellLink->SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
+            pShellLink->SetPath(elevatedLauncherPath);
+            pShellLink->SetArguments(runtimeOptions.FamilyName);
             pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
-            pShellLink->SetIconLocation(targetLogoPath, 0);
-
-            if (SUCCEEDED(pShellLink->QueryInterface(in IShellLinkDataList.IID, out IShellLinkDataList* pShellLinkDataList)))
-            {
-                pShellLinkDataList->GetFlags(out uint flags);
-                pShellLinkDataList->SetFlags(flags | (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER);
-                pShellLinkDataList->Release();
-            }
 
             if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
             {

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

@@ -118,14 +118,6 @@ 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/LaunchGameWindow.xaml.cs

@@ -2,6 +2,7 @@
 // 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;
@@ -35,7 +36,7 @@ internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOpt
         scope = serviceProvider.CreateScope();
         windowOptions = new(this, DragableGrid, new(MaxWidth, MaxHeight));
         this.InitializeController(serviceProvider);
-        RootGrid.DataContext = scope.ServiceProvider.GetRequiredService<LaunchGameViewModel>();
+        RootGrid.InitializeDataContext<LaunchGameViewModel>(scope.ServiceProvider);
     }
 
     /// <inheritdoc/>

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

@@ -0,0 +1,9 @@
+// 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

@@ -0,0 +1,9 @@
+// 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
-    : IEquatable<Achievement>,
+internal sealed class Achievement : IAppDbEntityHasArchive,
+    IEquatable<Achievement>,
     IDbMappingForeignKeyFrom<Achievement, AchievementId>,
     IDbMappingForeignKeyFrom<Achievement, UIAFItem>
 {

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

@@ -19,6 +19,7 @@ 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,11 +11,6 @@ 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
     <value>单个成就存档内发现多个相同的成就 Id</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
@@ -2702,6 +2702,12 @@
   <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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" 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="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
+  <data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
     <value>單個成就存檔內發現多個相同的成就 Id</value>
   </data>
   <data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">

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

@@ -0,0 +1,35 @@
+// 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

@@ -0,0 +1,47 @@
+// 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

@@ -0,0 +1,152 @@
+// 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,20 +14,10 @@ namespace Snap.Hutao.Service.Abstraction;
 /// 数据库存储选项的设置
 /// </summary>
 [ConstructorGenerated]
-internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbStoreOptions>
+internal abstract partial class DbStoreOptions : ObservableObject
 {
     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);
@@ -49,13 +39,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         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);
@@ -78,13 +61,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         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);
@@ -107,15 +83,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         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)
     {
@@ -160,13 +127,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         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))
@@ -182,14 +142,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         }
     }
 
-    /// <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);
@@ -208,13 +160,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         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))
@@ -230,15 +175,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
         }
     }
 
-    /// <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/IAppDbService.cs

@@ -0,0 +1,9 @@
+// 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

@@ -0,0 +1,9 @@
+// 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

@@ -0,0 +1,6 @@
+// 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

@@ -0,0 +1,27 @@
+// 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,9 +2,11 @@
 // 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;
@@ -21,197 +23,155 @@ 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 {Method} Operation for archive: {Id}, Aggressive: {Aggressive}", nameof(Merge), archiveId, aggressive);
+        logger.LogInformation("Perform merge operation for [Archive: {Id}], [Aggressive: {Aggressive}]", archiveId, aggressive);
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            AppDbContext appDbContext = scope.GetAppDbContext();
 
             IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
                 .AsNoTracking()
                 .Where(a => a.ArchiveId == archiveId)
                 .OrderBy(a => a.Id);
 
-            int add = 0;
-            int update = 0;
+            (int add, int update) = (0, 0);
 
-            using (IEnumerator<EntityAchievement> entityEnumerator = oldData.GetEnumerator())
+            using (TwoEnumerbleEnumerator<EntityAchievement, UIAFItem> enumerator = new(oldData, items))
             {
-                using (IEnumerator<UIAFItem> uiafEnumerator = items.GetEnumerator())
+                (bool moveEntity, bool moveUIAF) = (true, true);
+
+                while (true)
                 {
-                    bool moveEntity = true;
-                    bool moveUIAF = true;
-
-                    while (true)
+                    if (!enumerator.MoveNext(ref moveEntity, ref moveUIAF))
                     {
-                        bool moveEntityResult = moveEntity && entityEnumerator.MoveNext();
-                        bool moveUIAFResult = moveUIAF && uiafEnumerator.MoveNext();
+                        break;
+                    }
 
-                        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;
-                            }
+                    (EntityAchievement? entity, UIAFItem? uiaf) = enumerator.Current;
 
+                    switch (entity, uiaf)
+                    {
+                        case (null, not null):
+                            appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
+                            add++;
+                            continue;
+                        case (not null, null):
+                            continue; // Skipped
+                        default:
                             ArgumentNullException.ThrowIfNull(entity);
                             ArgumentNullException.ThrowIfNull(uiaf);
 
-                            if (entity.Id < uiaf.Id)
+                            switch (entity.Id.CompareTo(uiaf.Id))
                             {
-                                moveEntity = true;
-                                moveUIAF = false;
-                            }
-                            else if (entity.Id == uiaf.Id)
-                            {
-                                moveEntity = true;
-                                moveUIAF = true;
+                                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);
 
-                                if (aggressive)
-                                {
-                                    appDbContext.Achievements.RemoveAndSave(entity);
                                     appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
-                                    update++;
-                                }
+                                    add++;
+                                    break;
                             }
-                            else
-                            {
-                                // entity.Id > uiaf.Id
-                                moveEntity = false;
-                                moveUIAF = true;
 
-                                appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
-                                add++;
-                            }
-                        }
+                            break;
                     }
                 }
             }
 
-            logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}", nameof(Merge), add, update);
+            logger.LogInformation("Merge operation complete, [Add: {Add}], [Update: {Update}]", 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 {Method} Operation for archive: {Id}", nameof(Overwrite), archiveId);
+        logger.LogInformation("Perform Overwrite Operation for [Archive: {Id}]", archiveId);
         using (IServiceScope scope = serviceProvider.CreateScope())
         {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            AppDbContext appDbContext = scope.GetAppDbContext();
 
             IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
                 .AsNoTracking()
                 .Where(a => a.ArchiveId == archiveId)
                 .OrderBy(a => a.Id);
 
-            int add = 0;
-            int update = 0;
-            int remove = 0;
+            (int add, int update, int remove) = (0, 0, 0);
 
-            using (IEnumerator<EntityAchievement> oldDataEnumerator = oldData.GetEnumerator())
+            using (TwoEnumerbleEnumerator<EntityAchievement, EntityAchievement> enumerator = new(oldData, items))
             {
-                using (IEnumerator<EntityAchievement> newDataEnumerator = items.GetEnumerator())
+                (bool moveOld, bool moveNew) = (true, true);
+
+                while (true)
                 {
-                    bool moveOld = true;
-                    bool moveNew = true;
-
-                    while (true)
+                    if (!enumerator.MoveNext(ref moveOld, ref moveNew))
                     {
-                        bool moveOldResult = moveOld && oldDataEnumerator.MoveNext();
-                        bool moveNewResult = moveNew && newDataEnumerator.MoveNext();
+                        break;
+                    }
 
-                        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;
-                            }
+                    (EntityAchievement? oldEntity, EntityAchievement? newEntity) = enumerator.Current;
 
+                    switch (oldEntity, newEntity)
+                    {
+                        case (null, not null):
+                            appDbContext.Achievements.AddAndSave(newEntity);
+                            add++;
+                            continue;
+                        case (not null, null):
+                            appDbContext.Achievements.RemoveAndSave(oldEntity);
+                            remove++;
+                            continue;
+                        default:
                             ArgumentNullException.ThrowIfNull(oldEntity);
                             ArgumentNullException.ThrowIfNull(newEntity);
 
-                            if (oldEntity.Id < newEntity.Id)
+                            switch (oldEntity.Id.CompareTo(newEntity.Id))
                             {
-                                moveOld = true;
-                                moveNew = false;
-                                appDbContext.Achievements.RemoveAndSave(oldEntity);
-                                remove++;
-                            }
-                            else if (oldEntity.Id == newEntity.Id)
-                            {
-                                moveOld = true;
-                                moveNew = true;
+                                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);
 
-                                if (oldEntity.Equals(newEntity))
-                                {
-                                    // skip same entry.
-                                    continue;
-                                }
-                                else
-                                {
-                                    appDbContext.Achievements.RemoveAndSave(oldEntity);
                                     appDbContext.Achievements.AddAndSave(newEntity);
-                                    update++;
-                                }
+                                    add++;
+                                    break;
                             }
-                            else
-                            {
-                                // entity.Id > uiaf.Id
-                                moveOld = false;
-                                moveNew = true;
-                                appDbContext.Achievements.AddAndSave(newEntity);
-                                add++;
-                            }
-                        }
-                        else
-                        {
+
                             break;
-                        }
                     }
                 }
             }
 
-            logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", nameof(Overwrite), add, update, remove);
+            logger.LogInformation("Overwrite Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", add, update, remove);
             return new(add, update, remove);
         }
     }

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

@@ -2,167 +2,106 @@
 // 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
         {
-            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);
-            }
+            return this.Query<EntityAchievement, Dictionary<AchievementId, EntityAchievement>>(query => query
+                .Where(a => a.ArchiveId == archiveId)
+                .ToDictionary(a => (AchievementId)a.Id));
         }
         catch (ArgumentException ex)
         {
-            throw ThrowHelper.DatabaseCorrupted(SH.ServiceAchievementUserdataCorruptedInnerIdNotUnique, ex);
+            throw HutaoException.UserdataCorrupted(SH.ServiceAchievementUserdataCorruptedAchievementIdNotUnique, ex);
         }
-
-        return entities;
     }
 
-    public async ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId)
+    public ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return await appDbContext.Achievements
-                .AsNoTracking()
+        return this.QueryAsync<EntityAchievement, int>(
+            (query, token) => query
                 .Where(a => a.ArchiveId == archiveId)
                 .Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
-                .CountAsync()
-                .ConfigureAwait(false);
-        }
+                .CountAsync(token),
+            token);
     }
 
     [SuppressMessage("", "CA1305")]
-    public async ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take)
+    public ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return await appDbContext.Achievements
-                .AsNoTracking()
+        return this.QueryAsync<EntityAchievement, List<EntityAchievement>>(
+            (query, token) => query
                 .Where(a => a.ArchiveId == archiveId)
                 .Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
                 .OrderByDescending(a => a.Time.ToString())
                 .Take(take)
-                .ToListAsync()
-                .ConfigureAwait(false);
-        }
+                .ToListAsync(token),
+            token);
     }
 
     public void OverwriteAchievement(EntityAchievement achievement)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
+        this.DeleteByInnerId(achievement);
+        if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
         {
-            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);
-            }
+            this.Add(achievement);
         }
     }
 
-    public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement)
+    public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
+        await this.DeleteByInnerIdAsync(achievement, token).ConfigureAwait(false);
+        if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
         {
-            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);
-            }
+            await this.AddAsync(achievement, token).ConfigureAwait(false);
         }
     }
 
     public ObservableCollection<AchievementArchive> GetAchievementArchiveCollection()
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return appDbContext.AchievementArchives.AsNoTracking().ToObservableCollection();
-        }
+        return this.ObservableCollection<AchievementArchive>();
     }
 
-    public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive)
+    public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-
-            // It will cascade deleted the achievements.
-            await appDbContext.AchievementArchives.RemoveAndSaveAsync(archive).ConfigureAwait(false);
-        }
+        // It will cascade deleted the achievements.
+        await this.DeleteAsync(archive, token).ConfigureAwait(false);
     }
 
     public List<EntityAchievement> GetAchievementListByArchiveId(Guid 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];
-        }
+        return this.ListByArchiveId<EntityAchievement>(archiveId);
     }
 
-    public async ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId)
+    public ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return await appDbContext.Achievements
-                .AsNoTracking()
-                .Where(i => i.ArchiveId == archiveId)
-                .ToListAsync()
-                .ConfigureAwait(false);
-        }
+        return this.ListByArchiveIdAsync<EntityAchievement>(archiveId, token);
     }
 
     public List<AchievementArchive> GetAchievementArchiveList()
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            IQueryable<AchievementArchive> result = appDbContext.AchievementArchives.AsNoTracking();
-            return [.. result];
-        }
+        return this.List<AchievementArchive>();
     }
 
-    public async ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync()
+    public ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default)
     {
-        using (IServiceScope scope = serviceProvider.CreateScope())
-        {
-            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
-            return await appDbContext.AchievementArchives.AsNoTracking().ToListAsync().ConfigureAwait(false);
-        }
+        return this.ListAsync<AchievementArchive>(token);
     }
 }

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

@@ -1,79 +0,0 @@
-// 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

@@ -1,64 +0,0 @@
-// 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,17 +3,16 @@
 
 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))]
@@ -25,21 +24,127 @@ internal sealed partial class AchievementService : IAchievementService
     private readonly RuntimeOptions runtimeOptions;
     private readonly ITaskContext taskContext;
 
-    /// <inheritdoc/>
-    public List<AchievementView> GetAchievementViewList(AchievementArchive archive, List<MetadataAchievement> metadata)
+    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)
     {
         Dictionary<AchievementId, EntityAchievement> entities = achievementDbService.GetAchievementMapByArchiveId(archive.InnerId);
 
-        return metadata.SelectList(meta =>
+        return context.Achievements.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

@@ -0,0 +1,17 @@
+// 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,32 +13,34 @@ 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(Dictionary<AchievementId, MetadataAchievement> achievementMap)
+    public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default)
     {
         await taskContext.SwitchToBackgroundAsync();
 
         List<AchievementStatistics> results = [];
-        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync().ConfigureAwait(false))
+        foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync(token).ConfigureAwait(false))
         {
             int finishedCount = await achievementDbService
-                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId)
+                .GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId, token)
                 .ConfigureAwait(false);
 
-            int totalCount = achievementMap.Count;
+            int totalCount = context.IdAchievementMap.Count;
 
             List<EntityAchievement> achievements = await achievementDbService
-                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, 2)
+                .GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, AchievementCardTakeCount, token)
                 .ConfigureAwait(false);
 
             results.Add(new()
             {
                 DisplayName = archive.Name,
                 FinishDescription = AchievementStatistics.Format(finishedCount, totalCount, out _),
-                Achievements = achievements.SelectList(entity => new AchievementView(entity, achievementMap[entity.Id])),
+                Achievements = achievements.SelectList(entity => new AchievementView(entity, context.IdAchievementMap[entity.Id])),
             });
         }
 

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

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

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

@@ -2,32 +2,33 @@
 // 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
+internal interface IAchievementDbService : IAppDbService<Model.Entity.AchievementArchive>, IAppDbService<EntityAchievement>
 {
-    ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive);
+    ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive, CancellationToken token = default);
 
     ObservableCollection<Model.Entity.AchievementArchive> GetAchievementArchiveCollection();
 
     List<Model.Entity.AchievementArchive> GetAchievementArchiveList();
 
-    ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync();
+    ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default);
 
     List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId);
 
-    ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId);
+    ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
 
     Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId);
 
-    ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId);
+    ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
 
-    ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take);
+    ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default);
 
     void OverwriteAchievement(EntityAchievement achievement);
 
-    ValueTask OverwriteAchievementAsync(EntityAchievement achievement);
+    ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default);
 }

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

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

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

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

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

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

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

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

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

@@ -16,6 +16,7 @@ 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;
@@ -24,10 +25,16 @@ internal sealed partial class AppOptions : DbStoreOptions
 
     public bool IsEmptyHistoryWishVisible
     {
-        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible);
+        get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, false);
         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,9 +13,6 @@ using EntityAvatarInfo = Snap.Hutao.Model.Entity.AvatarInfo;
 
 namespace Snap.Hutao.Service.AvatarInfo;
 
-/// <summary>
-/// 角色信息服务
-/// </summary>
 [HighQuality]
 [ConstructorGenerated]
 [Injection(InjectAs.Scoped, typeof(IAvatarInfoService))]
@@ -23,12 +20,11 @@ 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))
@@ -92,8 +88,13 @@ internal sealed partial class AvatarInfoService : IAvatarInfoService
 
     private async ValueTask<EnkaResponse?> GetEnkaResponseAsync(PlayerUid uid, CancellationToken token = default)
     {
-        return await enkaClient.GetForwardDataAsync(uid, token).ConfigureAwait(false)
-            ?? await enkaClient.GetDataAsync(uid, token).ConfigureAwait(false);
+        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);
+        }
     }
 
     private async ValueTask<Summary> GetSummaryCoreAsync(IEnumerable<EntityAvatarInfo> avatarInfos, CancellationToken token)

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

@@ -0,0 +1,9 @@
+// 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

@@ -0,0 +1,260 @@
+// 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

@@ -0,0 +1,11 @@
+// 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,17 +5,8 @@ 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,8 +5,9 @@ using Snap.Hutao.Model;
 using Snap.Hutao.Model.Intrinsic;
 using Snap.Hutao.Model.Intrinsic.Format;
 using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Primitive;
+using Snap.Hutao.Service.AvatarInfo.Factory.Builder;
 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;
@@ -17,9 +18,6 @@ using PropertyWeapon = Snap.Hutao.ViewModel.AvatarProperty.WeaponView;
 
 namespace Snap.Hutao.Service.AvatarInfo.Factory;
 
-/// <summary>
-/// 单个角色工厂
-/// </summary>
 [HighQuality]
 internal sealed class SummaryAvatarFactory
 {
@@ -27,16 +25,11 @@ internal sealed class SummaryAvatarFactory
     private readonly DateTimeOffset showcaseRefreshTime;
     private readonly DateTimeOffset gameRecordRefreshTime;
     private readonly DateTimeOffset calculatorRefreshTime;
-    private readonly SummaryMetadataContext metadataContext;
+    private readonly SummaryFactoryMetadataContext context;
 
-    /// <summary>
-    /// 构造一个新的角色工厂
-    /// </summary>
-    /// <param name="metadataContext">元数据上下文</param>
-    /// <param name="avatarInfo">角色信息</param>
-    public SummaryAvatarFactory(SummaryMetadataContext metadataContext, EntityAvatarInfo avatarInfo)
+    public SummaryAvatarFactory(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
     {
-        this.metadataContext = metadataContext;
+        this.context = context;
         this.avatarInfo = avatarInfo.Info;
 
         showcaseRefreshTime = avatarInfo.ShowcaseRefreshTime;
@@ -44,84 +37,51 @@ internal sealed class SummaryAvatarFactory
         calculatorRefreshTime = avatarInfo.CalculatorRefreshTime;
     }
 
-    /// <summary>
-    /// 创建角色
-    /// </summary>
-    /// <returns>角色</returns>
+    public static PropertyAvatar Create(SummaryFactoryMetadataContext context, EntityAvatarInfo avatarInfo)
+    {
+        return new SummaryAvatarFactory(context, avatarInfo).Create();
+    }
+
     public PropertyAvatar Create()
     {
         ReliquaryAndWeapon reliquaryAndWeapon = ProcessEquip(avatarInfo.EquipList.EmptyIfNull());
-        MetadataAvatar avatar = metadataContext.IdAvatarMap[avatarInfo.AvatarId];
+        MetadataAvatar avatar = context.IdAvatarMap[avatarInfo.AvatarId];
 
-        PropertyAvatar propertyAvatar = new()
-        {
-            // metadata part
-            Id = avatar.Id,
-            Name = avatar.Name,
-            Quality = avatar.Quality,
-            NameCard = AvatarNameCardPicConverter.AvatarToUri(avatar),
-            Element = ElementNameIconConverter.ElementNameToElementType(avatar.FetterInfo.VisionBefore),
+        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;
 
-            // 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 (Equip equip in equipments)
+        foreach (ref readonly Equip equip in CollectionsMarshal.AsSpan(equipments))
         {
             switch (equip.Flat.ItemType)
             {
                 case ItemType.ITEM_RELIQUARY:
-                    SummaryReliquaryFactory summaryReliquaryFactory = new(metadataContext, avatarInfo, equip);
-                    reliquaryList.Add(summaryReliquaryFactory.CreateReliquary());
+                    reliquaryList.Add(SummaryReliquaryFactory.Create(context, avatarInfo, equip));
                     break;
                 case ItemType.ITEM_WEAPON:
                     weapon = CreateWeapon(equip);
@@ -134,7 +94,7 @@ internal sealed class SummaryAvatarFactory
 
     private PropertyWeapon CreateWeapon(Equip equip)
     {
-        MetadataWeapon weapon = metadataContext.IdWeaponMap[equip.ItemId];
+        MetadataWeapon weapon = context.IdWeaponMap[equip.ItemId];
 
         // AffixMap can be null when it's a white weapon.
         ArgumentNullException.ThrowIfNull(equip.Weapon);
@@ -168,7 +128,9 @@ 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,6 +3,7 @@
 
 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;
@@ -20,23 +21,18 @@ internal sealed partial class SummaryFactory : ISummaryFactory
     /// <inheritdoc/>
     public async ValueTask<Summary> CreateAsync(IEnumerable<Model.Entity.AvatarInfo> avatarInfos, CancellationToken token)
     {
-        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),
-        };
+        SummaryFactoryMetadataContext context = await metadataService
+            .GetContextAsync<SummaryFactoryMetadataContext>(token)
+            .ConfigureAwait(false);
 
         IOrderedEnumerable<AvatarView> avatars = avatarInfos
             .Where(a => !AvatarIds.IsPlayer(a.Info.AvatarId))
-            .Select(a => new SummaryAvatarFactory(metadataContext, a).Create())
+            .Select(a => SummaryAvatarFactory.Create(context, a))
             .OrderByDescending(a => a.LevelNumber)
-            .ThenBy(a => a.Name);
+            .ThenByDescending(a => a.FetterLevel)
+            .ThenBy(a => a.Element);
 
+        // TODO: thenby weapon type
         return new()
         {
             Avatars = [.. avatars],

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

@@ -4,51 +4,33 @@
 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 SummaryMetadataContext
+internal sealed class SummaryFactoryMetadataContext : IMetadataContext,
+    IMetadataDictionaryIdAvatarSource,
+    IMetadataDictionaryIdWeaponSource,
+    IMetadataDictionaryIdReliquaryAffixWeightSource,
+    IMetadataDictionaryIdReliquaryMainPropertySource,
+    IMetadataDictionaryIdReliquarySubAffixSource,
+    IMetadataListReliquaryMainAffixLevelSource
 {
-    /// <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!;
 
-    /// <summary>
-    /// 圣遗物主属性映射
-    /// </summary>
-    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainAffixMap { get; set; } = default!;
+    public Dictionary<ReliquaryMainAffixId, FightProperty> IdReliquaryMainPropertyMap { get; set; } = default!;
 
-    /// <summary>
-    /// 圣遗物副属性映射
-    /// </summary>
     public Dictionary<ReliquarySubAffixId, ReliquarySubAffix> IdReliquarySubAffixMap { get; set; } = default!;
 
-    /// <summary>
-    /// 圣遗物等级
-    /// </summary>
-    public List<ReliquaryMainAffixLevel> ReliquaryLevels { get; set; } = default!;
+    public List<ReliquaryMainAffixLevel> ReliquaryMainAffixLevels { get; set; } = default!;
 
-    /// <summary>
-    /// 圣遗物
-    /// </summary>
     public List<MetadataReliquary> Reliquaries { get; set; } = default!;
 }

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

@@ -1,11 +1,7 @@
 // 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;
 
@@ -15,66 +11,6 @@ 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>
@@ -132,22 +68,4 @@ 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/SummaryReliquaryFactory.cs

@@ -19,28 +19,23 @@ namespace Snap.Hutao.Service.AvatarInfo.Factory;
 [HighQuality]
 internal sealed class SummaryReliquaryFactory
 {
-    private readonly SummaryMetadataContext metadataContext;
+    private readonly SummaryFactoryMetadataContext metadataContext;
     private readonly ModelAvatarInfo avatarInfo;
     private readonly 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)
+    public SummaryReliquaryFactory(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
     {
         this.metadataContext = metadataContext;
         this.avatarInfo = avatarInfo;
         this.equip = equip;
     }
 
-    /// <summary>
-    /// 构造圣遗物
-    /// </summary>
-    /// <returns>圣遗物</returns>
-    public ReliquaryView CreateReliquary()
+    public static ReliquaryView Create(SummaryFactoryMetadataContext metadataContext, ModelAvatarInfo avatarInfo, Web.Enka.Model.Equip equip)
+    {
+        return new SummaryReliquaryFactory(metadataContext, avatarInfo, equip).Create();
+    }
+
+    public ReliquaryView Create()
     {
         MetadataReliquary reliquary = metadataContext.Reliquaries.Single(r => r.Ids.Contains(equip.ItemId));
 
@@ -69,8 +64,8 @@ internal sealed class SummaryReliquaryFactory
             ArgumentNullException.ThrowIfNull(equip.Flat.ReliquarySubstats);
             result.ComposedSubProperties = CreateComposedSubProperties(equip.Reliquary.AppendPropIdList);
 
-            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
-            FightProperty property = metadataContext.IdReliquaryMainAffixMap[equip.Reliquary.MainPropId];
+            ReliquaryMainAffixLevel relicLevel = metadataContext.ReliquaryMainAffixLevels.Single(r => r.Level == equip.Reliquary.Level && r.Rank == reliquary.RankLevel);
+            FightProperty property = metadataContext.IdReliquaryMainPropertyMap[equip.Reliquary.MainPropId];
 
             result.MainProperty = FightPropertyFormat.ToNameValue(property, relicLevel.PropertyMap[property]);
             result.Score = ScoreReliquary(property, reliquary, relicLevel, subProperty);
@@ -146,7 +141,7 @@ internal sealed class SummaryReliquaryFactory
             // 从喵插件抓取的圣遗物评分权重
             // 部分复杂的角色暂时使用了默认值
             ReliquaryAffixWeight affixWeight = metadataContext.IdReliquaryAffixWeightMap.GetValueOrDefault(avatarInfo.AvatarId, ReliquaryAffixWeight.Default);
-            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryLevels.Where(r => r.Rank == reliquary.RankLevel).MaxBy(r => r.Level);
+            ReliquaryMainAffixLevel? maxRelicLevel = metadataContext.ReliquaryMainAffixLevels.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,11 +46,17 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
         {
             DailyNoteEntry newEntry = DailyNoteEntry.From(userAndUid);
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
-                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                .Create(PlayerUid.IsOversea(roleUid))
-                .GetDailyNoteAsync(userAndUid)
-                .ConfigureAwait(false);
+            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);
+            }
 
             if (dailyNoteResponse.IsOk())
             {
@@ -117,11 +123,17 @@ internal sealed partial class DailyNoteService : IDailyNoteService, IRecipient<U
                 continue;
             }
 
-            Web.Response.Response<WebDailyNote> dailyNoteResponse = await serviceProvider
-                .GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>()
-                .Create(PlayerUid.IsOversea(entry.Uid))
-                .GetDailyNoteAsync(new(entry.User, entry.Uid))
-                .ConfigureAwait(false);
+            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);
+            }
 
             if (dailyNoteResponse.IsOk())
             {

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

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

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

@@ -3,6 +3,7 @@
 
 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;
@@ -10,6 +11,7 @@ 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;
@@ -22,7 +24,24 @@ namespace Snap.Hutao.Service.GachaLog.Factory;
 [Injection(InjectAs.Scoped, typeof(IGachaStatisticsFactory))]
 internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
 {
-    private readonly IMetadataService metadataService;
+    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 HomaGachaLogClient homaGachaLogClient;
     private readonly ITaskContext taskContext;
     private readonly AppOptions options;
@@ -33,7 +52,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.IsEmptyHistoryWishVisible);
+        return CreateCore(taskContext, homaGachaLogClient, items, historyWishBuilders, context, options);
     }
 
     private static GachaStatistics CreateCore(
@@ -42,7 +61,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         List<Model.Entity.GachaItem> items,
         List<HistoryWishBuilder> historyWishBuilders,
         in GachaLogServiceMetadataContext context,
-        bool isEmptyHistoryWishVisible)
+        AppOptions appOptions)
     {
         TypedWishSummaryBuilderContext standardContext = TypedWishSummaryBuilderContext.StandardWish(taskContext, gachaLogClient);
         TypedWishSummaryBuilder standardWishBuilder = new(standardContext);
@@ -62,6 +81,45 @@ 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)
@@ -148,7 +206,7 @@ internal sealed partial class GachaStatisticsFactory : IGachaStatisticsFactory
         {
             // history
             HistoryWishes = historyWishBuilders
-                .Where(b => isEmptyHistoryWishVisible || (!b.IsEmpty))
+                .Where(b => appOptions.IsEmptyHistoryWishVisible || (!b.IsEmpty))
                 .OrderByDescending(builder => builder.From)
                 .ThenBy(builder => builder.ConfigType, GachaTypeComparer.Shared)
                 .Select(builder => builder.ToHistoryWish())

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

@@ -19,7 +19,7 @@ internal sealed class HutaoStatisticsFactory
     private readonly GachaEvent avatarEvent;
     private readonly GachaEvent avatarEvent2;
     private readonly GachaEvent weaponEvent;
-    private readonly GachaEvent chronicledEvent;
+    private readonly GachaEvent? chronicledEvent;
 
     public HutaoStatisticsFactory(in HutaoStatisticsFactoryMetadataContext context)
     {
@@ -32,7 +32,7 @@ internal sealed class HutaoStatisticsFactory
         avatarEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityAvatar);
         avatarEvent2 = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.SpecialActivityAvatar);
         weaponEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityWeapon);
-        chronicledEvent = context.GachaEvents.Single(g => g.From < now && g.To > now && g.Type == GachaType.ActivityCity);
+        chronicledEvent = context.GachaEvents.SingleOrDefault(g => g.From < now && g.To > now && g.Type == GachaType.ActivityCity);
     }
 
     public HutaoStatistics Create(GachaEventStatistics raw)
@@ -42,7 +42,7 @@ internal sealed class HutaoStatisticsFactory
             AvatarEvent = CreateWishSummary(avatarEvent, raw.AvatarEvent),
             AvatarEvent2 = CreateWishSummary(avatarEvent2, raw.AvatarEvent2),
             WeaponEvent = CreateWishSummary(weaponEvent, raw.WeaponEvent),
-            Chronicled = CreateWishSummary(chronicledEvent, raw.Chronicled),
+            Chronicled = chronicledEvent is null ? null : CreateWishSummary(chronicledEvent, raw.Chronicled),
         };
     }
 

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, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
+        HutaoException.ThrowIfNot(readOk, SH.ServiceGameUnlockerReadModuleMemoryCopyVirtualMemoryFailed);
 
         using (localMemory)
         {
             int offset = IndexOfPattern(localMemory.AsSpan()[(int)requiredGameModule.UnityPlayer.Size..]);
-            HutaoException.ThrowIfNot(offset >= 0, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerInterestedPatternNotFound);
+            HutaoException.ThrowIfNot(offset >= 0, 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, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerReadProcessMemoryPointerAddressFailed);
+        HutaoException.ThrowIfNot(result, 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, HutaoExceptionKind.GameFpsUnlockingFailed, "This Unlocker is invalid");
+        HutaoException.ThrowIfNot(context.IsUnlockerValid, "This Unlocker is invalid");
         (FindModuleResult result, RequiredGameModule gameModule) = await GameProcessModule.FindModuleAsync(context).ConfigureAwait(false);
-        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
-        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, HutaoExceptionKind.GameFpsUnlockingFailed, SH.ServiceGameUnlockerFindModuleNoModuleFound);
+        HutaoException.ThrowIfNot(result != FindModuleResult.TimeLimitExeeded, SH.ServiceGameUnlockerFindModuleTimeLimitExeeded);
+        HutaoException.ThrowIfNot(result != FindModuleResult.NoModuleFound, SH.ServiceGameUnlockerFindModuleNoModuleFound);
 
         GameFpsAddress.UnsafeFindFpsAddress(context, gameModule);
         context.Report();

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

@@ -1,12 +1,11 @@
 // 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<Announcement>> GetHutaoAnnouncementCollectionAsync(CancellationToken token = default);
+    ValueTask<ObservableCollection<Web.Hutao.HutaoAsAService.Announcement>> GetHutaoAnnouncementCollectionAsync(CancellationToken token = default);
 }

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

@@ -0,0 +1,11 @@
+// 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

@@ -0,0 +1,12 @@
+// 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

@@ -0,0 +1,12 @@
+// 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

@@ -0,0 +1,12 @@
+// 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

@@ -0,0 +1,9 @@
+// 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

@@ -0,0 +1,11 @@
+// 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

@@ -0,0 +1,11 @@
+// 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,6 +1,7 @@
 // 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;
@@ -18,19 +19,39 @@ internal static class MetadataServiceContextExtension
 
         // List
         {
-            if (context is IMetadataListMaterialSource listMaterialSource)
+            if (context is IMetadataListAchievementSource listAchievementSource)
             {
-                listMaterialSource.Materials = await metadataService.GetMaterialListAsync(token).ConfigureAwait(false);
+                listAchievementSource.Achievements = await metadataService.GetAchievementListAsync(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);
@@ -41,6 +62,21 @@ 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>> GetReliquaryLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
+    public static ValueTask<List<ReliquaryMainAffixLevel>> GetReliquaryMainAffixLevelListAsync(this IMetadataService metadataService, CancellationToken token = default)
     {
         return metadataService.FromCacheOrFileAsync<List<ReliquaryMainAffixLevel>>(FileNameReliquaryMainAffixLevel, token);
     }

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

@@ -16,31 +16,22 @@ internal sealed partial class SignInService : ISignInService
 
     public async ValueTask<ValueResult<bool, string>> ClaimRewardAsync(UserAndUid userAndUid, CancellationToken token = default)
     {
-        ISignInClient signInClient = serviceProvider
-            .GetRequiredService<IOverseaSupportFactory<ISignInClient>>()
-            .Create(userAndUid.User.IsOversea);
-
-        Response<Reward> rewardResponse = await signInClient.GetRewardAsync(userAndUid.User, token).ConfigureAwait(false);
-
-        if (rewardResponse.IsOk())
+        using (IServiceScope scope = serviceProvider.CreateScope())
         {
+            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))
-            {
-                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
+            if (!resultResponse.IsOk(showInfoBar: false))
             {
                 string message = resultResponse.Message;
 
@@ -56,10 +47,16 @@ internal sealed partial class SignInService : ISignInService
 
                 return new(false, SH.FormatServiceSignInClaimRewardFailedFormat(message));
             }
-        }
-        else
-        {
-            return new(false, SH.ServiceSignInRewardListRequestFailed);
+
+            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));
         }
     }
 }

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

@@ -21,8 +21,9 @@ 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;
 
@@ -76,54 +77,69 @@ internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordServi
     /// <inheritdoc/>
     public async ValueTask RefreshSpiralAbyssAsync(UserAndUid userAndUid)
     {
-        // request the index first
-        await gameRecordClientFactory
-            .Create(userAndUid.User.IsOversea)
-            .GetPlayerInfoAsync(userAndUid)
-            .ConfigureAwait(false);
+        using (IServiceScope scope = serviceScopeFactory.CreateScope())
+        {
+            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
 
-        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Last).ConfigureAwait(false);
-        await RefreshSpiralAbyssCoreAsync(userAndUid, SpiralAbyssSchedule.Current).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);
+        }
     }
 
     private async ValueTask RefreshSpiralAbyssCoreAsync(UserAndUid userAndUid, SpiralAbyssSchedule schedule)
     {
-        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response = await gameRecordClientFactory
-            .Create(userAndUid.User.IsOversea)
-            .GetSpiralAbyssAsync(userAndUid, schedule)
-            .ConfigureAwait(false);
-
-        if (response.IsOk())
+        Response<Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss> response;
+        using (IServiceScope scope = serviceScopeFactory.CreateScope())
         {
-            Web.Hoyolab.Takumi.GameRecord.SpiralAbyss.SpiralAbyss webSpiralAbyss = response.Data;
+            IOverseaSupportFactory<IGameRecordClient> gameRecordClientFactory = scope.ServiceProvider.GetRequiredService<IOverseaSupportFactory<IGameRecordClient>>();
 
-            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));
-            }
+            response = await gameRecordClientFactory
+                .Create(userAndUid.User.IsOversea)
+                .GetSpiralAbyssAsync(userAndUid, schedule)
+                .ConfigureAwait(false);
         }
+
+        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,6 +68,7 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return false;
         }
 
+        // TODO: sharing scope
         if (!await TrySetUserLTokenAsync(user, token).ConfigureAwait(false))
         {
             return false;
@@ -100,11 +101,17 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             return true;
         }
 
-        Response<LTokenWrapper> lTokenResponse = await serviceProvider
-            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-            .Create(user.IsOversea)
-            .GetLTokenBySTokenAsync(user.Entity, token)
-            .ConfigureAwait(false);
+        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);
+        }
 
         if (lTokenResponse.IsOk())
         {
@@ -131,11 +138,17 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
             }
         }
 
-        Response<UidCookieToken> cookieTokenResponse = await serviceProvider
-            .GetRequiredService<IOverseaSupportFactory<IPassportClient>>()
-            .Create(user.IsOversea)
-            .GetCookieAccountInfoBySTokenAsync(user.Entity, token)
-            .ConfigureAwait(false);
+        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);
+        }
 
         if (cookieTokenResponse.IsOk())
         {
@@ -157,11 +170,17 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserInfoAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<UserFullInfoWrapper> response = await serviceProvider
-            .GetRequiredService<IOverseaSupportFactory<IUserClient>>()
-            .Create(user.IsOversea)
-            .GetUserFullInfoAsync(user.Entity, token)
-            .ConfigureAwait(false);
+        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);
+        }
 
         if (response.IsOk())
         {
@@ -176,10 +195,16 @@ internal sealed partial class UserInitializationService : IUserInitializationSer
 
     private async ValueTask<bool> TrySetUserUserGameRolesAsync(ViewModel.User.User user, CancellationToken token)
     {
-        Response<ListWrapper<UserGameRole>> userGameRolesResponse = await serviceProvider
-            .GetRequiredService<BindingClient>()
-            .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
-            .ConfigureAwait(false);
+        Response<ListWrapper<UserGameRole>> userGameRolesResponse;
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            BindingClient bindingClient = scope.ServiceProvider
+                .GetRequiredService<BindingClient>();
+
+            userGameRolesResponse = await bindingClient
+                .GetUserGameRolesOverseaAwareAsync(user.Entity, token)
+                .ConfigureAwait(false);
+        }
 
         if (userGameRolesResponse.IsOk())
         {

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

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

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

@@ -35,11 +35,11 @@
     <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>
@@ -52,7 +52,7 @@
 	<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" />
@@ -205,7 +205,7 @@
     <None Remove="View\TitleView.xaml" />
     <None Remove="View\UserView.xaml" />
   </ItemGroup>
-  
+
   <!-- Analyzer Files -->
   <ItemGroup>
     <AdditionalFiles Include="CodeMetricsConfig.txt" />
@@ -220,7 +220,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" />
@@ -327,6 +327,10 @@
     <PackageReference Include="Snap.Hutao.Deployment.Runtime" Version="1.16.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+	<PackageReference Include="Snap.Hutao.Elevated.Launcher.Runtime" Version="1.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Snap.Hutao.SourceGeneration" Version="1.0.7">
       <PrivateAssets>all</PrivateAssets>
@@ -389,37 +393,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 +573,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 +621,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,9 +52,13 @@
                     Grid.Row="0"
                     HorizontalAlignment="Right"
                     Text="{Binding DisplayName}"/>
-                <Viewbox Grid.Row="1" StretchDirection="DownOnly">
+                <Viewbox
+                    Grid.Row="1"
+                    HorizontalAlignment="Left"
+                    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,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Control.Extension;
 
 namespace Snap.Hutao.View.Card;
 
@@ -15,7 +16,7 @@ internal sealed partial class AchievementCard : Button
     /// </summary>
     public AchievementCard()
     {
-        DataContext = Ioc.Default.GetRequiredService<ViewModel.Achievement.AchievementViewModelSlim>();
+        this.InitializeDataContext<ViewModel.Achievement.AchievementViewModelSlim>();
         InitializeComponent();
     }
 }

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

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

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

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

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

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

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, ImportStrategy>> GetImportStrategyAsync()
+    public async ValueTask<ValueResult<bool, ImportStrategyKind>> GetImportStrategyAsync()
     {
         await taskContext.SwitchToMainThreadAsync();
         ContentDialogResult result = await ShowAsync();
-        ImportStrategy strategy = (ImportStrategy)ImportModeSelector.SelectedIndex;
+        ImportStrategyKind strategy = (ImportStrategyKind)ImportModeSelector.SelectedIndex;
 
         return new(result == ContentDialogResult.Primary, strategy);
     }

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

@@ -14,7 +14,7 @@ internal sealed partial class GuideView : UserControl
 {
     public GuideView()
     {
+        this.InitializeDataContext<GuideViewModel>();
         InitializeComponent();
-        DataContext = this.ServiceProvider().GetRequiredService<GuideViewModel>();
     }
 }

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

@@ -2,6 +2,7 @@
 // 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;
@@ -23,12 +24,11 @@ internal sealed partial class MainView : UserControl
     {
         IServiceProvider serviceProvider = Ioc.Default;
 
-        MainViewModel mainViewModel = serviceProvider.GetRequiredService<MainViewModel>();
+        this.InitializeDataContext<MainViewModel>(serviceProvider);
 
-        DataContext = mainViewModel;
         InitializeComponent();
 
-        mainViewModel.Initialize(new BackgroundImagePresenterAccessor(BackgroundImagePresenter));
+        (DataContext as MainViewModel)?.Initialize(new BackgroundImagePresenterAccessor(BackgroundImagePresenter));
 
         navigationService = serviceProvider.GetRequiredService<INavigationService>();
         if (navigationService is INavigationInitialization navigationInitialization)

src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml

@@ -3,7 +3,8 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:cw="using:CommunityToolkit.WinUI"
-    xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
+    xmlns:cwcont="using:CommunityToolkit.WinUI.Controls"
+    xmlns:cwconv="using:CommunityToolkit.WinUI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -24,6 +25,11 @@
     </mxi:Interaction.Behaviors>
 
     <Page.Resources>
+        <cwconv:DoubleToObjectConverter x:Key="DoubleToOpacityConverter" GreaterThan="0">
+            <cwconv:DoubleToObjectConverter.TrueValue>1.0</cwconv:DoubleToObjectConverter.TrueValue>
+            <cwconv:DoubleToObjectConverter.FalseValue>0.4</cwconv:DoubleToObjectConverter.FalseValue>
+        </cwconv:DoubleToObjectConverter>
+
         <Flyout x:Key="HutaoCloudFlyout">
             <Grid>
                 <mxi:Interaction.Behaviors>
@@ -120,12 +126,12 @@
                             Style="{StaticResource SubtitleTextBlockStyle}"
                             Text="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudNotAllowed}"
                             TextAlignment="Center"/>
-                        <cwc:SettingsCard
+                        <cwcont:SettingsCard
                             Command="{Binding HutaoCloudViewModel.NavigateToSpiralAbyssRecordCommand}"
                             Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityDescription}"
                             Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudSpiralAbyssActivityHeader}"
                             IsClickEnabled="True"/>
-                        <cwc:SettingsCard
+                        <cwcont:SettingsCard
                             Command="{Binding HutaoCloudViewModel.NavigateToAfdianSkuCommand}"
                             Description="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseDescription}"
                             Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloudAfdianPurchaseHeader}"
@@ -210,6 +216,7 @@
                 <shvc:ItemIcon
                     Badge="{Binding Badge}"
                     Icon="{Binding Icon}"
+                    Opacity="{Binding Count, Converter={StaticResource DoubleToOpacityConverter}}"
                     Quality="{Binding Quality}"/>
                 <Border
                     HorizontalAlignment="Right"
@@ -328,14 +335,14 @@
                                                 HorizontalAlignment="Left"
                                                 cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
                                                 <Grid HorizontalAlignment="Center" Style="{StaticResource GridCardStyle}">
-                                                    <cwc:ConstrainedBox AspectRatio="1080:533">
+                                                    <cwcont:ConstrainedBox AspectRatio="1080:533">
                                                         <shci:CachedImage
                                                             HorizontalAlignment="Center"
                                                             VerticalAlignment="Center"
                                                             CornerRadius="{ThemeResource ControlCornerRadius}"
                                                             Source="{Binding SelectedHistoryWish.BannerImage}"
                                                             Stretch="UniformToFill"/>
-                                                    </cwc:ConstrainedBox>
+                                                    </cwcont:ConstrainedBox>
                                                     <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
                                                 </Grid>
                                             </Border>
@@ -468,24 +475,18 @@
                             Margin="16"
                             CornerRadius="{ThemeResource ControlCornerRadius}"
                             IsLoading="{Binding HutaoCloudStatisticsViewModel.IsInitialized, Converter={StaticResource BoolNegationConverter}}"/>
-                        <Grid
+                        <shcp:HorizontalEqualPanel
                             Margin="16"
-                            ColumnSpacing="16"
+                            Spacing="16"
                             Visibility="{Binding HutaoCloudStatisticsViewModel.IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
                             <mxi:Interaction.Behaviors>
                                 <shcb:InvokeCommandOnLoadedBehavior Command="{Binding HutaoCloudStatisticsViewModel.OpenUICommand}"/>
                             </mxi:Interaction.Behaviors>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                            </Grid.ColumnDefinitions>
-                            <shvc:HutaoStatisticsCard Grid.Column="0" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent}"/>
-                            <shvc:HutaoStatisticsCard Grid.Column="1" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent2}"/>
-                            <shvc:HutaoStatisticsCard Grid.Column="2" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.WeaponEvent}"/>
-                            <shvc:HutaoStatisticsCard Grid.Column="3" DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.Chronicled}"/>
-                        </Grid>
+                            <shvc:HutaoStatisticsCard DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent}"/>
+                            <shvc:HutaoStatisticsCard DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.AvatarEvent2}"/>
+                            <shvc:HutaoStatisticsCard DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.WeaponEvent}"/>
+                            <shvc:HutaoStatisticsCard DataContext="{Binding HutaoCloudStatisticsViewModel.Statistics.Chronicled}" Visibility="{Binding Converter={StaticResource EmptyObjectToVisibilityConverter}, FallbackValue=Collapsed}"/>
+                        </shcp:HorizontalEqualPanel>
                     </Grid>
                 </PivotItem>
             </Pivot>
@@ -507,35 +508,35 @@
                             Style="{StaticResource SubtitleTextBlockStyle}"
                             Text="{shcm:ResourceString Name=ViewPageGachaLogHint}"/>
                         <StackPanel Margin="0,24,0,0" Spacing="{StaticResource SettingsCardSpacing}">
-                            <cwc:SettingsCard
+                            <cwcont:SettingsCard
                                 ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"
                                 Command="{Binding RefreshBySTokenCommand}"
                                 Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshBySTokenDescription}"
                                 Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshBySToken}"
                                 HeaderIcon="{shcm:FontIcon Glyph=&#xE192;}"
                                 IsClickEnabled="True"/>
-                            <cwc:SettingsCard
+                            <cwcont:SettingsCard
                                 ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogRefreshAction}"
                                 Command="{Binding RefreshByWebCacheCommand}"
                                 Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCacheDescription}"
                                 Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByWebCache}"
                                 HeaderIcon="{shcm:FontIcon Glyph=&#xE81E;}"
                                 IsClickEnabled="True"/>
-                            <cwc:SettingsCard
+                            <cwcont:SettingsCard
                                 ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogInputAction}"
                                 Command="{Binding RefreshByManualInputCommand}"
                                 Description="{shcm:ResourceString Name=ViewPageGachaLogRefreshByManualInputDescription}"
                                 Header="{shcm:ResourceString Name=ViewPageGachaLogRefreshByManualInput}"
                                 HeaderIcon="{shcm:FontIcon Glyph=&#xE765;}"
                                 IsClickEnabled="True"/>
-                            <cwc:SettingsCard
+                            <cwcont:SettingsCard
                                 ActionIconToolTip="{shcm:ResourceString Name=ViewPageGachaLogImportAction}"
                                 Command="{Binding ImportFromUIGFJsonCommand}"
                                 Description="{shcm:ResourceString Name=ViewPageGachaLogImportDescription}"
                                 Header="{shcm:ResourceString Name=ViewPageGachaLogImportHeader}"
                                 HeaderIcon="{shcm:FontIcon Glyph=&#xE8B5;}"
                                 IsClickEnabled="True"/>
-                            <cwc:SettingsCard
+                            <cwcont:SettingsCard
                                 Description="{shcm:ResourceString Name=ViewPageGachaLogRecoverFromHutaoCloudDescription}"
                                 FlyoutBase.AttachedFlyout="{StaticResource HutaoCloudFlyout}"
                                 Header="{shcm:ResourceString Name=ViewPageGachaLogHutaoCloud}"
@@ -546,7 +547,7 @@
                                         <shcb:ShowAttachedFlyoutAction/>
                                     </mxic:EventTriggerBehavior>
                                 </mxi:Interaction.Behaviors>
-                            </cwc:SettingsCard>
+                            </cwcont:SettingsCard>
                         </StackPanel>
                     </StackPanel>
                 </Border>

src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml

@@ -559,6 +559,15 @@
                                         OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}"
                                         OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/>
                                 </cwc:SettingsCard>
+                                <cwc:SettingsCard
+                                    Description="{shcm:ResourceString Name=ViewPageSettingUnobtainedWishItemVisibleDescription}"
+                                    Header="{shcm:ResourceString Name=ViewPageSettingUnobtainedWishItemVisibleHeader}"
+                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE890;}">
+                                    <ToggleSwitch
+                                        IsOn="{Binding AppOptions.IsUnobtainedWishItemVisible, Mode=TwoWay}"
+                                        OffContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOff}"
+                                        OnContent="{shcm:ResourceString Name=ViewPageSettingEmptyHistoryVisibleOn}"/>
+                                </cwc:SettingsCard>
                             </StackPanel>
                         </Border>
                     </Border>

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

@@ -3,6 +3,7 @@
 
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Control.Extension;
 using Snap.Hutao.ViewModel;
 
 namespace Snap.Hutao.View;
@@ -15,7 +16,7 @@ internal sealed partial class TitleView : UserControl
 {
     public TitleView()
     {
-        DataContext = Ioc.Default.GetRequiredService<TitleViewModel>();
+        this.InitializeDataContext<TitleViewModel>();
         InitializeComponent();
     }
 

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

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

src/Snap.Hutao/Snap.Hutao/ViewModel/Abstraction/IPageScoped.cs

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

src/Snap.Hutao/Snap.Hutao/ViewModel/Abstraction/IViewModel.cs

@@ -7,7 +7,7 @@ namespace Snap.Hutao.ViewModel.Abstraction;
 /// 视图模型接口
 /// </summary>
 [HighQuality]
-internal interface IViewModel
+internal interface IViewModel : IPageScoped
 {
     /// <summary>
     /// 用于通知页面卸载的取消令牌

src/Snap.Hutao/Snap.Hutao/ViewModel/Abstraction/ViewModelSlim.cs

@@ -7,29 +7,16 @@ using Snap.Hutao.Service.Navigation;
 
 namespace Snap.Hutao.ViewModel.Abstraction;
 
-/// <summary>
-/// 简化的视图模型抽象类
-/// </summary>
 [ConstructorGenerated]
 internal abstract partial class ViewModelSlim : ObservableObject
 {
     private readonly IServiceProvider serviceProvider;
     private bool isInitialized;
 
-    /// <summary>
-    /// 是否初始化完成
-    /// </summary>
     public bool IsInitialized { get => isInitialized; set => SetProperty(ref isInitialized, value); }
 
-    /// <summary>
-    /// 服务提供器
-    /// </summary>
     protected IServiceProvider ServiceProvider { get => serviceProvider; }
 
-    /// <summary>
-    /// 打开界面执行
-    /// </summary>
-    /// <returns>任务</returns>
     [Command("OpenUICommand")]
     protected virtual Task OpenUIAsync()
     {
@@ -37,18 +24,10 @@ internal abstract partial class ViewModelSlim : ObservableObject
     }
 }
 
-/// <summary>
-/// 简化的视图模型抽象类
-/// 可导航
-/// </summary>
-/// <typeparam name="TPage">要导航到的页面类型</typeparam>
 [ConstructorGenerated(CallBaseConstructor = true)]
 internal abstract partial class ViewModelSlim<TPage> : ViewModelSlim
     where TPage : Page
 {
-    /// <summary>
-    /// 导航到指定的页面类型
-    /// </summary>
     [Command("NavigateCommand")]
     protected virtual void Navigate()
     {

src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementFinishPercent.cs

@@ -7,16 +7,9 @@ using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.ViewModel.Achievement;
 
-/// <summary>
-/// 成就完成进度
-/// </summary>
 [HighQuality]
 internal static class AchievementFinishPercent
 {
-    /// <summary>
-    /// 更新完成进度
-    /// </summary>
-    /// <param name="viewModel">视图模型</param>
     public static void Update(AchievementViewModel viewModel)
     {
         int totalFinished = 0;

src/Snap.Hutao/Snap.Hutao/ViewModel/Achievement/AchievementImporter.cs

@@ -89,7 +89,7 @@ internal sealed partial class AchievementImporter
 
         AchievementImportDialog importDialog = await dependencies.ContentDialogFactory
             .CreateInstanceAsync<AchievementImportDialog>(uiaf).ConfigureAwait(false);
-        (bool isOk, ImportStrategy strategy) = await importDialog.GetImportStrategyAsync().ConfigureAwait(false);
+        (bool isOk, ImportStrategyKind strategy) = await importDialog.GetImportStrategyAsync().ConfigureAwait(false);
 
         if (!isOk)
         {