1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 20:52:54 +08:00

Show auxiliary judgements on next line

This commit is contained in:
Dean Herbert 2020-10-07 16:17:08 +09:00
parent e281d724b8
commit c0bc6a75b3
2 changed files with 15 additions and 5 deletions

View File

@ -64,7 +64,7 @@ namespace osu.Game.Screens.Ranking.Expanded
new CounterStatistic("pp", (int)(score.PP ?? 0)), new CounterStatistic("pp", (int)(score.PP ?? 0)),
}; };
var bottomStatistics = new List<StatisticDisplay>(); var bottomStatistics = new List<HitResultStatistic>();
foreach (var result in score.GetStatisticsForDisplay()) foreach (var result in score.GetStatisticsForDisplay())
bottomStatistics.Add(new HitResultStatistic(result)); bottomStatistics.Add(new HitResultStatistic(result));
@ -198,7 +198,17 @@ namespace osu.Game.Screens.Ranking.Expanded
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
Content = new[] { bottomStatistics.Cast<Drawable>().ToArray() }, Content = new[] { bottomStatistics.Where(s => s.Result <= HitResult.Perfect).ToArray() },
RowDimensions = new[]
{
new Dimension(GridSizeMode.AutoSize),
}
},
new GridContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Content = new[] { bottomStatistics.Where(s => s.Result > HitResult.Perfect).ToArray() },
RowDimensions = new[] RowDimensions = new[]
{ {
new Dimension(GridSizeMode.AutoSize), new Dimension(GridSizeMode.AutoSize),

View File

@ -10,18 +10,18 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
{ {
public class HitResultStatistic : CounterStatistic public class HitResultStatistic : CounterStatistic
{ {
private readonly HitResult result; public readonly HitResult Result;
public HitResultStatistic(HitResultDisplayStatistic result) public HitResultStatistic(HitResultDisplayStatistic result)
: base(result.DisplayName, result.Count, result.MaxCount) : base(result.DisplayName, result.Count, result.MaxCount)
{ {
this.result = result.Result; Result = result.Result;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
HeaderText.Colour = colours.ForHitResult(result); HeaderText.Colour = colours.ForHitResult(Result);
} }
} }
} }