修复颂愿的某些展示问题

Author: nahida-mouo

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Model/Metadata/Item/BeyondItem.cs

@@ -1,5 +1,6 @@
 using Snap.Hutao.Remastered.Model.Intrinsic;
 using Snap.Hutao.Remastered.Model.Metadata.Abstraction;
+using Snap.Hutao.Remastered.Model.Metadata.Avatar;
 using Snap.Hutao.Remastered.Model.Metadata.Converter;
 using Snap.Hutao.Remastered.Model.Primitive;
 using Snap.Hutao.Remastered.ViewModel.GachaLog;
@@ -9,15 +10,16 @@ namespace Snap.Hutao.Remastered.Model.Metadata.Item;
 public partial class BeyondItem : 
     IDefaultIdentity<BeyondItemId>,
     ISummaryItemConvertible,
-    IStatisticsItemConvertible
+    IStatisticsItemConvertible,
+    IItemConvertible
 {
     public required BeyondItemId Id { get; init; }
 
     public required QualityType RankLevel { get; init; }
 
-    public string? Icon { get; set; }
+    public string Icon { get; set; } = string.Empty;
 
-    public string? Name { get; set; }
+    public string Name { get; set; } = string.Empty;
 
     public string? Description { get; set; }
 
@@ -55,4 +57,17 @@ public StatisticsItem ToStatisticsItem(int count)
             Count = count,
         };
     }
+
+    public TItem ToItem<TItem>()
+        where TItem : Model.Item, new()
+    {
+        return new()
+        {
+            Id = Id,
+            Name = Name,
+            Icon = BeyondItemNameIconConverter.IconNameToUri(Icon),
+            Badge = BeyondItemNameIconConverter.IconNameToUri(Icon),
+            Quality = Quality,
+        };
+    }
 }

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

@@ -228,6 +228,9 @@
   <data name="ModelBindingGachaTypedWishSummaryAveragePull" xml:space="preserve">
     <value>{0:f2} 抽</value>
   </data>
+  <data name="ViewControlStatisticsCardToLastBlueText" xml:space="preserve">
+    <value>距上个三星</value>
+  </data>
   <data name="ModelBindingGachaTypedWishSummaryMaxOrangePull" xml:space="preserve">
     <value>最非 {0} 抽</value>
   </data>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Service/GachaLog/BeyondGachaLogFetchContext.cs

@@ -3,7 +3,9 @@
 
 using Snap.Hutao.Remastered.Core.Database;
 using Snap.Hutao.Remastered.Model.Entity;
+using Snap.Hutao.Remastered.Model.Metadata.Abstraction;
 using Snap.Hutao.Remastered.Service.GachaLog.QueryProvider;
+using Snap.Hutao.Remastered.Service.Metadata.ContextAbstraction;
 using Snap.Hutao.Remastered.Web.Hoyolab.Hk4e.Event.GachaInfo;
 using System.Collections.Immutable;
 
@@ -72,8 +74,7 @@ public void AddItem(BeyondGachaLogItem item)
     {
         ArgumentNullException.ThrowIfNull(TargetArchive);
         ItemsToAdd.Add(BeyondGachaItem.From(TargetArchive.InnerId, item));
-        // For beyond gacha items, we don't have a direct way to get the item from serviceContext
-        // So we'll add a placeholder item or skip adding to status
+        Status.Items.Add(serviceContext.GetBeyondItem(uint.Parse(item.ItemId)).GetOrCreateItem());
         TypedQueryOptions.EndId = item.Id;
     }
 

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

@@ -184,7 +184,9 @@ public TypedWishSummary ToTypedWishSummary(AsyncBarrier barrier)
             LastOrangePull = lastOrangePullTracker,
             GuaranteeOrangeThreshold = context.GuaranteeOrangeThreshold,
             LastPurplePull = lastPurplePullTracker,
+                LastBluePull = lastBluePullTracker,
             GuaranteePurpleThreshold = context.GuaranteePurpleThreshold,
+                GuaranteeBlueThreshold = context.GuaranteeBlueThreshold,
             TotalOrangePull = totalOrangePullTracker,
             TotalPurplePull = totalPurplePullTracker,
             TotalBluePull = totalBluePullTracker,

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/Service/GachaLog/Factory/TypedWishSummaryBuilderContext.cs

@@ -15,6 +15,7 @@ public readonly struct TypedWishSummaryBuilderContext
     public readonly string Name;
     public readonly int GuaranteeOrangeThreshold;
     public readonly int GuaranteePurpleThreshold;
+        public readonly int GuaranteeBlueThreshold;
     public readonly Func<GachaType, bool> TypeEvaluator;
     public readonly GachaDistributionType DistributionType;
     public readonly bool SummarizePurple;
@@ -32,6 +33,7 @@ public TypedWishSummaryBuilderContext(
         string name,
         int guaranteeOrangeThreshold,
         int guaranteePurpleThreshold,
+        int guaranteeBlueThreshold,
         Func<GachaType, bool> typeEvaluator,
         GachaDistributionType distributionType,
         bool summarizePurple = false,
@@ -42,6 +44,7 @@ public TypedWishSummaryBuilderContext(
         Name = name;
         GuaranteeOrangeThreshold = guaranteeOrangeThreshold;
         GuaranteePurpleThreshold = guaranteePurpleThreshold;
+        GuaranteeBlueThreshold = guaranteeBlueThreshold;
         TypeEvaluator = typeEvaluator;
         DistributionType = distributionType;
         SummarizePurple = summarizePurple;
@@ -50,32 +53,32 @@ public TypedWishSummaryBuilderContext(
 
     public static TypedWishSummaryBuilderContext StandardWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryPermanentWishName, 90, 10, IsStandardWish, GachaDistributionType.Standard);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryPermanentWishName, 90, 10, 0, IsStandardWish, GachaDistributionType.Standard);
     }
 
     public static TypedWishSummaryBuilderContext AvatarEventWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryAvatarWishName, 90, 10, IsAvatarEventWish, GachaDistributionType.AvatarEvent);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryAvatarWishName, 90, 10, 0, IsAvatarEventWish, GachaDistributionType.AvatarEvent);
     }
 
     public static TypedWishSummaryBuilderContext WeaponEventWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryWeaponWishName, 80, 10, IsWeaponEventWish, GachaDistributionType.WeaponEvent);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryWeaponWishName, 80, 10, 0, IsWeaponEventWish, GachaDistributionType.WeaponEvent);
     }
 
     public static TypedWishSummaryBuilderContext ChronicledWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryChronicledWishName, 90, 10, IsChronicledWish, GachaDistributionType.Chronicled);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryChronicledWishName, 90, 10, 0, IsChronicledWish, GachaDistributionType.Chronicled);
     }
 
     public static TypedWishSummaryBuilderContext BeyondStandardWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryBeyondPermanentWishName, int.MaxValue, 70, IsBeyondStandardWish, GachaDistributionType.BeyondStandard, true, true);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryBeyondPermanentWishName, int.MaxValue, 90, 10, IsBeyondStandardWish, GachaDistributionType.BeyondStandard, true, true);
     }
 
     public static TypedWishSummaryBuilderContext BeyondEventWish(GachaStatisticsFactoryContext context)
     {
-        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryBeyondEventWishName, 90, 10, IsBeyondEventWish, GachaDistributionType.BeyondEvent, true);
+        return new(context.ServiceProvider, SH.ServiceGachaLogFactoryBeyondEventWishName, 90, 10, 0, IsBeyondEventWish, GachaDistributionType.BeyondEvent, true);
     }
 
     public TypedWishSummaryBuilder CreateBuilder()

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

@@ -317,5 +317,8 @@
     <None Update="Snap.Hutao.Remastered.Deployment.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Page Update="UI\Xaml\View\Specialized\BeyondStandardStatisticsCard.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
 </Project>

src/Snap.Hutao.Remastered/Snap.Hutao.Remastered/UI/Xaml/View/Page/GachaLogPage.xaml

@@ -444,10 +444,9 @@
                             DataContext="{Binding Statistics.ChronicledWish}" 
                             ShowUpPull="False"
                             Visibility="{Binding DataContext.IsBeyondMode, ElementName=RootPage, Converter={StaticResource BoolNegationToVisibilityConverter}}"/>
-                        <shuxvs:StatisticsCard 
+                        <shuxvs:BeyondStatisticsCard 
                             DataContext="{Binding Statistics.BeyondStandardWish}"
                             Visibility="{Binding DataContext.IsBeyondMode, ElementName=RootPage, Converter={StaticResource BoolToVisibilityConverter}}"
-                            ShowOrange="False"
                             ShowUpPull="False"/>
                         <shuxvs:StatisticsCard 
                             DataContext="{Binding Statistics.BeyondEventWish}"