Merge pull request #1701 from DGP-Studio/develop

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

@@ -1,51 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using CommunityToolkit.WinUI.Behaviors;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Snap.Hutao.Control.Behavior;
-
-[SuppressMessage("", "CA1001")]
-[DependencyProperty("MilliSecondsDelay", typeof(int))]
-internal sealed partial class InfoBarDelayCloseBehavior : BehaviorBase<InfoBar>
-{
-    private readonly CancellationTokenSource closeTokenSource = new();
-
-    protected override void OnAssociatedObjectLoaded()
-    {
-        AssociatedObject.Closed += OnInfoBarClosed;
-        if (MilliSecondsDelay > 0)
-        {
-            DelayCoreAsync().SafeForget();
-        }
-    }
-
-    private async ValueTask DelayCoreAsync()
-    {
-        try
-        {
-            await Task.Delay(MilliSecondsDelay, closeTokenSource.Token).ConfigureAwait(true);
-        }
-        catch
-        {
-            return;
-        }
-
-        if (AssociatedObject is not null)
-        {
-            AssociatedObject.IsOpen = false;
-        }
-    }
-
-    private void OnInfoBarClosed(InfoBar infoBar, InfoBarClosedEventArgs args)
-    {
-        if (args.Reason is InfoBarCloseReason.CloseButton)
-        {
-            closeTokenSource.Cancel();
-        }
-
-        AssociatedObject.Closed -= OnInfoBarClosed;
-    }
-}

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

@@ -1,15 +1,10 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Media.Imaging;
 using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.Caching;
 using Snap.Hutao.Core.ExceptionService;
-using Snap.Hutao.Core.IO.DataTransfer;
-using System.IO;
 using System.Runtime.InteropServices;
-using Windows.Graphics.Imaging;
-using Windows.Storage.Streams;
 
 namespace Snap.Hutao.Control.Image;
 
@@ -17,12 +12,8 @@ namespace Snap.Hutao.Control.Image;
 /// 缓存图像
 /// </summary>
 [HighQuality]
-[DependencyProperty("SourceName", typeof(string), "Unknown")]
-[DependencyProperty("CachedName", typeof(string), "Unknown")]
-internal sealed partial class CachedImage : Implementation.ImageEx
+internal sealed class CachedImage : Implementation.ImageEx
 {
-    private string? file;
-
     /// <summary>
     /// 构造一个新的缓存图像
     /// </summary>
@@ -35,15 +26,12 @@ internal sealed partial class CachedImage : Implementation.ImageEx
     /// <inheritdoc/>
     protected override async Task<Uri?> ProvideCachedResourceAsync(Uri imageUri, CancellationToken token)
     {
-        SourceName = Path.GetFileName(imageUri.ToString());
         IImageCache imageCache = this.ServiceProvider().GetRequiredService<IImageCache>();
 
         try
         {
             HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
             string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
-            CachedName = Path.GetFileName(file);
-            this.file = file;
             token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
             return file.ToUri();
         }
@@ -54,27 +42,4 @@ internal sealed partial class CachedImage : Implementation.ImageEx
             return default;
         }
     }
-
-    [Command("CopyToClipboardCommand")]
-    private async Task CopyToClipboard()
-    {
-        if (Image is Microsoft.UI.Xaml.Controls.Image { Source: BitmapImage bitmap })
-        {
-            using (FileStream netStream = File.OpenRead(bitmap.UriSource.LocalPath))
-            {
-                using (IRandomAccessStream fxStream = netStream.AsRandomAccessStream())
-                {
-                    BitmapDecoder decoder = await BitmapDecoder.CreateAsync(fxStream);
-                    SoftwareBitmap softwareBitmap = await decoder.GetSoftwareBitmapAsync(BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied);
-                    using (InMemoryRandomAccessStream memory = new())
-                    {
-                        BitmapEncoder encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.BmpEncoderId, memory);
-                        encoder.SetSoftwareBitmap(softwareBitmap);
-                        await encoder.FlushAsync();
-                        Ioc.Default.GetRequiredService<IClipboardProvider>().SetBitmap(memory);
-                    }
-                }
-            }
-        }
-    }
-}
+}

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

@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:shci="using:Snap.Hutao.Control.Image">
@@ -14,13 +14,6 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                        <Grid.ContextFlyout>
-                            <MenuFlyout>
-                                <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding SourceName}"/>
-                                <MenuFlyoutItem IsEnabled="False" Text="{TemplateBinding CachedName}"/>
-                                <MenuFlyoutItem Command="{Binding CopyToClipboardCommand, RelativeSource={RelativeSource TemplatedParent}}" Text="复制图像"/>
-                            </MenuFlyout>
-                        </Grid.ContextFlyout>
                         <Image
                             Name="PlaceholderImage"
                             Margin="{TemplateBinding PlaceholderMargin}"

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

@@ -5,6 +5,7 @@ using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
 using Microsoft.UI.Xaml.Navigation;
+using Snap.Hutao.Core.Abstraction;
 using Snap.Hutao.Service.Navigation;
 using Snap.Hutao.View.Helper;
 using Snap.Hutao.ViewModel.Abstraction;

src/Snap.Hutao/Snap.Hutao/Control/Selector/InfoBarTemplateSelector.cs

@@ -1,25 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Service.Notification;
-
-namespace Snap.Hutao.Control.Selector;
-
-internal sealed class InfoBarTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate ActionButtonEnabled { get; set; } = default!;
-
-    public DataTemplate ActionButtonDisabled { get; set; } = default!;
-
-    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-    {
-        if (item is InfoBarOptions { ActionButtonContent: { }, ActionButtonCommand: { } })
-        {
-            return ActionButtonEnabled;
-        }
-
-        return ActionButtonDisabled;
-    }
-}

src/Snap.Hutao/Snap.Hutao/Control/SizeRestrictedContentControl.cs

@@ -21,8 +21,8 @@ internal sealed partial class SizeRestrictedContentControl : ContentControl
             element.Measure(availableSize);
             Size contentDesiredSize = element.DesiredSize;
             Size contentActualOrDesiredSize = new(
-                Math.Min(Math.Max(element.ActualWidth, contentDesiredSize.Width), availableSize.Width),
-                Math.Min(Math.Max(element.ActualHeight, contentDesiredSize.Height), availableSize.Height));
+                Math.Max(element.ActualWidth, contentDesiredSize.Width),
+                Math.Max(element.ActualHeight, contentDesiredSize.Height));
 
             if (IsWidthRestricted)
             {

src/Snap.Hutao/Snap.Hutao/Core/IO/Http/Proxy/HttpProxyUsingSystemProxy.cs

@@ -3,6 +3,7 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using Snap.Hutao.Win32.Registry;
+using System.Linq.Expressions;
 using System.Net;
 using System.Reflection;
 

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

@@ -56,39 +56,30 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
     /// <inheritdoc/>
     public void PostInitialization()
     {
-        RunPostInitializationAsync().SafeForget();
+        serviceProvider.GetRequiredService<PrivateNamedPipeServer>().RunAsync().SafeForget();
+        ToastNotificationManagerCompat.OnActivated += NotificationActivate;
 
-        async ValueTask RunPostInitializationAsync()
+        using (activateSemaphore.Enter())
         {
-            await taskContext.SwitchToBackgroundAsync();
+            // TODO: Introduced in 1.10.2, remove in later version
+            serviceProvider.GetRequiredService<IJumpListInterop>().ClearAsync().SafeForget();
+            serviceProvider.GetRequiredService<IScheduleTaskInterop>().UnregisterAllTasks();
 
-            serviceProvider.GetRequiredService<PrivateNamedPipeServer>().RunAsync().SafeForget();
-            ToastNotificationManagerCompat.OnActivated += NotificationActivate;
-
-            using (await activateSemaphore.EnterAsync().ConfigureAwait(false))
+            if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
             {
-                // TODO: Introduced in 1.10.2, remove in later version
-                serviceProvider.GetRequiredService<IJumpListInterop>().ClearAsync().SafeForget();
-                serviceProvider.GetRequiredService<IScheduleTaskInterop>().UnregisterAllTasks();
-
-                if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
-                {
-                    return;
-                }
-
-                serviceProvider.GetRequiredService<HotKeyOptions>().RegisterAll();
-
-                if (serviceProvider.GetRequiredService<AppOptions>().IsNotifyIconEnabled)
-                {
-                    XamlLifetime.ApplicationLaunchedWithNotifyIcon = true;
-
-                    await taskContext.SwitchToMainThreadAsync();
-                    serviceProvider.GetRequiredService<App>().DispatcherShutdownMode = DispatcherShutdownMode.OnExplicitShutdown;
-                    _ = serviceProvider.GetRequiredService<NotifyIconController>();
-                }
-
-                serviceProvider.GetRequiredService<IQuartzService>().StartAsync(default).SafeForget();
+                return;
             }
+
+            serviceProvider.GetRequiredService<HotKeyOptions>().RegisterAll();
+
+            if (serviceProvider.GetRequiredService<AppOptions>().IsNotifyIconEnabled)
+            {
+                XamlLifetime.ApplicationLaunchedWithNotifyIcon = true;
+                serviceProvider.GetRequiredService<App>().DispatcherShutdownMode = DispatcherShutdownMode.OnExplicitShutdown;
+                _ = serviceProvider.GetRequiredService<NotifyIconController>();
+            }
+
+            serviceProvider.GetRequiredService<IQuartzService>().StartAsync(default).SafeForget();
         }
     }
 
@@ -149,8 +140,6 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi
 
     private async ValueTask HandleActivationAsync(HutaoActivationArguments args)
     {
-        await taskContext.SwitchToBackgroundAsync();
-
         if (activateSemaphore.CurrentCount > 0)
         {
             using (await activateSemaphore.EnterAsync().ConfigureAwait(false))

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

@@ -199,13 +199,6 @@ internal static partial class EnumerableExtension
         return list;
     }
 
-    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static List<TSource> SortBy<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, Comparison<TKey> comparison)
-    {
-        list.Sort((left, right) => comparison(keySelector(left), keySelector(right)));
-        return list;
-    }
-
     [MethodImpl(MethodImplOptions.AggressiveOptimization)]
     public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector)
         where TKey : IComparable
@@ -220,11 +213,4 @@ internal static partial class EnumerableExtension
         list.Sort((left, right) => comparer.Compare(keySelector(right), keySelector(left)));
         return list;
     }
-
-    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-    public static List<TSource> SortByDescending<TSource, TKey>(this List<TSource> list, Func<TSource, TKey> keySelector, Comparison<TKey> comparison)
-    {
-        list.Sort((left, right) => comparison(keySelector(right), keySelector(left)));
-        return list;
-    }
 }

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

@@ -12,8 +12,7 @@ namespace Snap.Hutao.Model.Entity;
 /// </summary>
 [HighQuality]
 [Table("inventory_items")]
-internal sealed class InventoryItem : IDbMappingForeignKeyFrom<InventoryItem, uint>,
-    IDbMappingForeignKeyFrom<InventoryItem, uint, uint>
+internal sealed class InventoryItem : IDbMappingForeignKeyFrom<InventoryItem, uint>
 {
     /// <summary>
     /// 内部Id
@@ -57,21 +56,4 @@ internal sealed class InventoryItem : IDbMappingForeignKeyFrom<InventoryItem, ui
             ItemId = itemId,
         };
     }
-
-    /// <summary>
-    /// 构造一个新的个数不为0的物品
-    /// </summary>
-    /// <param name="projectId">项目Id</param>
-    /// <param name="itemId">物品Id</param>
-    /// <param name="count">物品个数</param>
-    /// <returns>新的个数不为0的物品</returns>
-    public static InventoryItem From(in Guid projectId, in uint itemId, in uint count)
-    {
-        return new()
-        {
-            ProjectId = projectId,
-            ItemId = itemId,
-            Count = count,
-        };
-    }
 }

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

@@ -13,7 +13,7 @@ namespace Snap.Hutao.Model.InterChange.GachaLog;
 /// UIGF物品
 /// </summary>
 [HighQuality]
-internal sealed class UIGFItem : GachaLogItem, IMappingFrom<UIGFItem, GachaItem, INameQualityAccess>
+internal sealed class UIGFItem : GachaLogItem, IMappingFrom<UIGFItem, GachaItem, INameQuality>
 {
     /// <summary>
     /// 额外祈愿映射
@@ -22,7 +22,7 @@ internal sealed class UIGFItem : GachaLogItem, IMappingFrom<UIGFItem, GachaItem,
     [JsonEnum(JsonSerializeType.NumberString)]
     public GachaType UIGFGachaType { get; set; } = default!;
 
-    public static UIGFItem From(GachaItem item, INameQualityAccess nameQuality)
+    public static UIGFItem From(GachaItem item, INameQuality nameQuality)
     {
         return new()
         {

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

@@ -1,13 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Snap.Hutao.Model.Primitive;
-
-namespace Snap.Hutao.Model.Metadata.Abstraction;
-
-internal interface ICultivationItemsAccess
-{
-    string Name { get; }
-
-    List<MaterialId> CultivationItems { get; }
-}

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

@@ -3,7 +3,7 @@
 
 namespace Snap.Hutao.Model.Metadata.Abstraction;
 
-internal interface IItemConvertible
+internal interface IItemSource
 {
     Model.Item ToItem();
 }

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

@@ -9,7 +9,7 @@ namespace Snap.Hutao.Model.Metadata.Abstraction;
 /// 物品与星级
 /// </summary>
 [HighQuality]
-internal interface INameQualityAccess
+internal interface INameQuality
 {
     /// <summary>
     /// 名称

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

@@ -9,7 +9,7 @@ namespace Snap.Hutao.Model.Metadata.Abstraction;
 /// 指示该类为统计物品的源
 /// </summary>
 [HighQuality]
-internal interface IStatisticsItemConvertible
+internal interface IStatisticsItemSource
 {
     /// <summary>
     /// 转换到统计物品

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

@@ -10,9 +10,19 @@ namespace Snap.Hutao.Model.Metadata.Abstraction;
 /// 指示该类为简述统计物品的源
 /// </summary>
 [HighQuality]
-internal interface ISummaryItemConvertible
+internal interface ISummaryItemSource
 {
+    /// <summary>
+    /// 星级
+    /// </summary>
     QualityType Quality { get; }
 
+    /// <summary>
+    /// 转换到简述统计物品
+    /// </summary>
+    /// <param name="lastPull">距上个五星</param>
+    /// <param name="time">时间</param>
+    /// <param name="isUp">是否为Up物品</param>
+    /// <returns>简述统计物品</returns>
     SummaryItem ToSummaryItem(int lastPull, in DateTimeOffset time, bool isUp);
 }

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

@@ -0,0 +1,99 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Calculable;
+using Snap.Hutao.Model.Metadata.Abstraction;
+using Snap.Hutao.Model.Metadata.Converter;
+using Snap.Hutao.Model.Metadata.Item;
+using Snap.Hutao.ViewModel.Complex;
+using Snap.Hutao.ViewModel.GachaLog;
+using Snap.Hutao.ViewModel.Wiki;
+
+namespace Snap.Hutao.Model.Metadata.Avatar;
+
+/// <summary>
+/// 角色的接口实现部分
+/// </summary>
+internal partial class Avatar : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableAvatar>
+{
+    /// <summary>
+    /// [非元数据] 搭配数据
+    /// TODO:Add View suffix.
+    /// </summary>
+    [JsonIgnore]
+    public AvatarCollocationView? Collocation { get; set; }
+
+    /// <summary>
+    /// [非元数据] 烹饪奖励
+    /// </summary>
+    [JsonIgnore]
+    public CookBonusView? CookBonusView { get; set; }
+
+    /// <summary>
+    /// [非元数据] 养成物品视图
+    /// </summary>
+    [JsonIgnore]
+    public List<Material>? CultivationItemsView { get; set; }
+
+    /// <summary>
+    /// 最大等级
+    /// </summary>
+    [SuppressMessage("", "CA1822")]
+    public uint MaxLevel { get => GetMaxLevel(); }
+
+    public static uint GetMaxLevel()
+    {
+        return 90U;
+    }
+
+    /// <inheritdoc/>
+    public ICalculableAvatar ToCalculable()
+    {
+        return CalculableAvatar.From(this);
+    }
+
+    /// <summary>
+    /// 转换为基础物品
+    /// </summary>
+    /// <returns>基础物品</returns>
+    public Model.Item ToItem()
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
+            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
+            Quality = Quality,
+        };
+    }
+
+    /// <inheritdoc/>
+    public StatisticsItem ToStatisticsItem(int count)
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
+            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
+            Quality = Quality,
+
+            Count = count,
+        };
+    }
+
+    /// <inheritdoc/>
+    public SummaryItem ToSummaryItem(int lastPull, in DateTimeOffset time, bool isUp)
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = AvatarIconConverter.IconNameToUri(Icon),
+            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
+            Quality = Quality,
+
+            Time = time,
+            LastPull = lastPull,
+            IsUp = isUp,
+        };
+    }
+}

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

@@ -1,118 +1,99 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Calculable;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Abstraction;
-using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.Complex;
-using Snap.Hutao.ViewModel.GachaLog;
-using Snap.Hutao.ViewModel.Wiki;
 
 namespace Snap.Hutao.Model.Metadata.Avatar;
 
+/// <summary>
+/// 角色
+/// </summary>
 [HighQuality]
-internal partial class Avatar : INameQualityAccess,
-    IStatisticsItemConvertible,
-    ISummaryItemConvertible,
-    IItemConvertible,
-    ICalculableSource<ICalculableAvatar>,
-    ICultivationItemsAccess
+internal partial class Avatar
 {
+    /// <summary>
+    /// Id
+    /// </summary>
     public AvatarId Id { get; set; }
 
+    /// <summary>
+    /// 突破提升 Id 外键
+    /// </summary>
     public PromoteId PromoteId { get; set; }
 
+    /// <summary>
+    /// 排序号
+    /// </summary>
     public uint Sort { get; set; }
 
+    /// <summary>
+    /// 体型
+    /// </summary>
     public BodyType Body { get; set; } = default!;
 
+    /// <summary>
+    /// 正面图标
+    /// </summary>
     public string Icon { get; set; } = default!;
 
+    /// <summary>
+    /// 侧面图标
+    /// </summary>
     public string SideIcon { get; set; } = default!;
 
+    /// <summary>
+    /// 名称
+    /// </summary>
     public string Name { get; set; } = default!;
 
+    /// <summary>
+    /// 描述
+    /// </summary>
     public string Description { get; set; } = default!;
 
+    /// <summary>
+    /// 角色加入游戏时间
+    /// </summary>
     public DateTimeOffset BeginTime { get; set; }
 
+    /// <summary>
+    /// 星级
+    /// </summary>
     public QualityType Quality { get; set; }
 
+    /// <summary>
+    /// 武器类型
+    /// </summary>
     public WeaponType Weapon { get; set; }
 
+    /// <summary>
+    /// 基础数值
+    /// </summary>
     public AvatarBaseValue BaseValue { get; set; } = default!;
 
+    /// <summary>
+    /// 生长曲线
+    /// </summary>
     public List<TypeValue<FightProperty, GrowCurveType>> GrowCurves { get; set; } = default!;
 
+    /// <summary>
+    /// 技能
+    /// </summary>
     public SkillDepot SkillDepot { get; set; } = default!;
 
+    /// <summary>
+    /// 好感信息/基本信息
+    /// </summary>
     public FetterInfo FetterInfo { get; set; } = default!;
 
+    /// <summary>
+    /// 皮肤
+    /// </summary>
     public List<Costume> Costumes { get; set; } = default!;
 
+    /// <summary>
+    /// 养成物品
+    /// </summary>
     public List<MaterialId> CultivationItems { get; set; } = default!;
-
-    [JsonIgnore]
-    public AvatarCollocationView? CollocationView { get; set; }
-
-    [JsonIgnore]
-    public CookBonusView? CookBonusView { get; set; }
-
-    [JsonIgnore]
-    public List<Material>? CultivationItemsView { get; set; }
-
-    [SuppressMessage("", "CA1822")]
-    public uint MaxLevel { get => GetMaxLevel(); }
-
-    public static uint GetMaxLevel()
-    {
-        return 90U;
-    }
-
-    public ICalculableAvatar ToCalculable()
-    {
-        return CalculableAvatar.From(this);
-    }
-
-    public Model.Item ToItem()
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = AvatarIconConverter.IconNameToUri(Icon),
-            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
-            Quality = Quality,
-        };
-    }
-
-    public StatisticsItem ToStatisticsItem(int count)
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = AvatarIconConverter.IconNameToUri(Icon),
-            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
-            Quality = Quality,
-
-            Count = count,
-        };
-    }
-
-    public SummaryItem ToSummaryItem(int lastPull, in DateTimeOffset time, bool isUp)
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = AvatarIconConverter.IconNameToUri(Icon),
-            Badge = ElementNameIconConverter.ElementNameToIconUri(FetterInfo.VisionBefore),
-            Quality = Quality,
-
-            Time = time,
-            LastPull = lastPull,
-            IsUp = isUp,
-        };
-    }
 }

src/Snap.Hutao/Snap.Hutao/Model/Metadata/Weapon/Weapon.Implementation.cs

@@ -0,0 +1,107 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Model.Calculable;
+using Snap.Hutao.Model.Intrinsic;
+using Snap.Hutao.Model.Metadata.Abstraction;
+using Snap.Hutao.Model.Metadata.Converter;
+using Snap.Hutao.Model.Metadata.Item;
+using Snap.Hutao.ViewModel.Complex;
+using Snap.Hutao.ViewModel.GachaLog;
+
+namespace Snap.Hutao.Model.Metadata.Weapon;
+
+/// <summary>
+/// 武器的接口实现
+/// </summary>
+internal sealed partial class Weapon : IStatisticsItemSource, ISummaryItemSource, IItemSource, INameQuality, ICalculableSource<ICalculableWeapon>
+{
+    /// <summary>
+    /// [非元数据] 搭配数据
+    /// TODO:Add View suffix.
+    /// </summary>
+    [JsonIgnore]
+    public WeaponCollocationView? Collocation { get; set; }
+
+    /// <summary>
+    /// [非元数据] 养成物品视图
+    /// </summary>
+    [JsonIgnore]
+    public List<Material>? CultivationItemsView { get; set; }
+
+    /// <inheritdoc cref="INameQuality.Quality" />
+    [JsonIgnore]
+    public QualityType Quality
+    {
+        get => RankLevel;
+    }
+
+    /// <summary>
+    /// 最大等级
+    /// </summary>
+    internal uint MaxLevel { get => GetMaxLevelByQuality(Quality); }
+
+    public static uint GetMaxLevelByQuality(QualityType quality)
+    {
+        return quality >= QualityType.QUALITY_BLUE ? 90U : 70U;
+    }
+
+    /// <inheritdoc/>
+    public ICalculableWeapon ToCalculable()
+    {
+        return CalculableWeapon.From(this);
+    }
+
+    /// <summary>
+    /// 转换为基础物品
+    /// </summary>
+    /// <returns>基础物品</returns>
+    public Model.Item ToItem()
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = EquipIconConverter.IconNameToUri(Icon),
+            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
+            Quality = RankLevel,
+        };
+    }
+
+    /// <summary>
+    /// 转换到统计物品
+    /// </summary>
+    /// <param name="count">个数</param>
+    /// <returns>统计物品</returns>
+    public StatisticsItem ToStatisticsItem(int count)
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = EquipIconConverter.IconNameToUri(Icon),
+            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
+            Quality = RankLevel,
+            Count = count,
+        };
+    }
+
+    /// <summary>
+    /// 转换到简述统计物品
+    /// </summary>
+    /// <param name="lastPull">距上个五星</param>
+    /// <param name="time">时间</param>
+    /// <param name="isUp">是否为Up物品</param>
+    /// <returns>简述统计物品</returns>
+    public SummaryItem ToSummaryItem(int lastPull, in DateTimeOffset time, bool isUp)
+    {
+        return new()
+        {
+            Name = Name,
+            Icon = EquipIconConverter.IconNameToUri(Icon),
+            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
+            Time = time,
+            Quality = RankLevel,
+            LastPull = lastPull,
+            IsUp = isUp,
+        };
+    }
+}

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

@@ -1,107 +1,69 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Calculable;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Abstraction;
-using Snap.Hutao.Model.Metadata.Converter;
-using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.ViewModel.Complex;
-using Snap.Hutao.ViewModel.GachaLog;
 
 namespace Snap.Hutao.Model.Metadata.Weapon;
 
+/// <summary>
+/// 武器
+/// </summary>
 [HighQuality]
-internal sealed partial class Weapon : INameQualityAccess,
-    IStatisticsItemConvertible,
-    ISummaryItemConvertible,
-    IItemConvertible,
-    ICalculableSource<ICalculableWeapon>,
-    ICultivationItemsAccess
+internal sealed partial class Weapon
 {
+    /// <summary>
+    /// Id
+    /// </summary>
     public WeaponId Id { get; set; }
 
+    /// <summary>
+    /// 突破 Id
+    /// </summary>
     public PromoteId PromoteId { get; set; }
 
-    public uint Sort { get; set; }
-
+    /// <summary>
+    /// 武器类型
+    /// </summary>
     public WeaponType WeaponType { get; set; }
 
+    /// <summary>
+    /// 等级
+    /// </summary>
     public QualityType RankLevel { get; set; }
 
+    /// <summary>
+    /// 名称
+    /// </summary>
     public string Name { get; set; } = default!;
 
+    /// <summary>
+    /// 描述
+    /// </summary>
     public string Description { get; set; } = default!;
 
+    /// <summary>
+    /// 图标
+    /// </summary>
     public string Icon { get; set; } = default!;
 
+    /// <summary>
+    /// 觉醒图标
+    /// </summary>
     public string AwakenIcon { get; set; } = default!;
 
+    /// <summary>
+    /// 生长曲线
+    /// </summary>
     public List<WeaponTypeValue> GrowCurves { get; set; } = default!;
 
+    /// <summary>
+    /// 被动信息, 无被动的武器为 <see langword="null"/>
+    /// </summary>
     public NameDescriptions? Affix { get; set; } = default!;
 
+    /// <summary>
+    /// 养成物品
+    /// </summary>
     public List<MaterialId> CultivationItems { get; set; } = default!;
-
-    [JsonIgnore]
-    public WeaponCollocationView? CollocationView { get; set; }
-
-    [JsonIgnore]
-    public List<Material>? CultivationItemsView { get; set; }
-
-    [JsonIgnore]
-    public QualityType Quality
-    {
-        get => RankLevel;
-    }
-
-    internal uint MaxLevel { get => GetMaxLevelByQuality(Quality); }
-
-    public static uint GetMaxLevelByQuality(QualityType quality)
-    {
-        return quality >= QualityType.QUALITY_BLUE ? 90U : 70U;
-    }
-
-    public ICalculableWeapon ToCalculable()
-    {
-        return CalculableWeapon.From(this);
-    }
-
-    public Model.Item ToItem()
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = EquipIconConverter.IconNameToUri(Icon),
-            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
-            Quality = RankLevel,
-        };
-    }
-
-    public StatisticsItem ToStatisticsItem(int count)
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = EquipIconConverter.IconNameToUri(Icon),
-            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
-            Quality = RankLevel,
-            Count = count,
-        };
-    }
-
-    public SummaryItem ToSummaryItem(int lastPull, in DateTimeOffset time, bool isUp)
-    {
-        return new()
-        {
-            Name = Name,
-            Icon = EquipIconConverter.IconNameToUri(Icon),
-            Badge = WeaponTypeIconConverter.WeaponTypeToIconUri(WeaponType),
-            Time = time,
-            Quality = RankLevel,
-            LastPull = lastPull,
-            IsUp = isUp,
-        };
-    }
 }

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

@@ -552,10 +552,10 @@
     <value>精炼 {0} 阶</value>
   </data>
   <data name="MustSelectUserAndUid" xml:space="preserve">
-    <value>必须登录 米游社 / HoYoLAB 并选择一个用户与角色</value>
+    <value>必须登录 米游社/HoYoLAB 并选择一个用户与角色</value>
   </data>
   <data name="ServerGachaLogServiceDeleteEntrySucceed" xml:space="preserve">
-    <value>删除了 UID：{0} 的 {1} 条祈愿记录</value>
+    <value>删除了 Uid：{0} 的 {1} 条祈愿记录</value>
   </data>
   <data name="ServerGachaLogServiceInsufficientRecordSlot" xml:space="preserve">
     <value>胡桃云保存的祈愿记录存档数已达当前账号上限</value>
@@ -570,7 +570,7 @@
     <value>数据异常，无法保存至云端，请勿跨账号上传或尝试删除云端数据后重试</value>
   </data>
   <data name="ServerGachaLogServiceUploadEntrySucceed" xml:space="preserve">
-    <value>上传了 UID：{0} 的 {1} 条祈愿记录，存储了 {2} 条</value>
+    <value>上传了 Uid：{0} 的 {1} 条祈愿记录，存储了 {2} 条</value>
   </data>
   <data name="ServerPassportLoginRequired" xml:space="preserve">
     <value>请先登录或注册胡桃账号</value>
@@ -621,7 +621,7 @@
     <value>验证请求过快，请 1 分钟后再试</value>
   </data>
   <data name="ServerRecordBannedUid" xml:space="preserve">
-    <value>上传深渊记录失败，当前 UID 已被胡桃数据库封禁</value>
+    <value>上传深渊记录失败，当前 Uid 已被胡桃数据库封禁</value>
   </data>
   <data name="ServerRecordComputingStatistics" xml:space="preserve">
     <value>上传深渊记录失败，正在计算统计数据</value>
@@ -636,13 +636,13 @@
     <value>上传深渊记录失败，存在无效的数据</value>
   </data>
   <data name="ServerRecordInvalidUid" xml:space="preserve">
-    <value>无效的 UID</value>
+    <value>无效的 Uid</value>
   </data>
   <data name="ServerRecordNotCurrentSchedule" xml:space="preserve">
     <value>上传深渊记录失败，不是本期数据</value>
   </data>
   <data name="ServerRecordPreviousRequestNotCompleted" xml:space="preserve">
-    <value>上传深渊记录失败，当前 UID 的记录仍在处理中，请勿重复操作</value>
+    <value>上传深渊记录失败，当前 Uid 的记录仍在处理中，请勿重复操作</value>
   </data>
   <data name="ServerRecordUploadSuccessAndGachaLogServiceTimeExtended" xml:space="preserve">
     <value>上传深渊记录成功，获赠祈愿记录上传服务时长</value>
@@ -1545,10 +1545,10 @@
     <value>养成计划添加失败</value>
   </data>
   <data name="ViewModelCultivationBatchAddCompletedFormat" xml:space="preserve">
-    <value>操作完成：添加 / 更新：{0} 个，跳过 {1} 个</value>
+    <value>操作完成：添加/更新：{0} 个，跳过 {1} 个</value>
   </data>
   <data name="ViewModelCultivationBatchAddIncompletedFormat" xml:space="preserve">
-    <value>操作未全部完成：添加 / 更新：{0} 个，跳过 {1} 个</value>
+    <value>操作未全部完成：添加/更新：{0} 个，跳过 {1} 个</value>
   </data>
   <data name="ViewModelCultivationEntryAddSuccess" xml:space="preserve">
     <value>已成功添加至当前养成计划</value>
@@ -1568,9 +1568,6 @@
   <data name="ViewModelCultivationProjectInvalidName" xml:space="preserve">
     <value>不能添加名称无效的计划</value>
   </data>
-  <data name="ViewModelCultivationRefreshInventoryProgress" xml:space="preserve">
-    <value>正在同步背包物品</value>
-  </data>
   <data name="ViewModelCultivationRemoveProjectContent" xml:space="preserve">
     <value>此操作不可逆，此计划的养成物品与背包材料将会丢失</value>
   </data>
@@ -1928,9 +1925,6 @@
   <data name="ViewPageCultivationNavigateAction" xml:space="preserve">
     <value>前往</value>
   </data>
-  <data name="ViewPageCultivationRefreshInventory" xml:space="preserve">
-    <value>同步背包物品</value>
-  </data>
   <data name="ViewPageCultivationRemoveEntry" xml:space="preserve">
     <value>删除清单</value>
   </data>
@@ -2073,10 +2067,10 @@
     <value>前往爱发电购买相关服务</value>
   </data>
   <data name="ViewPageGachaLogHutaoCloudAfdianPurchaseHeader" xml:space="preserve">
-    <value>购买 / 续费云服务</value>
+    <value>购买/续费云服务</value>
   </data>
   <data name="ViewPageGachaLogHutaoCloudDelete" xml:space="preserve">
-    <value>删除此 UID 的云端存档</value>
+    <value>删除此 Uid 的云端存档</value>
   </data>
   <data name="ViewPageGachaLogHutaoCloudDeveloperHint" xml:space="preserve">
     <value>开发者账号无视服务到期时间</value>
@@ -2085,7 +2079,7 @@
     <value>胡桃云服务时长不足</value>
   </data>
   <data name="ViewPageGachaLogHutaoCloudRetrieve" xml:space="preserve">
-    <value>下载此 UID 的云端存档</value>
+    <value>下载此 Uid 的云端存档</value>
   </data>
   <data name="ViewPageGachaLogHutaoCloudSpiralAbyssActivityDescription" xml:space="preserve">
     <value>每期深渊首次上传可免费获得 3 天时长</value>
@@ -2412,7 +2406,7 @@
     <value>重命名</value>
   </data>
   <data name="ViewPageLaunchGameSwitchSchemeDescription" xml:space="preserve">
-    <value>切换游戏服务器（国服 / 渠道服 / 国际服）</value>
+    <value>切换游戏服务器（国服/渠道服/国际服）</value>
   </data>
   <data name="ViewPageLaunchGameSwitchSchemeHeader" xml:space="preserve">
     <value>服务器</value>
@@ -2421,7 +2415,7 @@
     <value>版本更新前需要提前转换至与启动器匹配的服务器</value>
   </data>
   <data name="ViewPageLaunchGameUnlockFpsDescription" xml:space="preserve">
-    <value>请在游戏内关闭「垂直同步」选项，需要高性能的显卡以支持更高的帧率</value>
+    <value>请在游戏内关闭垂直同步选项，需要高性能的显卡以支持更高的帧率</value>
   </data>
   <data name="ViewPageLaunchGameUnlockFpsHeader" xml:space="preserve">
     <value>解锁帧率限制</value>
@@ -2439,7 +2433,7 @@
     <value>Windows HDR</value>
   </data>
   <data name="ViewPageLoginHoyoverseUserHint" xml:space="preserve">
-    <value>请输入你的 HoYoLab UID</value>
+    <value>请输入你的 HoYoLab Uid</value>
   </data>
   <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
     <value>你正在通过由我们提供的内嵌网页视图登录 米哈游通行证，我们会在你点击 我已登录 按钮后，读取你的 Cookie 信息，由此视图发起的网络通信只发生于你的计算机与米哈游服务器之间</value>
@@ -2517,7 +2511,7 @@
     <value>除非开发人员明确要求你这么做，否则不应尝试执行下方的操作！</value>
   </data>
   <data name="ViewPageSettingDataFolderDescription" xml:space="preserve">
-    <value>用户数据 / 元数据 在此处存放</value>
+    <value>用户数据/元数据 在此处存放</value>
   </data>
   <data name="ViewPageSettingDataFolderHeader" xml:space="preserve">
     <value>数据 文件夹</value>
@@ -2595,7 +2589,7 @@
     <value>选择想要获取公告的游戏服务器</value>
   </data>
   <data name="ViewPageSettingHomeAnnouncementRegionHeader" xml:space="preserve">
-    <value>游戏公告所属服务器</value>
+    <value>公告所属服务器</value>
   </data>
   <data name="ViewpageSettingHomeCardDescription" xml:space="preserve">
     <value>管理主页仪表板中的卡片</value>
@@ -2652,7 +2646,7 @@
     <value>您可以无限制的使用任何测试功能</value>
   </data>
   <data name="ViewPageSettingHutaoPassportMaintainerHeader" xml:space="preserve">
-    <value>胡桃开发 / 运维</value>
+    <value>胡桃开发/运维</value>
   </data>
   <data name="ViewPageSettingHutaoPassportRedeemCodeDescription" xml:space="preserve">
     <value>我们有时会向某些用户赠送胡桃云兑换码</value>
@@ -2709,7 +2703,7 @@
     <value>重置图片资源</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsDescription" xml:space="preserve">
-    <value>在「启动游戏-进程」选项卡加入「解锁帧率限制」选项</value>
+    <value>在启动游戏页面的进程部分加入解锁帧率限制选项</value>
   </data>
   <data name="ViewPageSettingsAdvancedOptionsLaunchUnlockFpsHeader" xml:space="preserve">
     <value>启动游戏-解锁帧率限制</value>
@@ -2757,7 +2751,7 @@
     <value>贡献翻译</value>
   </data>
   <data name="ViewPageSettingUnobtainedWishItemVisibleDescription" xml:space="preserve">
-    <value>在「祈愿记录-角色」与「祈愿记录-武器」中显示未抽取到的祈愿物品</value>
+    <value>在祈愿记录页面角色与武器页签显示未抽取到的祈愿物品</value>
   </data>
   <data name="ViewPageSettingUnobtainedWishItemVisibleHeader" xml:space="preserve">
     <value>未抽取到的祈愿物品</value>

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

@@ -20,7 +20,7 @@ namespace Snap.Hutao.Service;
 [Injection(InjectAs.Scoped, typeof(IAnnouncementService))]
 internal sealed partial class AnnouncementService : IAnnouncementService
 {
-    private const string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
+    private static readonly string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
 
     private readonly IServiceScopeFactory serviceScopeFactory;
     private readonly ITaskContext taskContext;

src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationDbService.cs

@@ -16,6 +16,16 @@ internal sealed partial class CultivationDbService : ICultivationDbService
 
     public IServiceProvider ServiceProvider { get => serviceProvider; }
 
+    public List<InventoryItem> GetInventoryItemListByProjectId(Guid projectId)
+    {
+        return this.List<InventoryItem>(i => i.ProjectId == projectId);
+    }
+
+    public ValueTask<List<InventoryItem>> GetInventoryItemListByProjectIdAsync(Guid projectId, CancellationToken token = default)
+    {
+        return this.ListAsync<InventoryItem>(i => i.ProjectId == projectId, token);
+    }
+
     public ValueTask<List<CultivateEntry>> GetCultivateEntryListByProjectIdAsync(Guid projectId, CancellationToken token = default)
     {
         return this.ListAsync<CultivateEntry>(e => e.ProjectId == projectId, token);

src/Snap.Hutao/Snap.Hutao/Service/Cultivation/CultivationService.cs

@@ -2,14 +2,15 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Core.Database;
+using Snap.Hutao.Model;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Model.Entity.Primitive;
+using Snap.Hutao.Model.Metadata.Item;
 using Snap.Hutao.Service.Inventory;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.ViewModel.Cultivation;
 using System.Collections.ObjectModel;
 using CalculateItem = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Item;
-using ModelItem = Snap.Hutao.Model.Item;
 
 namespace Snap.Hutao.Service.Cultivation;
 
@@ -50,6 +51,22 @@ internal sealed partial class CultivationService : ICultivationService
         }
     }
 
+    /// <inheritdoc/>
+    public List<InventoryItemView> GetInventoryItemViews(CultivateProject cultivateProject, ICultivationMetadataContext context, ICommand saveCommand)
+    {
+        Guid projectId = cultivateProject.InnerId;
+        List<InventoryItem> entities = cultivationDbService.GetInventoryItemListByProjectId(projectId);
+
+        List<InventoryItemView> results = [];
+        foreach (Material meta in context.EnumerateInventoryMaterial())
+        {
+            InventoryItem entity = entities.SingleOrDefault(e => e.ItemId == meta.Id) ?? InventoryItem.From(projectId, meta.Id);
+            results.Add(new(entity, meta, saveCommand));
+        }
+
+        return results;
+    }
+
     /// <inheritdoc/>
     public async ValueTask<ObservableCollection<CultivateEntryView>> GetCultivateEntriesAsync(CultivateProject cultivateProject, ICultivationMetadataContext context)
     {
@@ -69,7 +86,7 @@ internal sealed partial class CultivationService : ICultivationService
                 entryItems.Add(new(cultivateItem, context.GetMaterial(cultivateItem.ItemId)));
             }
 
-            ModelItem item = entry.Type switch
+            Item item = entry.Type switch
             {
                 CultivateType.AvatarAndSkill => context.GetAvatar(entry.Id).ToItem(),
                 CultivateType.Weapon => context.GetWeapon(entry.Id).ToItem(),
@@ -113,7 +130,7 @@ internal sealed partial class CultivationService : ICultivationService
             }
         }
 
-        foreach (InventoryItem inventoryItem in await inventoryDbService.GetInventoryItemListByProjectIdAsync(projectId, token).ConfigureAwait(false))
+        foreach (InventoryItem inventoryItem in await cultivationDbService.GetInventoryItemListByProjectIdAsync(projectId, token).ConfigureAwait(false))
         {
             if (resultItems.SingleOrDefault(i => i.Inner.Id == inventoryItem.ItemId) is { } existedItem)
             {
@@ -130,6 +147,12 @@ internal sealed partial class CultivationService : ICultivationService
         await cultivationDbService.RemoveCultivateEntryByIdAsync(entryId).ConfigureAwait(false);
     }
 
+    /// <inheritdoc/>
+    public void SaveInventoryItem(InventoryItemView item)
+    {
+        inventoryDbService.UpdateInventoryItem(item.Entity);
+    }
+
     /// <inheritdoc/>
     public void SaveCultivateItem(CultivateItemView item)
     {

src/Snap.Hutao/Snap.Hutao/Service/Cultivation/ICultivationDbService.cs

@@ -7,7 +7,8 @@ using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Cultivation;
 
-internal interface ICultivationDbService : IAppDbService<CultivateEntryLevelInformation>,
+internal interface ICultivationDbService : IAppDbService<InventoryItem>,
+    IAppDbService<CultivateEntryLevelInformation>,
     IAppDbService<CultivateProject>,
     IAppDbService<CultivateEntry>,
     IAppDbService<CultivateItem>
@@ -28,6 +29,10 @@ internal interface ICultivationDbService : IAppDbService<CultivateEntryLevelInfo
 
     ObservableCollection<CultivateProject> GetCultivateProjectCollection();
 
+    List<InventoryItem> GetInventoryItemListByProjectId(Guid projectId);
+
+    ValueTask<List<InventoryItem>> GetInventoryItemListByProjectIdAsync(Guid projectId, CancellationToken token = default);
+
     ValueTask AddCultivateEntryAsync(CultivateEntry entry, CancellationToken token = default);
 
     ValueTask AddCultivateItemRangeAsync(IEnumerable<CultivateItem> toAdd, CancellationToken token = default);

src/Snap.Hutao/Snap.Hutao/Service/Cultivation/ICultivationService.cs

@@ -27,6 +27,8 @@ internal interface ICultivationService
 
     ValueTask<ObservableCollection<CultivateEntryView>> GetCultivateEntriesAsync(CultivateProject cultivateProject, ICultivationMetadataContext context);
 
+    List<InventoryItemView> GetInventoryItemViews(CultivateProject cultivateProject, ICultivationMetadataContext context, ICommand saveCommand);
+
     ValueTask<ObservableCollection<StatisticsCultivateItem>> GetStatisticsCultivateItemCollectionAsync(
         CultivateProject cultivateProject, ICultivationMetadataContext context, CancellationToken token);
 
@@ -52,6 +54,12 @@ internal interface ICultivationService
     /// <param name="item">养成物品</param>
     void SaveCultivateItem(CultivateItemView item);
 
+    /// <summary>
+    /// 保存单个物品
+    /// </summary>
+    /// <param name="item">物品</param>
+    void SaveInventoryItem(InventoryItemView item);
+
     /// <summary>
     /// 异步尝试添加新的项目
     /// </summary>

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

@@ -48,7 +48,7 @@ internal sealed partial class DailyNoteOptions : DbStoreOptions
                     {
                         quartzService.UpdateJobAsync(JobIdentity.DailyNoteGroupName, JobIdentity.DailyNoteRefreshTriggerName, builder =>
                         {
-                            return builder.WithSimpleSchedule(sb => sb.WithIntervalInSeconds(SelectedRefreshTime.Value).RepeatForever());
+                            return builder.WithSimpleSchedule(sb => sb.WithIntervalInMinutes(SelectedRefreshTime.Value).RepeatForever());
                         }).SafeForget();
                     }
                 }

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

@@ -49,7 +49,7 @@ internal static class GachaStatisticsExtension
     /// <param name="dict">计数器</param>
     /// <returns>统计物品列表</returns>
     public static List<StatisticsItem> ToStatisticsList<TItem>(this Dictionary<TItem, int> dict)
-        where TItem : IStatisticsItemConvertible
+        where TItem : IStatisticsItemSource
     {
         IOrderedEnumerable<StatisticsItem> result = dict
             .Select(kvp => kvp.Key.ToStatisticsItem(kvp.Value))

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

@@ -27,7 +27,7 @@ internal sealed partial class GachaStatisticsSlimFactory : IGachaStatisticsSlimF
         return CreateCore(context, items, uid);
     }
 
-    private static void Track(INameQualityAccess nameQuality, ref int orangeTracker, ref int purpleTracker)
+    private static void Track(INameQuality nameQuality, ref int orangeTracker, ref int purpleTracker)
     {
         switch (nameQuality.Quality)
         {
@@ -69,7 +69,7 @@ internal sealed partial class GachaStatisticsSlimFactory : IGachaStatisticsSlimF
         // O(n) operation
         foreach (ref readonly GachaItem item in CollectionsMarshal.AsSpan(items))
         {
-            INameQualityAccess nameQuality = context.GetNameQualityByItemId(item.ItemId);
+            INameQuality nameQuality = context.GetNameQualityByItemId(item.ItemId);
             switch (item.QueryType)
             {
                 case GachaType.Standard:

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

@@ -16,11 +16,11 @@ internal sealed class HistoryWishBuilder
 {
     private readonly GachaEvent gachaEvent;
 
-    private readonly Dictionary<IStatisticsItemConvertible, int> orangeUpCounter = [];
-    private readonly Dictionary<IStatisticsItemConvertible, int> purpleUpCounter = [];
-    private readonly Dictionary<IStatisticsItemConvertible, int> orangeCounter = [];
-    private readonly Dictionary<IStatisticsItemConvertible, int> purpleCounter = [];
-    private readonly Dictionary<IStatisticsItemConvertible, int> blueCounter = [];
+    private readonly Dictionary<IStatisticsItemSource, int> orangeUpCounter = [];
+    private readonly Dictionary<IStatisticsItemSource, int> purpleUpCounter = [];
+    private readonly Dictionary<IStatisticsItemSource, int> orangeCounter = [];
+    private readonly Dictionary<IStatisticsItemSource, int> purpleCounter = [];
+    private readonly Dictionary<IStatisticsItemSource, int> blueCounter = [];
 
     private int totalCountTracker;
 
@@ -37,18 +37,18 @@ internal sealed class HistoryWishBuilder
         switch (ConfigType)
         {
             case GachaType.ActivityAvatar or GachaType.SpecialActivityAvatar:
-                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemConvertible)a, a => 0);
-                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemConvertible)a, a => 0);
+                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemSource)a, a => 0);
+                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdAvatarMap[id]).ToDictionary(a => (IStatisticsItemSource)a, a => 0);
                 break;
             case GachaType.ActivityWeapon:
-                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemConvertible)w, w => 0);
-                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemConvertible)w, w => 0);
+                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemSource)w, w => 0);
+                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => context.IdWeaponMap[id]).ToDictionary(w => (IStatisticsItemSource)w, w => 0);
                 break;
             case GachaType.ActivityCity:
 
                 // Avatars are less than weapons, so we try to get the value from avatar map first
-                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => (IStatisticsItemConvertible?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
-                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => (IStatisticsItemConvertible?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
+                orangeUpCounter = gachaEvent.UpOrangeList.Select(id => (IStatisticsItemSource?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
+                purpleUpCounter = gachaEvent.UpPurpleList.Select(id => (IStatisticsItemSource?)context.IdAvatarMap.GetValueOrDefault(id) ?? context.IdWeaponMap[id]).ToDictionary(c => c, c => 0);
                 break;
         }
     }
@@ -74,7 +74,7 @@ internal sealed class HistoryWishBuilder
     /// </summary>
     /// <param name="item">物品</param>
     /// <returns>是否为Up物品</returns>
-    public bool IncreaseOrange(IStatisticsItemConvertible item)
+    public bool IncreaseOrange(IStatisticsItemSource item)
     {
         orangeCounter.IncreaseOne(item);
         ++totalCountTracker;
@@ -86,7 +86,7 @@ internal sealed class HistoryWishBuilder
     /// 计数四星物品
     /// </summary>
     /// <param name="item">物品</param>
-    public void IncreasePurple(IStatisticsItemConvertible item)
+    public void IncreasePurple(IStatisticsItemSource item)
     {
         purpleUpCounter.TryIncreaseOne(item);
         purpleCounter.IncreaseOne(item);
@@ -97,7 +97,7 @@ internal sealed class HistoryWishBuilder
     /// 计数三星武器
     /// </summary>
     /// <param name="item">武器</param>
-    public void IncreaseBlue(IStatisticsItemConvertible item)
+    public void IncreaseBlue(IStatisticsItemSource item)
     {
         blueCounter.IncreaseOne(item);
         ++totalCountTracker;

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

@@ -55,7 +55,7 @@ internal sealed class HutaoStatisticsFactory
 
         foreach (ref readonly ItemCount item in CollectionsMarshal.AsSpan(items))
         {
-            IStatisticsItemConvertible source = item.Item.StringLength() switch
+            IStatisticsItemSource source = item.Item.StringLength() switch
             {
                 8U => context.GetAvatar(item.Item),
                 5U => context.GetWeapon(item.Item),

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

@@ -44,7 +44,7 @@ internal sealed class TypedWishSummaryBuilder
     /// <param name="item">祈愿物品</param>
     /// <param name="source">对应武器</param>
     /// <param name="isUp">是否为Up物品</param>
-    public void Track(GachaItem item, ISummaryItemConvertible source, bool isUp)
+    public void Track(GachaItem item, ISummaryItemSource source, bool isUp)
     {
         if (!context.TypeEvaluator(item.GachaType))
         {

src/Snap.Hutao/Snap.Hutao/Service/GachaLog/GachaLogServiceMetadataContext.cs

@@ -59,7 +59,7 @@ internal sealed class GachaLogServiceMetadataContext : IMetadataContext,
         return result;
     }
 
-    public INameQualityAccess GetNameQualityByItemId(uint id)
+    public INameQuality GetNameQualityByItemId(uint id)
     {
         uint place = id.StringLength();
         return place switch

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

@@ -3,6 +3,7 @@
 
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Win32.Foundation;
+using Snap.Hutao.Win32.Memory;
 using System.Diagnostics;
 using static Snap.Hutao.Win32.Kernel32;
 

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

@@ -15,35 +15,30 @@ internal readonly struct RequiredLocalModule : IDisposable
     public readonly Module UnityPlayer;
     public readonly Module UserAssembly;
 
-    private readonly HMODULE hModuleUnityPlayer;
-    private readonly HMODULE hModuleUserAssembly;
-
     [SuppressMessage("", "SH002")]
     public RequiredLocalModule(HMODULE unityPlayer, HMODULE userAssembly)
     {
-        hModuleUnityPlayer = unityPlayer;
-        hModuleUserAssembly = userAssembly;
-
         // Align the pointer
-        nint unityPlayerMappedView = (nint)(unityPlayer & ~0x3L);
-        nint userAssemblyMappedView = (nint)(userAssembly & ~0x3L);
+        unityPlayer = (nint)(unityPlayer & ~0x3L);
+        userAssembly = (nint)(userAssembly & ~0x3L);
 
         HasValue = true;
-        UnityPlayer = new((nuint)unityPlayerMappedView, GetImageSize(unityPlayerMappedView));
-        UserAssembly = new((nuint)userAssemblyMappedView, GetImageSize(userAssemblyMappedView));
+        UnityPlayer = new((nuint)(nint)unityPlayer, GetImageSize(unityPlayer));
+        UserAssembly = new((nuint)(nint)userAssembly, GetImageSize(userAssembly));
     }
 
     public void Dispose()
     {
-        FreeLibrary(hModuleUnityPlayer);
-        FreeLibrary(hModuleUserAssembly);
+        FreeLibrary((nint)UnityPlayer.Address);
+        FreeLibrary((nint)UserAssembly.Address);
     }
 
+    [SuppressMessage("", "SH002")]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private unsafe uint GetImageSize(nint baseAddress)
+    private unsafe uint GetImageSize(HMODULE hModule)
     {
-        IMAGE_DOS_HEADER* pImageDosHeader = (IMAGE_DOS_HEADER*)baseAddress;
-        IMAGE_NT_HEADERS64* pImageNtHeader = (IMAGE_NT_HEADERS64*)(pImageDosHeader->e_lfanew + baseAddress);
+        IMAGE_DOS_HEADER* pImageDosHeader = (IMAGE_DOS_HEADER*)(nint)hModule;
+        IMAGE_NT_HEADERS64* pImageNtHeader = (IMAGE_NT_HEADERS64*)(pImageDosHeader->e_lfanew + hModule);
         return pImageNtHeader->OptionalHeader.SizeOfImage;
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Inventory/IInventoryDbService.cs

@@ -2,21 +2,16 @@
 // Licensed under the MIT license.
 
 using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Service.Abstraction;
 
 namespace Snap.Hutao.Service.Inventory;
 
-internal interface IInventoryDbService : IAppDbService<InventoryItem>
+internal interface IInventoryDbService
 {
-    ValueTask AddInventoryItemRangeByProjectIdAsync(List<InventoryItem> items, CancellationToken token = default);
+    ValueTask AddInventoryItemRangeByProjectId(List<InventoryItem> items);
 
-    ValueTask RemoveInventoryItemRangeByProjectIdAsync(Guid projectId, CancellationToken token = default);
+    ValueTask RemoveInventoryItemRangeByProjectId(Guid projectId);
 
     void UpdateInventoryItem(InventoryItem item);
 
-    ValueTask UpdateInventoryItemAsync(InventoryItem item, CancellationToken token = default);
-
-    List<InventoryItem> GetInventoryItemListByProjectId(Guid projectId);
-
-    ValueTask<List<InventoryItem>> GetInventoryItemListByProjectIdAsync(Guid projectId, CancellationToken token = default);
+    ValueTask UpdateInventoryItemAsync(InventoryItem item);
 }

src/Snap.Hutao/Snap.Hutao/Service/Inventory/IInventoryService.cs

@@ -1,17 +1,8 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Service.Cultivation;
-using Snap.Hutao.ViewModel.Cultivation;
-
 namespace Snap.Hutao.Service.Inventory;
 
 internal interface IInventoryService
 {
-    List<InventoryItemView> GetInventoryItemViews(CultivateProject cultivateProject, ICultivationMetadataContext context, ICommand saveCommand);
-
-    void SaveInventoryItem(InventoryItemView item);
-
-    ValueTask RefreshInventoryAsync(CultivateProject project);
 }

src/Snap.Hutao/Snap.Hutao/Service/Inventory/InventoryDbService.cs

@@ -1,8 +1,10 @@
 // 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;
-using Snap.Hutao.Service.Abstraction;
+using Snap.Hutao.Model.Entity.Database;
 
 namespace Snap.Hutao.Service.Inventory;
 
@@ -12,35 +14,43 @@ internal sealed partial class InventoryDbService : IInventoryDbService
 {
     private readonly IServiceProvider serviceProvider;
 
-    public IServiceProvider ServiceProvider { get => serviceProvider; }
-
-    public async ValueTask RemoveInventoryItemRangeByProjectIdAsync(Guid projectId, CancellationToken token = default)
+    public async ValueTask RemoveInventoryItemRangeByProjectId(Guid projectId)
     {
-        await this.DeleteAsync(i => i.ProjectId == projectId, token).ConfigureAwait(false);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            await appDbContext.InventoryItems
+                .AsNoTracking()
+                .Where(a => a.ProjectId == projectId && a.ItemId != 202U) // 摩拉
+                .ExecuteDeleteAsync()
+                .ConfigureAwait(false);
+        }
     }
 
-    public async ValueTask AddInventoryItemRangeByProjectIdAsync(List<InventoryItem> items, CancellationToken token = default)
+    public async ValueTask AddInventoryItemRangeByProjectId(List<InventoryItem> items)
     {
-        await this.AddRangeAsync(items, token).ConfigureAwait(false);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            await appDbContext.InventoryItems.AddRangeAndSaveAsync(items).ConfigureAwait(false);
+        }
     }
 
     public void UpdateInventoryItem(InventoryItem item)
     {
-        this.Update(item);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            appDbContext.InventoryItems.UpdateAndSave(item);
+        }
     }
 
-    public async ValueTask UpdateInventoryItemAsync(InventoryItem item, CancellationToken token = default)
+    public async ValueTask UpdateInventoryItemAsync(InventoryItem item)
     {
-        await this.UpdateAsync(item, token).ConfigureAwait(false);
-    }
-
-    public List<InventoryItem> GetInventoryItemListByProjectId(Guid projectId)
-    {
-        return this.List(i => i.ProjectId == projectId);
-    }
-
-    public ValueTask<List<InventoryItem>> GetInventoryItemListByProjectIdAsync(Guid projectId, CancellationToken token = default)
-    {
-        return this.ListAsync(i => i.ProjectId == projectId, token);
+        using (IServiceScope scope = serviceProvider.CreateScope())
+        {
+            AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+            await appDbContext.InventoryItems.UpdateAndSaveAsync(item).ConfigureAwait(false);
+        }
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Inventory/InventoryService.cs

@@ -1,83 +1,9 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Snap.Hutao.Model.Entity;
-using Snap.Hutao.Model.Metadata.Item;
-using Snap.Hutao.Service.Cultivation;
-using Snap.Hutao.Service.Metadata.ContextAbstraction;
-using Snap.Hutao.Service.Notification;
-using Snap.Hutao.Service.User;
-using Snap.Hutao.ViewModel.Cultivation;
-using Snap.Hutao.ViewModel.User;
-using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate;
-using Snap.Hutao.Web.Response;
-
 namespace Snap.Hutao.Service.Inventory;
 
-[ConstructorGenerated]
-[Injection(InjectAs.Singleton, typeof(IInventoryService))]
-internal sealed partial class InventoryService : IInventoryService
+[Injection(InjectAs.Transient)]
+internal sealed class InventoryService : IInventoryService
 {
-    private readonly MinimalPromotionDelta minimalPromotionDelta;
-    private readonly IServiceScopeFactory serviceScopeFactory;
-    private readonly IInventoryDbService inventoryDbService;
-    private readonly IInfoBarService infoBarService;
-    private readonly IUserService userService;
-
-    /// <inheritdoc/>
-    public List<InventoryItemView> GetInventoryItemViews(CultivateProject cultivateProject, ICultivationMetadataContext context, ICommand saveCommand)
-    {
-        Guid projectId = cultivateProject.InnerId;
-        List<InventoryItem> entities = inventoryDbService.GetInventoryItemListByProjectId(projectId);
-
-        List<InventoryItemView> results = [];
-        foreach (Material meta in context.EnumerateInventoryMaterial())
-        {
-            InventoryItem entity = entities.SingleOrDefault(e => e.ItemId == meta.Id) ?? InventoryItem.From(projectId, meta.Id);
-            results.Add(new(entity, meta, saveCommand));
-        }
-
-        return results;
-    }
-
-    /// <inheritdoc/>
-    public void SaveInventoryItem(InventoryItemView item)
-    {
-        inventoryDbService.UpdateInventoryItem(item.Entity);
-    }
-
-    /// <inheritdoc/>
-    public async ValueTask RefreshInventoryAsync(CultivateProject project)
-    {
-        List<AvatarPromotionDelta> deltas = await minimalPromotionDelta.GetAsync().ConfigureAwait(false);
-
-        BatchConsumption? batchConsumption = default;
-        using (IServiceScope scope = serviceScopeFactory.CreateScope())
-        {
-            if (!UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
-            {
-                infoBarService.Warning(SH.MustSelectUserAndUid);
-                return;
-            }
-
-            CalculateClient calculateClient = scope.ServiceProvider.GetRequiredService<CalculateClient>();
-
-            Response<BatchConsumption>? resp = await calculateClient
-                .BatchComputeAsync(userAndUid, deltas, true)
-                .ConfigureAwait(false);
-
-            if (!resp.IsOk())
-            {
-                return;
-            }
-
-            batchConsumption = resp.Data;
-        }
-
-        if (batchConsumption is { OverallConsume: { } items })
-        {
-            await inventoryDbService.RemoveInventoryItemRangeByProjectIdAsync(project.InnerId).ConfigureAwait(false);
-            await inventoryDbService.AddInventoryItemRangeByProjectIdAsync(items.SelectList(item => InventoryItem.From(project.InnerId, item.Id, (uint)((int)item.Num - item.LackNum)))).ConfigureAwait(false);
-        }
-    }
 }

src/Snap.Hutao/Snap.Hutao/Service/Inventory/MinimalPromotionDelta.cs

@@ -1,165 +0,0 @@
-// Copyright (c) DGP Studio. All rights reserved.
-// Licensed under the MIT license.
-
-using Google.OrTools.LinearSolver;
-using Microsoft.Extensions.Caching.Memory;
-using Snap.Hutao.Core;
-using Snap.Hutao.Core.Diagnostics;
-using Snap.Hutao.Core.ExceptionService;
-using Snap.Hutao.Model.Metadata.Abstraction;
-using Snap.Hutao.Model.Primitive;
-using Snap.Hutao.Service.Metadata;
-using Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate;
-using System.Runtime.InteropServices;
-using MetadataAvatar = Snap.Hutao.Model.Metadata.Avatar.Avatar;
-using MetadataWeapon = Snap.Hutao.Model.Metadata.Weapon.Weapon;
-
-namespace Snap.Hutao.Service.Inventory;
-
-[ConstructorGenerated]
-[Injection(InjectAs.Singleton)]
-internal sealed partial class MinimalPromotionDelta
-{
-    private const string CacheKey = $"{nameof(MinimalPromotionDelta)}.Cache";
-
-    private readonly ILogger<MinimalPromotionDelta> logger;
-    private readonly IMetadataService metadataService;
-    private readonly IMemoryCache memoryCache;
-
-    public async ValueTask<List<AvatarPromotionDelta>> GetAsync()
-    {
-        if (memoryCache.TryGetRequiredValue(CacheKey, out List<AvatarPromotionDelta>? cache))
-        {
-            return cache;
-        }
-
-        List<ICultivationItemsAccess> cultivationItemsEntryList =
-        [
-            .. (await metadataService.GetAvatarListAsync().ConfigureAwait(false)).Where(a => a.BeginTime <= DateTimeOffset.Now),
-            .. (await metadataService.GetWeaponListAsync().ConfigureAwait(false)).Where(w => w.Quality >= Model.Intrinsic.QualityType.QUALITY_BLUE),
-        ];
-
-        List<ICultivationItemsAccess> minimal;
-        using (ValueStopwatch.MeasureExecution(logger))
-        {
-            minimal = Minimize(cultivationItemsEntryList);
-        }
-
-        // Gurantee the order of avatar and weapon
-        // Make sure weapons can have avatar to attach
-        minimal.Sort(CultivationItemsAccessComparer.Shared);
-        return memoryCache.Set(CacheKey, ToPromotionDeltaList(minimal));
-    }
-
-    private static List<ICultivationItemsAccess> Minimize(List<ICultivationItemsAccess> cultivationItems)
-    {
-        using (Solver? solver = Solver.CreateSolver("SCIP"))
-        {
-            ArgumentNullException.ThrowIfNull(solver);
-
-            Objective objective = solver.Objective();
-            objective.SetMinimization();
-
-            Dictionary<ICultivationItemsAccess, Variable> itemVariableMap = [];
-            foreach (ref readonly ICultivationItemsAccess item in CollectionsMarshal.AsSpan(cultivationItems))
-            {
-                Variable variable = solver.MakeBoolVar(item.Name);
-                itemVariableMap[item] = variable;
-                objective.SetCoefficient(variable, 1);
-            }
-
-            Dictionary<MaterialId, Constraint> materialConstraintMap = [];
-            foreach (ref readonly ICultivationItemsAccess item in CollectionsMarshal.AsSpan(cultivationItems))
-            {
-                foreach (ref readonly MaterialId materialId in CollectionsMarshal.AsSpan(item.CultivationItems))
-                {
-                    ref Constraint? constraint = ref CollectionsMarshal.GetValueRefOrAddDefault(materialConstraintMap, materialId, out _);
-                    constraint ??= solver.MakeConstraint(1, double.PositiveInfinity, $"{materialId}");
-                    constraint.SetCoefficient(itemVariableMap[item], 1);
-                }
-            }
-
-            Solver.ResultStatus status = solver.Solve();
-            HutaoException.ThrowIf(status != Solver.ResultStatus.OPTIMAL, "Unable to solve minimal item set");
-
-            List<ICultivationItemsAccess> results = [];
-            foreach ((ICultivationItemsAccess item, Variable variable) in itemVariableMap)
-            {
-                if (variable.SolutionValue() > 0.5)
-                {
-                    results.Add(item);
-                }
-            }
-
-            return results;
-        }
-    }
-
-    private static List<AvatarPromotionDelta> ToPromotionDeltaList(List<ICultivationItemsAccess> cultivationItems)
-    {
-        List<AvatarPromotionDelta> deltas = [];
-        int currentWeaponEmptyAvatarIndex = 0;
-
-        foreach (ref readonly ICultivationItemsAccess item in CollectionsMarshal.AsSpan(cultivationItems))
-        {
-            switch (item)
-            {
-                case MetadataAvatar avatar:
-                    deltas.Add(new()
-                    {
-                        AvatarId = avatar.Id,
-                        AvatarLevelCurrent = 1,
-                        AvatarLevelTarget = 90,
-                        SkillList = avatar.SkillDepot.CompositeSkillsNoInherents().SelectList(skill => new PromotionDelta()
-                        {
-                            Id = skill.GroupId,
-                            LevelCurrent = 1,
-                            LevelTarget = 10,
-                        }),
-                    });
-
-                    break;
-
-                case MetadataWeapon weapon:
-                    AvatarPromotionDelta delta;
-                    if (currentWeaponEmptyAvatarIndex < deltas.Count)
-                    {
-                        delta = deltas[currentWeaponEmptyAvatarIndex++];
-                    }
-                    else
-                    {
-                        delta = new();
-                        deltas.Add(delta);
-                    }
-
-                    delta.Weapon = new()
-                    {
-                        Id = weapon.Id,
-                        LevelCurrent = 1,
-                        LevelTarget = 90,
-                    };
-
-                    break;
-            }
-        }
-
-        return deltas;
-    }
-
-    private sealed class CultivationItemsAccessComparer : IComparer<ICultivationItemsAccess>
-    {
-        private static readonly LazySlim<CultivationItemsAccessComparer> LazyShared = new(() => new());
-
-        public static CultivationItemsAccessComparer Shared { get => LazyShared.Value; }
-
-        public int Compare(ICultivationItemsAccess? x, ICultivationItemsAccess? y)
-        {
-            return (x, y) switch
-            {
-                (MetadataAvatar, MetadataWeapon) => -1,
-                (MetadataWeapon, MetadataAvatar) => 1,
-                _ => 0,
-            };
-        }
-    }
-}

src/Snap.Hutao/Snap.Hutao/Service/Job/DailyNoteRefreshJobScheduler.cs

@@ -26,7 +26,7 @@ internal sealed partial class DailyNoteRefreshJobScheduler : IJobScheduler
         ITrigger dailyNoteTrigger = TriggerBuilder.Create()
             .WithIdentity(JobIdentity.DailyNoteRefreshTriggerName, JobIdentity.DailyNoteGroupName)
             .StartNow()
-            .WithSimpleSchedule(builder => builder.WithIntervalInSeconds(interval).RepeatForever())
+            .WithSimpleSchedule(builder => builder.WithIntervalInMinutes(interval).RepeatForever())
             .Build();
 
         await scheduler.ScheduleJob(dailyNoteJob, dailyNoteTrigger).ConfigureAwait(false);

src/Snap.Hutao/Snap.Hutao/Service/Notification/IInfoBarService.cs

@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Controls;
 using System.Collections.ObjectModel;
 
 namespace Snap.Hutao.Service.Notification;
@@ -8,7 +9,7 @@ namespace Snap.Hutao.Service.Notification;
 [HighQuality]
 internal interface IInfoBarService
 {
-    ObservableCollection<InfoBarOptions> Collection { get; }
+    ObservableCollection<InfoBar> Collection { get; }
 
     void PrepareInfoBarAndShow(Action<IInfoBarOptionsBuilder> configure);
 }

src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace Snap.Hutao.Service.Notification;
 
@@ -15,9 +16,7 @@ internal sealed class InfoBarOptions
 
     public object? Content { get; set; }
 
-    public string? ActionButtonContent { get; set; }
-
-    public ICommand? ActionButtonCommand { get; set; }
+    public ButtonBase? ActionButton { get; set; }
 
     public int MilliSecondsDelay { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarOptionsBuilderExtension.cs

@@ -2,6 +2,8 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Snap.Hutao.Control.Builder.ButtonBase;
 using Snap.Hutao.Core.Abstraction.Extension;
 
 namespace Snap.Hutao.Service.Notification;
@@ -36,17 +38,20 @@ internal static class InfoBarOptionsBuilderExtension
         return builder;
     }
 
-    public static IInfoBarOptionsBuilder SetActionButtonContent<TBuilder>(this TBuilder builder, string? buttonContent)
+    public static IInfoBarOptionsBuilder SetActionButton<TBuilder, TButton>(this TBuilder builder, Action<ButtonBaseBuilder<TButton>> configureButton)
         where TBuilder : IInfoBarOptionsBuilder
+        where TButton : ButtonBase, new()
     {
-        builder.Configure(builder => builder.Options.ActionButtonContent = buttonContent);
+        ButtonBaseBuilder<TButton> buttonBaseBuilder = new ButtonBaseBuilder<TButton>().Configure(configureButton);
+        builder.Configure(builder => builder.Options.ActionButton = buttonBaseBuilder.Button);
         return builder;
     }
 
-    public static IInfoBarOptionsBuilder SetActionButtonCommand<TBuilder>(this TBuilder builder, ICommand? buttonCommand)
+    public static IInfoBarOptionsBuilder SetActionButton<TBuilder>(this TBuilder builder, Action<ButtonBuilder> configureButton)
         where TBuilder : IInfoBarOptionsBuilder
     {
-        builder.Configure(builder => builder.Options.ActionButtonCommand = buttonCommand);
+        ButtonBuilder buttonBaseBuilder = new ButtonBuilder().Configure(configureButton);
+        builder.Configure(builder => builder.Options.ActionButton = buttonBaseBuilder.Button);
         return builder;
     }
 

src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarService.cs

@@ -1,8 +1,11 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media.Animation;
 using Snap.Hutao.Core.Abstraction.Extension;
 using System.Collections.ObjectModel;
+using Windows.Foundation;
 
 namespace Snap.Hutao.Service.Notification;
 
@@ -14,16 +17,20 @@ internal sealed class InfoBarService : IInfoBarService
     private readonly ILogger<InfoBarService> logger;
     private readonly ITaskContext taskContext;
 
-    private ObservableCollection<InfoBarOptions>? collection;
+    private readonly TypedEventHandler<InfoBar, InfoBarClosedEventArgs> infobarClosedEventHandler;
+
+    private ObservableCollection<InfoBar>? collection;
 
     public InfoBarService(IServiceProvider serviceProvider)
     {
         logger = serviceProvider.GetRequiredService<ILogger<InfoBarService>>();
         taskContext = serviceProvider.GetRequiredService<ITaskContext>();
+
+        infobarClosedEventHandler = OnInfoBarClosed;
     }
 
     /// <inheritdoc/>
-    public ObservableCollection<InfoBarOptions> Collection
+    public ObservableCollection<InfoBar> Collection
     {
         get => collection ??= [];
     }
@@ -44,7 +51,33 @@ internal sealed class InfoBarService : IInfoBarService
 
         await taskContext.SwitchToMainThreadAsync();
 
+        InfoBar infoBar = new()
+        {
+            Severity = builder.Options.Severity,
+            Title = builder.Options.Title,
+            Message = builder.Options.Message,
+            Content = builder.Options.Content,
+            IsOpen = true,
+            ActionButton = builder.Options.ActionButton,
+            Transitions = [new AddDeleteThemeTransition()],
+        };
+
+        infoBar.Closed += infobarClosedEventHandler;
         ArgumentNullException.ThrowIfNull(collection);
-        collection.Add(builder.Options);
+        collection.Add(infoBar);
+
+        if (builder.Options.MilliSecondsDelay > 0)
+        {
+            await Delay.FromMilliSeconds(builder.Options.MilliSecondsDelay).ConfigureAwait(true);
+            collection.Remove(infoBar);
+            infoBar.IsOpen = false;
+        }
+    }
+
+    private void OnInfoBarClosed(InfoBar sender, InfoBarClosedEventArgs args)
+    {
+        ArgumentNullException.ThrowIfNull(collection);
+        taskContext.BeginInvokeOnMainThread(() => collection.Remove(sender));
+        sender.Closed -= infobarClosedEventHandler;
     }
 }

src/Snap.Hutao/Snap.Hutao/Service/Notification/InfoBarServiceExtension.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
+using Snap.Hutao.Control.Builder.ButtonBase;
 using Snap.Hutao.Core.Abstraction.Extension;
 
 namespace Snap.Hutao.Service.Notification;
@@ -20,7 +21,7 @@ internal static class InfoBarServiceExtension
 
     public static void Information(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 5000)
     {
-        infoBarService.Information(builder => builder.SetTitle(title).SetMessage(message).SetActionButtonContent(buttonContent).SetActionButtonCommand(buttonCommand).SetDelay(milliSeconds));
+        infoBarService.Information(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds));
     }
 
     public static void Information(this IInfoBarService infoBarService, Action<IInfoBarOptionsBuilder> configure)
@@ -55,7 +56,7 @@ internal static class InfoBarServiceExtension
 
     public static void Warning(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 30000)
     {
-        infoBarService.Warning(builder => builder.SetTitle(title).SetMessage(message).SetActionButtonContent(buttonContent).SetActionButtonCommand(buttonCommand).SetDelay(milliSeconds));
+        infoBarService.Warning(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds));
     }
 
     public static void Warning(this IInfoBarService infoBarService, Action<IInfoBarOptionsBuilder> configure)
@@ -75,7 +76,7 @@ internal static class InfoBarServiceExtension
 
     public static void Error(this IInfoBarService infoBarService, string title, string message, string buttonContent, ICommand buttonCommand, int milliSeconds = 0)
     {
-        infoBarService.Error(builder => builder.SetTitle(title).SetMessage(message).SetActionButtonContent(buttonContent).SetActionButtonCommand(buttonCommand).SetDelay(milliSeconds));
+        infoBarService.Error(builder => builder.SetTitle(title).SetMessage(message).SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds));
     }
 
     public static void Error(this IInfoBarService infoBarService, Exception ex, int milliSeconds = 0)
@@ -90,7 +91,7 @@ internal static class InfoBarServiceExtension
 
     public static void Error(this IInfoBarService infoBarService, Exception ex, string subtitle, string buttonContent, ICommand buttonCommand, int milliSeconds = 0)
     {
-        infoBarService.Error(builder => builder.SetTitle(ex.GetType().Name).SetMessage($"{subtitle}\n{ex.Message}").SetActionButtonContent(buttonContent).SetActionButtonCommand(buttonCommand).SetDelay(milliSeconds));
+        infoBarService.Error(builder => builder.SetTitle(ex.GetType().Name).SetMessage($"{subtitle}\n{ex.Message}").SetActionButton(buttonBuilder => buttonBuilder.SetContent(buttonContent).SetCommand(buttonCommand)).SetDelay(milliSeconds));
     }
 
     public static void Error(this IInfoBarService infoBarService, Action<IInfoBarOptionsBuilder> configure)

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

@@ -313,7 +313,6 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.0.240109" />
     <PackageReference Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-    <PackageReference Include="Google.OrTools" Version="9.10.4067" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>

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

@@ -44,10 +44,7 @@
                 CornerRadius="{ThemeResource ControlCornerRadiusTop}">
                 <shci:CachedImage Source="{Binding Event.Banner}" Stretch="UniformToFill"/>
             </cwc:ConstrainedBox>
-            <Border
-                Margin="-1"
-                Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"
-                IsHitTestVisible="False"/>
+            <Border Margin="-1" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
         </Grid>
 
         <ScrollViewer Grid.Row="1">

src/Snap.Hutao/Snap.Hutao/View/Dialog/DailyNoteNotificationDialog.xaml

@@ -31,14 +31,14 @@
                 <Slider
                     MinWidth="160"
                     Margin="32,0,0,0"
-                    Maximum="{Binding DailyNote.MaxResin}"
+                    Maximum="160"
                     Minimum="0"
                     Value="{Binding ResinNotifyThreshold, Mode=TwoWay}"/>
             </clw:SettingsCard>
             <clw:SettingsCard Padding="16,8" Header="{shcm:ResourceString Name=ViewDialogDailyNoteNotificationHomeCoinNotifyThreshold}">
                 <Slider
                     MinWidth="160"
-                    Maximum="{Binding DailyNote.MaxHomeCoin}"
+                    Maximum="2400"
                     Minimum="0"
                     Value="{Binding HomeCoinNotifyThreshold, Mode=TwoWay}"/>
             </clw:SettingsCard>

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

@@ -11,4 +11,4 @@ internal sealed partial class UpdatePackageDownloadConfirmDialog : ContentDialog
     {
         InitializeComponent();
     }
-}
+}

src/Snap.Hutao/Snap.Hutao/View/InfoBarView.xaml

@@ -5,112 +5,67 @@
     xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:mxi="using:Microsoft.Xaml.Interactivity"
-    xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcs="using:Snap.Hutao.Control.Selector"
-    xmlns:shsn="using:Snap.Hutao.Service.Notification"
     mc:Ignorable="d">
 
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <AcrylicBrush
-                        x:Key="InfoBarErrorSeverityBackgroundBrush"
-                        FallbackColor="#FDE7E9"
-                        TintColor="#FDE7E9"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarWarningSeverityBackgroundBrush"
-                        FallbackColor="#FFF4CE"
-                        TintColor="#FFF4CE"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarSuccessSeverityBackgroundBrush"
-                        FallbackColor="#DFF6DD"
-                        TintColor="#DFF6DD"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                        FallbackColor="#80F6F6F6"
-                        TintColor="#80F6F6F6"
-                        TintOpacity="0.6"/>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <AcrylicBrush
-                        x:Key="InfoBarErrorSeverityBackgroundBrush"
-                        FallbackColor="#442726"
-                        TintColor="#442726"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarWarningSeverityBackgroundBrush"
-                        FallbackColor="#433519"
-                        TintColor="#433519"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarSuccessSeverityBackgroundBrush"
-                        FallbackColor="#393D1B"
-                        TintColor="#393D1B"
-                        TintOpacity="0.6"/>
-                    <AcrylicBrush
-                        x:Key="InfoBarInformationalSeverityBackgroundBrush"
-                        FallbackColor="#34424d"
-                        TintColor="#34424d"
-                        TintOpacity="0.6"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <DataTemplate x:Key="InfoBarTemplate" x:DataType="shsn:InfoBarOptions">
-                <InfoBar
-                    Title="{Binding Title}"
-                    Closed="OnInfoBarClosed"
-                    Content="{Binding Content}"
-                    IsOpen="True"
-                    Message="{Binding Message}"
-                    Severity="{Binding Severity}">
-                    <mxi:Interaction.Behaviors>
-                        <shcb:InfoBarDelayCloseBehavior MilliSecondsDelay="{Binding MilliSecondsDelay}"/>
-                    </mxi:Interaction.Behaviors>
-                </InfoBar>
-            </DataTemplate>
-
-            <DataTemplate x:Key="InfoBarWithActionButtonTemplate" x:DataType="shsn:InfoBarOptions">
-                <InfoBar
-                    Title="{Binding Title}"
-                    Closed="OnInfoBarClosed"
-                    Content="{Binding Content}"
-                    IsOpen="True"
-                    Message="{Binding Message}"
-                    Severity="{Binding Severity}">
-                    <InfoBar.ActionButton>
-                        <Button Command="{Binding ActionButtonCommand}" Content="{Binding ActionButtonContent}"/>
-                    </InfoBar.ActionButton>
-                    <mxi:Interaction.Behaviors>
-                        <shcb:InfoBarDelayCloseBehavior MilliSecondsDelay="{Binding MilliSecondsDelay}"/>
-                    </mxi:Interaction.Behaviors>
-                </InfoBar>
-            </DataTemplate>
-
-            <shcs:InfoBarTemplateSelector
-                x:Key="InfoBarTemplateSelector"
-                ActionButtonDisabled="{StaticResource InfoBarTemplate}"
-                ActionButtonEnabled="{StaticResource InfoBarWithActionButtonTemplate}"/>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
     <Grid>
         <ItemsControl
             MaxWidth="640"
             Margin="32,48,32,32"
             VerticalAlignment="Bottom"
             ItemContainerTransitions="{StaticResource RepositionThemeTransitions}"
-            ItemTemplateSelector="{StaticResource InfoBarTemplateSelector}"
             ItemsSource="{x:Bind InfoBars}"
             Visibility="{x:Bind VisibilityButton.IsChecked, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
-            <ItemsControl.Transitions>
-                <AddDeleteThemeTransition/>
-            </ItemsControl.Transitions>
+            <ItemsControl.Resources>
+                <ResourceDictionary>
+                    <ResourceDictionary.ThemeDictionaries>
+                        <ResourceDictionary x:Key="Light">
+                            <AcrylicBrush
+                                x:Key="InfoBarErrorSeverityBackgroundBrush"
+                                FallbackColor="#FDE7E9"
+                                TintColor="#FDE7E9"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarWarningSeverityBackgroundBrush"
+                                FallbackColor="#FFF4CE"
+                                TintColor="#FFF4CE"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarSuccessSeverityBackgroundBrush"
+                                FallbackColor="#DFF6DD"
+                                TintColor="#DFF6DD"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarInformationalSeverityBackgroundBrush"
+                                FallbackColor="#80F6F6F6"
+                                TintColor="#80F6F6F6"
+                                TintOpacity="0.6"/>
+                        </ResourceDictionary>
+                        <ResourceDictionary x:Key="Dark">
+                            <AcrylicBrush
+                                x:Key="InfoBarErrorSeverityBackgroundBrush"
+                                FallbackColor="#442726"
+                                TintColor="#442726"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarWarningSeverityBackgroundBrush"
+                                FallbackColor="#433519"
+                                TintColor="#433519"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarSuccessSeverityBackgroundBrush"
+                                FallbackColor="#393D1B"
+                                TintColor="#393D1B"
+                                TintOpacity="0.6"/>
+                            <AcrylicBrush
+                                x:Key="InfoBarInformationalSeverityBackgroundBrush"
+                                FallbackColor="#34424d"
+                                TintColor="#34424d"
+                                TintOpacity="0.6"/>
+                        </ResourceDictionary>
+                    </ResourceDictionary.ThemeDictionaries>
+                </ResourceDictionary>
+            </ItemsControl.Resources>
         </ItemsControl>
 
         <Border

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

@@ -13,7 +13,7 @@ namespace Snap.Hutao.View;
 /// <summary>
 /// 信息条视图
 /// </summary>
-[DependencyProperty("InfoBars", typeof(ObservableCollection<InfoBarOptions>))]
+[DependencyProperty("InfoBars", typeof(ObservableCollection<InfoBar>))]
 internal sealed partial class InfoBarView : UserControl
 {
     private readonly IInfoBarService infoBarService;
@@ -35,9 +35,4 @@ internal sealed partial class InfoBarView : UserControl
     {
         LocalSetting.Set(SettingKeys.IsInfoBarToggleChecked, ((ToggleButton)sender).IsChecked ?? false);
     }
-
-    private void OnInfoBarClosed(InfoBar sender, InfoBarClosedEventArgs args)
-    {
-        InfoBars.Remove((InfoBarOptions)sender.DataContext);
-    }
 }

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

@@ -62,7 +62,7 @@
                                         </cwa:AnimationSet>
                                     </cwa:Explicit.Animations>
                                 </Border>
-                                <Border Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}" IsHitTestVisible="False"/>
+                                <Border Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
                             </Grid>
                         </Border>
                         <!--  Time Description  -->

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

@@ -11,6 +11,7 @@
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
     xmlns:shc="using:Snap.Hutao.Control"
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
+    xmlns:shcca="using:Snap.Hutao.Control.Collection.Alternating"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
     xmlns:shcp="using:Snap.Hutao.Control.Panel"
@@ -619,8 +620,7 @@
                                                         <Rectangle
                                                             Grid.RowSpan="2"
                                                             Grid.ColumnSpan="2"
-                                                            Fill="#33000000"
-                                                            IsHitTestVisible="False"/>
+                                                            Fill="#33000000"/>
                                                         <StackPanel
                                                             Margin="16"
                                                             HorizontalAlignment="Left"

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

@@ -269,10 +269,6 @@
                                     Style="{ThemeResource CommandBarComboBoxStyle}"/>
                             </shc:SizeRestrictedContentControl>
                         </AppBarElementContainer>
-                        <AppBarButton
-                            Command="{Binding RefreshInventoryCommand}"
-                            Icon="{shcm:FontIcon Glyph=&#xE72C;}"
-                            Label="{shcm:ResourceString Name=ViewPageCultivationRefreshInventory}"/>
                         <AppBarButton
                             Command="{Binding AddProjectCommand}"
                             Icon="{shcm:FontIcon Glyph=&#xE710;}"

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

@@ -343,10 +343,7 @@
                                                             Source="{Binding SelectedHistoryWish.BannerImage}"
                                                             Stretch="UniformToFill"/>
                                                     </cwcont:ConstrainedBox>
-                                                    <Border
-                                                        Grid.ColumnSpan="2"
-                                                        Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"
-                                                        IsHitTestVisible="False"/>
+                                                    <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskColorBrush}"/>
                                                 </Grid>
                                             </Border>
 

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

@@ -571,7 +571,7 @@
                                                             Grid.Column="0"
                                                             ItemTemplate="{StaticResource CollocationTemplate}"
                                                             ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.CollocationView.Avatars}"/>
+                                                            ItemsSource="{Binding Selected.Collocation.Avatars}"/>
                                                         <TextBlock
                                                             Grid.Row="0"
                                                             Grid.Column="1"
@@ -582,7 +582,7 @@
                                                             Grid.Column="1"
                                                             ItemTemplate="{StaticResource CollocationTemplate}"
                                                             ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.CollocationView.Weapons}"/>
+                                                            ItemsSource="{Binding Selected.Collocation.Weapons}"/>
                                                         <TextBlock
                                                             Grid.Row="0"
                                                             Grid.Column="2"
@@ -593,7 +593,7 @@
                                                             Grid.Column="2"
                                                             ItemTemplate="{StaticResource CollocationReliquaryTemplate}"
                                                             ItemsPanel="{StaticResource StackPanelSpacing4Template}"
-                                                            ItemsSource="{Binding Selected.CollocationView.ReliquarySets}"/>
+                                                            ItemsSource="{Binding Selected.Collocation.ReliquarySets}"/>
                                                     </Grid>
                                                 </Border>
 

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

@@ -336,7 +336,7 @@
                                                 <Border Padding="16" Style="{ThemeResource BorderCardStyle}">
                                                     <StackPanel Spacing="16">
                                                         <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageWiKiAvatarTeamCombinationHeader}"/>
-                                                        <ItemsControl ItemTemplate="{StaticResource CollocationTemplate}" ItemsSource="{Binding Selected.CollocationView.Avatars}">
+                                                        <ItemsControl ItemTemplate="{StaticResource CollocationTemplate}" ItemsSource="{Binding Selected.Collocation.Avatars}">
                                                             <ItemsControl.ItemsPanel>
                                                                 <ItemsPanelTemplate>
                                                                     <cwc:UniformGrid

src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/AvatarPropertyViewModel.cs

@@ -25,7 +25,6 @@ using Windows.Graphics.Imaging;
 using Windows.Storage.Streams;
 using Windows.UI;
 using CalculatorAvatarPromotionDelta = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.AvatarPromotionDelta;
-using CalculatorBatchConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.BatchConsumption;
 using CalculatorClient = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.CalculateClient;
 using CalculatorConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Consumption;
 using CalculatorItem = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Item;
@@ -176,7 +175,7 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
             return;
         }
 
-        if (!UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
+        if (userService.Current is null)
         {
             infoBarService.Warning(SH.MustSelectUserAndUid);
             return;
@@ -197,20 +196,17 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
             return;
         }
 
-        Response<CalculatorBatchConsumption> response = await calculatorClient.BatchComputeAsync(userAndUid, delta).ConfigureAwait(false);
+        CultivateCoreResult result = await CultivateCoreAsync(userService.Current.Entity, delta, avatar).ConfigureAwait(false);
 
-        if (!response.IsOk())
+        switch (result)
         {
-            return;
+            case CultivateCoreResult.Ok:
+                infoBarService.Success(SH.ViewModelCultivationEntryAddSuccess);
+                break;
+            case CultivateCoreResult.SaveConsumptionFailed:
+                infoBarService.Warning(SH.ViewModelCultivationEntryAddWarning);
+                break;
         }
-
-        if (!await SaveCultivationAsync(response.Data.Items.Single(), delta).ConfigureAwait(false))
-        {
-            infoBarService.Warning(SH.ViewModelCultivationEntryAddWarning);
-            return;
-        }
-
-        infoBarService.Success(SH.ViewModelCultivationEntryAddSuccess);
     }
 
     [Command("BatchCultivateCommand")]
@@ -221,7 +217,7 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
             return;
         }
 
-        if (!UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
+        if (userService.Current is null)
         {
             infoBarService.Warning(SH.MustSelectUserAndUid);
             return;
@@ -241,11 +237,9 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
         ContentDialog progressDialog = await contentDialogFactory
             .CreateForIndeterminateProgressAsync(SH.ViewModelAvatarPropertyBatchCultivateProgressTitle)
             .ConfigureAwait(false);
-
-        BatchCultivateResult result = default;
         using (await progressDialog.BlockAsync(taskContext).ConfigureAwait(false))
         {
-            List<CalculatorAvatarPromotionDelta> deltas = [];
+            BatchCultivateResult result = default;
             foreach (AvatarView avatar in avatars)
             {
                 if (!baseline.TryGetNonErrorCopy(avatar, out CalculatorAvatarPromotionDelta? copy))
@@ -254,64 +248,75 @@ internal sealed partial class AvatarPropertyViewModel : Abstraction.ViewModel, I
                     continue;
                 }
 
-                deltas.Add(copy);
-            }
+                CultivateCoreResult coreResult = await CultivateCoreAsync(userService.Current.Entity, copy, avatar).ConfigureAwait(false);
 
-            Response<CalculatorBatchConsumption> response = await calculatorClient.BatchComputeAsync(userAndUid, deltas).ConfigureAwait(false);
-
-            if (!response.IsOk())
-            {
-                return;
-            }
-
-            foreach ((CalculatorConsumption consumption, CalculatorAvatarPromotionDelta delta) in response.Data.Items.Zip(deltas))
-            {
-                if (!await SaveCultivationAsync(consumption, delta).ConfigureAwait(false))
+                switch (coreResult)
                 {
-                    result.Interrupted = true;
-                    break;
+                    case CultivateCoreResult.Ok:
+                        ++result.SucceedCount;
+                        break;
+                    case CultivateCoreResult.ComputeConsumptionFailed:
+                        result.Interrupted = true;
+                        break;
+                    case CultivateCoreResult.SaveConsumptionFailed:
+                        result.Interrupted = true;
+                        break;
                 }
 
-                ++result.SucceedCount;
+                if (result.Interrupted)
+                {
+                    break;
+                }
             }
-        }
 
-        if (result.Interrupted)
-        {
-            infoBarService.Warning(SH.FormatViewModelCultivationBatchAddIncompletedFormat(result.SucceedCount, result.SkippedCount));
-        }
-        else
-        {
-            infoBarService.Success(SH.FormatViewModelCultivationBatchAddCompletedFormat(result.SucceedCount, result.SkippedCount));
+            if (result.Interrupted)
+            {
+                infoBarService.Warning(SH.FormatViewModelCultivationBatchAddIncompletedFormat(result.SucceedCount, result.SkippedCount));
+            }
+            else
+            {
+                infoBarService.Success(SH.FormatViewModelCultivationBatchAddCompletedFormat(result.SucceedCount, result.SkippedCount));
+            }
         }
     }
 
-    private async ValueTask<bool> SaveCultivationAsync(CalculatorConsumption consumption, CalculatorAvatarPromotionDelta delta)
+    private async ValueTask<CultivateCoreResult> CultivateCoreAsync(Model.Entity.User user, CalculatorAvatarPromotionDelta delta, AvatarView avatar)
     {
+        Response<CalculatorConsumption> consumptionResponse = await calculatorClient.ComputeAsync(user, delta).ConfigureAwait(false);
+
+        if (!consumptionResponse.IsOk())
+        {
+            return CultivateCoreResult.ComputeConsumptionFailed;
+        }
+
+        CalculatorConsumption consumption = consumptionResponse.Data;
         LevelInformation levelInformation = LevelInformation.From(delta);
 
         List<CalculatorItem> items = CalculatorItemHelper.Merge(consumption.AvatarConsume, consumption.AvatarSkillConsume);
         bool avatarSaved = await cultivationService
-            .SaveConsumptionAsync(CultivateType.AvatarAndSkill, delta.AvatarId, items, levelInformation)
+            .SaveConsumptionAsync(CultivateType.AvatarAndSkill, avatar.Id, items, levelInformation)
             .ConfigureAwait(false);
 
         try
         {
-            ArgumentNullException.ThrowIfNull(delta.Weapon);
+            ArgumentNullException.ThrowIfNull(avatar.Weapon);
 
             // Take a hot path if avatar is not saved.
             bool avatarAndWeaponSaved = avatarSaved && await cultivationService
-                .SaveConsumptionAsync(CultivateType.Weapon, delta.Weapon.Id, consumption.WeaponConsume.EmptyIfNull(), levelInformation)
+                .SaveConsumptionAsync(CultivateType.Weapon, avatar.Weapon.Id, consumption.WeaponConsume.EmptyIfNull(), levelInformation)
                 .ConfigureAwait(false);
 
-            return avatarAndWeaponSaved;
+            if (!avatarAndWeaponSaved)
+            {
+                return CultivateCoreResult.SaveConsumptionFailed;
+            }
         }
         catch (HutaoException ex)
         {
             infoBarService.Error(ex, SH.ViewModelCultivationAddWarning);
         }
 
-        return true;
+        return CultivateCoreResult.Ok;
     }
 
     [Command("ExportAsImageCommand")]

src/Snap.Hutao/Snap.Hutao/ViewModel/Cultivation/CultivationViewModel.cs

@@ -2,12 +2,10 @@
 // Licensed under the MIT license.
 
 using Microsoft.UI.Xaml.Controls;
-using Snap.Hutao.Control.Extension;
 using Snap.Hutao.Core.ExceptionService;
 using Snap.Hutao.Factory.ContentDialog;
 using Snap.Hutao.Model.Entity;
 using Snap.Hutao.Service.Cultivation;
-using Snap.Hutao.Service.Inventory;
 using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.Service.Navigation;
@@ -31,7 +29,6 @@ internal sealed partial class CultivationViewModel : Abstraction.ViewModel
     private readonly ICultivationService cultivationService;
     private readonly ILogger<CultivationViewModel> logger;
     private readonly INavigationService navigationService;
-    private readonly IInventoryService inventoryService;
     private readonly IMetadataService metadataService;
     private readonly IInfoBarService infoBarService;
     private readonly ITaskContext taskContext;
@@ -143,8 +140,8 @@ internal sealed partial class CultivationViewModel : Abstraction.ViewModel
 
         await taskContext.SwitchToMainThreadAsync();
         CultivateEntries = entries;
+        InventoryItems = cultivationService.GetInventoryItemViews(project, context, SaveInventoryItemCommand);
 
-        await UpdateInventoryItemsAsync().ConfigureAwait(false);
         await UpdateStatisticsItemsAsync().ConfigureAwait(false);
     }
 
@@ -176,35 +173,11 @@ internal sealed partial class CultivationViewModel : Abstraction.ViewModel
     {
         if (inventoryItem is not null)
         {
-            inventoryService.SaveInventoryItem(inventoryItem);
+            cultivationService.SaveInventoryItem(inventoryItem);
             await UpdateStatisticsItemsAsync().ConfigureAwait(false);
         }
     }
 
-    [Command("RefreshInventoryCommand")]
-    private async Task RefreshInventoryAsync()
-    {
-        if (SelectedProject is null)
-        {
-            return;
-        }
-
-        using (await EnterCriticalExecutionAsync().ConfigureAwait(false))
-        {
-            ContentDialog dialog = await contentDialogFactory
-                .CreateForIndeterminateProgressAsync(SH.ViewModelCultivationRefreshInventoryProgress)
-                .ConfigureAwait(false);
-
-            using (await dialog.BlockAsync(taskContext).ConfigureAwait(false))
-            {
-                await inventoryService.RefreshInventoryAsync(SelectedProject).ConfigureAwait(false);
-
-                await UpdateInventoryItemsAsync().ConfigureAwait(false);
-                await UpdateStatisticsItemsAsync().ConfigureAwait(false);
-            }
-        }
-    }
-
     private async ValueTask UpdateStatisticsItemsAsync()
     {
         if (SelectedProject is not null)
@@ -228,18 +201,6 @@ internal sealed partial class CultivationViewModel : Abstraction.ViewModel
         }
     }
 
-    private async ValueTask UpdateInventoryItemsAsync()
-    {
-        if (SelectedProject is not null)
-        {
-            await taskContext.SwitchToBackgroundAsync();
-            CultivationMetadataContext context = await metadataService.GetContextAsync<CultivationMetadataContext>().ConfigureAwait(false);
-
-            await taskContext.SwitchToMainThreadAsync();
-            InventoryItems = inventoryService.GetInventoryItemViews(SelectedProject, context, SaveInventoryItemCommand);
-        }
-    }
-
     [Command("NavigateToPageCommand")]
     private void NavigateToPage(string? typeString)
     {

src/Snap.Hutao/Snap.Hutao/ViewModel/TestViewModel.cs

@@ -10,6 +10,7 @@ using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Core.Windowing;
 using Snap.Hutao.Service.Game.Automation.ScreenCapture;
 using Snap.Hutao.Service.Notification;
+using Snap.Hutao.View.Converter;
 using Snap.Hutao.ViewModel.Guide;
 using Snap.Hutao.Web.Hutao.HutaoAsAService;
 using Snap.Hutao.Win32.Foundation;

src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiAvatarViewModel.cs

@@ -20,14 +20,15 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.View.Dialog;
-using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Response;
 using System.Collections.Frozen;
 using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
 using CalculateAvatarPromotionDelta = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.AvatarPromotionDelta;
-using CalculateBatchConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.BatchConsumption;
 using CalculateClient = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.CalculateClient;
+using CalculateConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Consumption;
+using CalculateItem = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Item;
+using CalculateItemHelper = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.ItemHelper;
 
 namespace Snap.Hutao.ViewModel.Wiki;
 
@@ -148,7 +149,7 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
 
         foreach (Avatar avatar in avatars)
         {
-            avatar.CollocationView = hutaoCache.AvatarCollocations.GetValueOrDefault(avatar.Id);
+            avatar.Collocation = hutaoCache.AvatarCollocations.GetValueOrDefault(avatar.Id);
             avatar.CookBonusView ??= CookBonusView.Create(avatar.FetterInfo.CookBonus, idMaterialMap);
             avatar.CultivationItemsView ??= avatar.CultivationItems.SelectList(i => idMaterialMap.GetValueOrDefault(i, Material.Default));
         }
@@ -162,7 +163,7 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
             return;
         }
 
-        if (!UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
+        if (userService.Current is null)
         {
             infoBarService.Warning(SH.MustSelectUserAndUid);
             return;
@@ -177,21 +178,22 @@ internal sealed partial class WikiAvatarViewModel : Abstraction.ViewModel
             return;
         }
 
-        Response<CalculateBatchConsumption> response = await calculateClient
-            .BatchComputeAsync(userAndUid, delta)
+        Response<CalculateConsumption> consumptionResponse = await calculateClient
+            .ComputeAsync(userService.Current.Entity, delta)
             .ConfigureAwait(false);
 
-        if (!response.IsOk())
+        if (!consumptionResponse.IsOk())
         {
             return;
         }
 
-        CalculateBatchConsumption batchConsumption = response.Data;
+        CalculateConsumption consumption = consumptionResponse.Data;
         LevelInformation levelInformation = LevelInformation.From(delta);
+        List<CalculateItem> items = CalculateItemHelper.Merge(consumption.AvatarConsume, consumption.AvatarSkillConsume);
         try
         {
             bool saved = await cultivationService
-                .SaveConsumptionAsync(CultivateType.AvatarAndSkill, avatar.Id, batchConsumption.OverallConsume, levelInformation)
+                .SaveConsumptionAsync(CultivateType.AvatarAndSkill, avatar.Id, items, levelInformation)
                 .ConfigureAwait(false);
 
             if (saved)

src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiWeaponViewModel.cs

@@ -20,14 +20,13 @@ using Snap.Hutao.Service.Metadata;
 using Snap.Hutao.Service.Notification;
 using Snap.Hutao.Service.User;
 using Snap.Hutao.View.Dialog;
-using Snap.Hutao.ViewModel.User;
 using Snap.Hutao.Web.Response;
 using System.Collections.Frozen;
 using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
 using CalculateAvatarPromotionDelta = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.AvatarPromotionDelta;
-using CalculateBatchConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.BatchConsumption;
 using CalculateClient = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.CalculateClient;
+using CalculateConsumption = Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate.Consumption;
 
 namespace Snap.Hutao.ViewModel.Wiki;
 
@@ -102,7 +101,9 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
 
                 List<Weapon> weapons = await metadataService.GetWeaponListAsync().ConfigureAwait(false);
                 IEnumerable<Weapon> sorted = weapons
-                    .OrderByDescending(weapon => weapon.Sort);
+                    .OrderByDescending(weapon => weapon.RankLevel)
+                    .ThenBy(weapon => weapon.WeaponType)
+                    .ThenByDescending(weapon => weapon.Id.Value);
                 List<Weapon> list = [.. sorted];
 
                 await CombineComplexDataAsync(list, idMaterialMap).ConfigureAwait(false);
@@ -139,7 +140,7 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
 
             foreach (Weapon weapon in weapons)
             {
-                weapon.CollocationView = hutaoCache.WeaponCollocations.GetValueOrDefault(weapon.Id);
+                weapon.Collocation = hutaoCache.WeaponCollocations.GetValueOrDefault(weapon.Id);
                 weapon.CultivationItemsView ??= weapon.CultivationItems.SelectList(i => idMaterialMap.GetValueOrDefault(i, Material.Default));
             }
         }
@@ -153,7 +154,7 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
             return;
         }
 
-        if (!UserAndUid.TryFromUser(userService.Current, out UserAndUid? userAndUid))
+        if (userService.Current is null)
         {
             infoBarService.Warning(SH.MustSelectUserAndUid);
             return;
@@ -168,21 +169,21 @@ internal sealed partial class WikiWeaponViewModel : Abstraction.ViewModel
             return;
         }
 
-        Response<CalculateBatchConsumption> response = await calculateClient
-            .BatchComputeAsync(userAndUid, delta)
+        Response<CalculateConsumption> consumptionResponse = await calculateClient
+            .ComputeAsync(userService.Current.Entity, delta)
             .ConfigureAwait(false);
 
-        if (!response.IsOk())
+        if (!consumptionResponse.IsOk())
         {
             return;
         }
 
-        CalculateBatchConsumption batchConsumption = response.Data;
+        CalculateConsumption consumption = consumptionResponse.Data;
         LevelInformation levelInformation = LevelInformation.From(delta);
         try
         {
             bool saved = await cultivationService
-                .SaveConsumptionAsync(CultivateType.Weapon, weapon.Id, batchConsumption.OverallConsume, levelInformation)
+                .SaveConsumptionAsync(CultivateType.Weapon, weapon.Id, consumption.WeaponConsume.EmptyIfNull(), levelInformation)
                 .ConfigureAwait(false);
 
             if (saved)

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/BatchConsumption.cs

@@ -6,13 +6,13 @@ namespace Snap.Hutao.Web.Hoyolab.Takumi.Event.Calculate;
 internal sealed class BatchConsumption
 {
     [JsonPropertyName("items")]
-    public List<Consumption> Items { get; set; } = default!;
+    public List<Consumption>? Items { get; set; }
 
     [JsonPropertyName("available_material")]
     public List<Item>? AvailableMaterial { get; set; }
 
     [JsonPropertyName("overall_consume")]
-    public List<Item> OverallConsume { get; set; } = default!;
+    public List<Item>? OverallConsume { get; set; }
 
     [JsonPropertyName("has_user_info")]
     public bool HasUserInfo { get; set; }

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/CalculateClient.cs

@@ -19,7 +19,6 @@ internal sealed partial class CalculateClient
     private readonly ILogger<CalculateClient> logger;
     private readonly HttpClient httpClient;
 
-    [Obsolete("Use BatchComputeAsync instead")]
     public async ValueTask<Response<Consumption>> ComputeAsync(Model.Entity.User user, AvatarPromotionDelta delta, CancellationToken token = default)
     {
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()
@@ -35,18 +34,15 @@ internal sealed partial class CalculateClient
         return Response.Response.DefaultIfNull(resp);
     }
 
-    public async ValueTask<Response<BatchConsumption>> BatchComputeAsync(UserAndUid userAndUid, AvatarPromotionDelta delta, bool syncInventory = false, CancellationToken token = default)
+    public async ValueTask<Response<BatchConsumption>> BatchComputeAsync(UserAndUid userAndUid, List<AvatarPromotionDelta> deltas, CancellationToken token = default)
     {
-        return await BatchComputeAsync(userAndUid, [delta], syncInventory, token).ConfigureAwait(false);
-    }
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(deltas.Count, 8);
 
-    public async ValueTask<Response<BatchConsumption>> BatchComputeAsync(UserAndUid userAndUid, List<AvatarPromotionDelta> deltas, bool syncInventory = false, CancellationToken token = default)
-    {
         BatchConsumptionData data = new()
         {
             Items = deltas,
-            Region = syncInventory ? userAndUid.Uid.Region : default!,
-            Uid = syncInventory ? userAndUid.Uid.ToString() : default!,
+            Region = userAndUid.Uid.Region,
+            Uid = userAndUid.Uid.ToString(),
         };
 
         HttpRequestMessageBuilder builder = httpRequestMessageBuilderFactory.Create()

src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Takumi/Event/Calculate/Item.cs

@@ -42,5 +42,5 @@ internal sealed class Item
     public QualityType Level { get; set; }
 
     [JsonPropertyName("lack_num")]
-    public int LackNum { get; set; }
+    public uint LackNum { get; set; }
 }

src/Snap.Hutao/Snap.Hutao/Web/HutaoEndpoints.cs

@@ -278,7 +278,7 @@ internal static class HutaoEndpoints
 
     public const string WallpaperBing = $"{ApiSnapGenshin}/wallpaper/bing";
 
-    public const string WallpaperGenshinLauncher = $"{ApiSnapGenshin}/wallpaper/hoyoplay";
+    public const string WallpaperGenshinLauncher = $"{ApiSnapGenshin}/wallpaper/genshin-launcher";
 
     public const string WallpaperToday = $"{ApiSnapGenshin}/wallpaper/today";
     #endregion

src/Snap.Hutao/Snap.Hutao/Win32/System/SystemInformation/IMAGE_FILE_MACHINE.cs

@@ -1,6 +1,12 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace Snap.Hutao.Win32.System.SystemInformation;
 
 internal enum IMAGE_FILE_MACHINE : ushort