Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix GI 4.1 metadata ccrash on spiralabyss & improve wiki avatar ui

Browse Source
This commit is contained in:
DismissedLight
2023-09-25 22:20:14 +08:00
parent 43aebf7d0c
commit c2d3bd1798
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Snap.Hutao/Snap.Hutao/Model/Metadata/MonsterRelationship.cs
View File

@@ -17,6 +17,8 @@ internal static class MonsterRelationship
5041U => 504U, // 幻形蟹 · 水 (强化) 5041U => 504U, // 幻形蟹 · 水 (强化)
5070U => 507U, // 幻形花鼠 · 水 5070U => 507U, // 幻形花鼠 · 水
5071U => 507U, // 幻形花鼠 · 水 (强化) 5071U => 507U, // 幻形花鼠 · 水 (强化)
5102U => 510U, // 历经百战的浊水粉碎幻灵
5112U => 511U, // 历经百战的浊水喷吐幻灵
60402U => 60401U, // (火)岩龙蜥 60402U => 60401U, // (火)岩龙蜥
60403U => 60401U, // (冰)岩龙蜥 60403U => 60401U, // (冰)岩龙蜥
60404U => 60401U, // (雷)岩龙蜥 60404U => 60401U, // (雷)岩龙蜥

2
src/Snap.Hutao/Snap.Hutao/Service/SpiralAbyss/SpiralAbyssRecordService.cs
View File

@@ -66,7 +66,7 @@ internal sealed partial class SpiralAbyssRecordService : ISpiralAbyssRecordServi
ArgumentNullException.ThrowIfNull(metadataContext); ArgumentNullException.ThrowIfNull(metadataContext);
spiralAbysses = metadataContext.IdScheduleMap.Values spiralAbysses = metadataContext.IdScheduleMap.Values
.Select(sch => SpiralAbyssView.From(entryMap.GetValueOrDefault(sch.Id), sch, metadataContext)) .Select(sch => SpiralAbyssView.From(entryMap.GetValueOrDefault(sch.Id), sch, metadataContext))
.Reverse() .OrderByDescending(e => e.ScheduleId)
.ToObservableCollection(); .ToObservableCollection();
} }

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

@@ -543,16 +543,15 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}"> Header="{shcm:ResourceString Name=ViewPageWiKiAvatarQuotesHeader}">
<ItemsControl ItemsSource="{Binding Selected.FetterInfo.Fetters}"> <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.Fetters}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Margin="0,0,0,0"> <StackPanel Margin="0,0,0,0">
<TextBlock Text="{Binding Title}"/> <TextBlock Text="{Binding Title}"/>
<shct:DescriptionTextBlock Margin="0,8,0,0" Description="{Binding Context}"> <shct:DescriptionTextBlock
<shct:DescriptionTextBlock.Resources> Margin="0,8,0,0"
<Style BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock"/> Description="{Binding Context}"
</shct:DescriptionTextBlock.Resources> TextStyle="{StaticResource CaptionTextBlockStyle}"/>
</shct:DescriptionTextBlock>
<MenuFlyoutSeparator Margin="0,8"/> <MenuFlyoutSeparator Margin="0,8"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
@@ -565,7 +564,7 @@
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch" HorizontalContentAlignment="Stretch"
Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}"> Header="{shcm:ResourceString Name=ViewPageWiKiAvatarStoriesHeader}">
<ItemsControl ItemsSource="{Binding Selected.FetterInfo.FetterStories}"> <ItemsControl Margin="0,0,0,-24" ItemsSource="{Binding Selected.FetterInfo.FetterStories}">
<ItemsControl.ItemTemplate> <ItemsControl.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Margin="0,0,0,0"> <StackPanel Margin="0,0,0,0">