diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index eb7bdfde..2450ca89 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -2636,6 +2636,12 @@ Webview2 运行时 + + 下半 + + + 上半 + 搭配圣遗物 diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml index 6feefaea..e7af33c6 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SpiralAbyssRecordPage.xaml @@ -532,14 +532,30 @@ - + + + + + + + + + + @@ -691,40 +707,59 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs index 19a7e5bc..f1cec9d8 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/Team.cs @@ -21,7 +21,7 @@ internal sealed class Team : List /// /// 队伍 /// 映射 - public Team(ItemRate team, Dictionary idAvatarMap) + public Team(ItemRate team, Dictionary idAvatarMap, int rank) : base(4) { foreach (StringSegment item in new StringTokenizer(team.Item, [','])) @@ -33,10 +33,13 @@ internal sealed class Team : List AddRange(new AvatarView[4 - Count]); Rate = SH.FormatModelBindingHutaoTeamUpCountFormat(team.Rate); + Rank = rank; } /// /// 上场次数 /// public string Rate { get; } + + public int Rank { get; set; } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs index 58ff9c2c..8cdd1f1e 100644 --- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs +++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Complex/TeamAppearanceView.cs @@ -21,8 +21,8 @@ internal sealed class TeamAppearanceView public TeamAppearanceView(TeamAppearance teamRank, Dictionary idAvatarMap) { Floor = SH.FormatModelBindingHutaoComplexRankFloor(teamRank.Floor); - Up = teamRank.Up.SelectList(teamRate => new Team(teamRate, idAvatarMap)); - Down = teamRank.Down.SelectList(teamRate => new Team(teamRate, idAvatarMap)); + Up = teamRank.Up.SelectList((teamRate, index) => new Team(teamRate, idAvatarMap, index + 1)); + Down = teamRank.Down.SelectList((teamRate, index) => new Team(teamRate, idAvatarMap, index + 1)); } ///