From c2d3bd1798d83182caea1c5c43324abb6adbd49d Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Mon, 25 Sep 2023 22:20:14 +0800
Subject: [PATCH] fix GI 4.1 metadata ccrash on spiralabyss & improve wiki
 avatar ui

---
 .../Model/Metadata/MonsterRelationship.cs           |  2 ++
 .../Service/SpiralAbyss/SpiralAbyssRecordService.cs |  2 +-
 .../Snap.Hutao/View/Page/WikiAvatarPage.xaml        | 13 ++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/MonsterRelationship.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/MonsterRelationship.cs
index bf8d6028..e8f157d9 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/MonsterRelationship.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/MonsterRelationship.cs
@@ -17,6 +17,8 @@ internal static class MonsterRelationship
             5041U => 504U,      // 幻形蟹 · 水 (强化)
             5070U => 507U,      // 幻形花鼠 · 水
             5071U => 507U,      // 幻形花鼠 · 水 (强化)
+            5102U => 510U,      // 历经百战的浊水粉碎幻灵
+            5112U => 511U,      // 历经百战的浊水喷吐幻灵
             60402U => 60401U,   // (火)岩龙蜥
             60403U => 60401U,   // (冰)岩龙蜥
             60404U => 60401U,   // (雷)岩龙蜥
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
index 05bec7bb..161e45f3 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
@@ -66,7 +66,7 @@ internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordServi
             ArgumentNullException.ThrowIfNull(metadataContext);
             spiralAbysses = metadataContext.IdScheduleMap.Values
                 .Select(sch => SpiralAbyssView.From(entryMap.GetValueOrDefault(sch.Id), sch, metadataContext))
-                .Reverse()
+                .OrderByDescending(e => e.ScheduleId)
                 .ToObservableCollection();
         }
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index 37e5af32..4dfdc168 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -543,16 +543,15 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}">
-                                            <ItemsControl ItemsSource="{Binding Selected.FetterInfo.Fetters}">
+                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.Fetters}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate>
                                                         <StackPanel Margin="0,0,0,0">
                                                             <TextBlock Text="{Binding Title}"/>
-                                                            <shct:DescriptionTextBlock Margin="0,8,0,0" Description="{Binding Context}">
-                                                                <shct:DescriptionTextBlock.Resources>
-                                                                    <Style BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock"/>
-                                                                </shct:DescriptionTextBlock.Resources>
-                                                            </shct:DescriptionTextBlock>
+                                                            <shct:DescriptionTextBlock
+                                                                Margin="0,8,0,0"
+                                                                Description="{Binding Context}"
+                                                                TextStyle="{StaticResource CaptionTextBlockStyle}"/>
                                                             <MenuFlyoutSeparator Margin="0,8"/>
                                                         </StackPanel>
                                                     </DataTemplate>
@@ -565,7 +564,7 @@
                                             HorizontalAlignment="Stretch"
                                             HorizontalContentAlignment="Stretch"
                                             Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}">
-                                            <ItemsControl ItemsSource="{Binding Selected.FetterInfo.FetterStories}">
+                                            <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.FetterStories}">
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate>
                                                         <StackPanel Margin="0,0,0,0">