Fix merge conflicts.

This commit is contained in:
Lucas A
2020-10-07 13:28:49 +02:00
335 changed files with 6502 additions and 1952 deletions

View File

@ -65,8 +65,9 @@ namespace osu.Game.Screens.Ranking.Expanded
};
var bottomStatistics = new List<StatisticDisplay>();
foreach (var stat in score.SortedStatistics)
bottomStatistics.Add(new HitResultStatistic(stat.Key, stat.Value));
foreach (var (key, value, maxCount) in score.GetStatisticsForDisplay())
bottomStatistics.Add(new HitResultStatistic(key, value, maxCount));
statisticDisplays.AddRange(topStatistics);
statisticDisplays.AddRange(bottomStatistics);