h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-12 13:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #17012 from peppy/tourney-star-rating-dp

Browse Source
This commit is contained in:
Dean Herbert 2022-02-28 11:18:11 +09:00 committed by GitHub
commit fbf71c500e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game.Tournament.Tests/Components/TestSceneSongBar.cs Normal file
View File

@ -0,0 +1,45 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Game.Beatmaps.Legacy;
using osu.Game.Tests.Visual;
using osu.Game.Tournament.Components;
namespace osu.Game.Tournament.Tests.Components
{
[TestFixture]
public class TestSceneSongBar : OsuTestScene
{
[Test]
public void TestSongBar()
{
SongBar songBar = null;
AddStep("create bar", () => Child = songBar = new SongBar
{
RelativeSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre
});
AddUntilStep("wait for loaded", () => songBar.IsLoaded);
AddStep("set beatmap", () =>
{
var beatmap = CreateAPIBeatmap(Ruleset.Value);
beatmap.CircleSize = 3.4f;
beatmap.ApproachRate = 6.8f;
beatmap.OverallDifficulty = 5.5f;
beatmap.StarRating = 4.56f;
beatmap.Length = 123456;
beatmap.BPM = 133;
songBar.Beatmap = beatmap;
});
AddStep("set mods to HR", () => songBar.Mods = LegacyMods.HardRock);
AddStep("set mods to DT", () => songBar.Mods = LegacyMods.DoubleTime);
AddStep("unset mods", () => songBar.Mods = LegacyMods.None);
}
}
}

2
osu.Game.Tournament/Components/SongBar.cs
View File

@ -186,7 +186,7 @@ namespace osu.Game.Tournament.Components
Children = new Drawable[] Children = new Drawable[]
{ {
new DiffPiece(stats), new DiffPiece(stats),
new DiffPiece(("Star Rating", $"{beatmap.StarRating:0.#}{srExtra}")) new DiffPiece(("Star Rating", $"{beatmap.StarRating:0.##}{srExtra}"))
} }
}, },
new FillFlowContainer new FillFlowContainer

3
osu.Game.Tournament/Components/TournamentBeatmapPanel.cs
View File

@ -24,9 +24,6 @@ namespace osu.Game.Tournament.Components
private readonly string mod; private readonly string mod;
private const float horizontal_padding = 10;
private const float vertical_padding = 10;
public const float HEIGHT = 50; public const float HEIGHT = 50;
private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>(); private readonly Bindable<TournamentMatch> currentMatch = new Bindable<TournamentMatch>();