From 853473ebf77cdec978ee170ee824966c61bad838 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 26 Aug 2023 11:05:03 +0800
Subject: [PATCH] fix avatar property page issue

---
 .../Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs   | 5 +----
 .../Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs    | 2 +-
 .../Factory/SummaryReliquarySubPropertyCompositionInfo.cs    | 2 +-
 src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml  | 1 +
 .../ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs
index 81c8af41..cef19647 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryHelper.cs
@@ -23,10 +23,7 @@ internal static class SummaryHelper
     /// <returns>命之座</returns>
     public static List<ConstellationView> CreateConstellations(List<Skill> talents, List<SkillId>? talentIds)
     {
-        if (talentIds.IsNullOrEmpty())
-        {
-            return new();
-        }
+        talentIds ??= new();
 
         return talents.SelectList(talent => new ConstellationView()
         {
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs
index e7299351..42dfa146 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquaryFactory.cs
@@ -121,7 +121,7 @@ internal sealed class SummaryReliquaryFactory
         {
             ReliquarySubAffix subAffix = metadataContext.IdReliquarySubAffixMap[subAffixId];
             SummaryReliquarySubPropertyCompositionInfo info = infos.SingleOrAdd(prop => prop.Type == subAffix.Type, () => new(subAffix.Type));
-            info.Count++;
+            info.Count += 1;
             info.Value += subAffix.Value;
         }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs
index 58b7e451..610bd18f 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryReliquarySubPropertyCompositionInfo.cs
@@ -29,6 +29,6 @@ internal sealed class SummaryReliquarySubPropertyCompositionInfo
 
     public ReliquaryComposedSubProperty ToReliquaryComposedSubProperty()
     {
-        return new(Type, FightPropertyFormat.FormatValue(Type, Value), 0);
+        return new(Type, FightPropertyFormat.FormatValue(Type, Value), 0) { EnhancedCount = Count };
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 57a1f2b0..4ff3222d 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -681,6 +681,7 @@
                                                                                             StrokeThickness="1"/>
                                                                                         <TextBlock
                                                                                             Grid.Column="2"
+                                                                                            Margin="0,0,0,1"
                                                                                             HorizontalAlignment="Center"
                                                                                             VerticalAlignment="Center"
                                                                                             FontSize="{ThemeResource InfoBadgeValueFontSize}"
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs
index 53a7dd82..3a7074f2 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/AvatarProperty/ReliquaryComposedSubProperty.cs
@@ -16,7 +16,7 @@ internal class ReliquaryComposedSubProperty : ReliquarySubProperty
     /// <summary>
     /// 强化次数
     /// </summary>
-    public int EnhancedCount { get; set; }
+    public uint EnhancedCount { get; set; }
 
     internal FightProperty Type { get; }
 }
\ No newline at end of file