mirror of
https://github.com/ppy/osu
synced 2025-03-24 11:56:58 +00:00
Revert "Add "Argon" performance points counter"
This reverts commit 56eeb117ce
.
This commit is contained in:
parent
1c844a155e
commit
58a830fc5b
osu.Game.Tests/Visual/Gameplay
osu.Game/Screens/Play
@ -16,6 +16,7 @@ using osu.Game.Rulesets.Osu;
|
|||||||
using osu.Game.Rulesets.Osu.Judgements;
|
using osu.Game.Rulesets.Osu.Judgements;
|
||||||
using osu.Game.Rulesets.Scoring;
|
using osu.Game.Rulesets.Scoring;
|
||||||
using osu.Game.Screens.Play;
|
using osu.Game.Screens.Play;
|
||||||
|
using osu.Game.Screens.Play.HUD;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Gameplay
|
namespace osu.Game.Tests.Visual.Gameplay
|
||||||
@ -29,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
|
|
||||||
private int iteration;
|
private int iteration;
|
||||||
private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
|
private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
|
||||||
private ArgonPerformancePointsCounter counter;
|
private PerformancePointsCounter counter;
|
||||||
|
|
||||||
[SetUpSteps]
|
[SetUpSteps]
|
||||||
public void SetUpSteps() => AddStep("create components", () =>
|
public void SetUpSteps() => AddStep("create components", () =>
|
||||||
@ -65,7 +66,7 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
|
|
||||||
private void createCounter() => AddStep("Create counter", () =>
|
private void createCounter() => AddStep("Create counter", () =>
|
||||||
{
|
{
|
||||||
dependencyContainer.Child = counter = new ArgonPerformancePointsCounter
|
dependencyContainer.Child = counter = new PerformancePointsCounter
|
||||||
{
|
{
|
||||||
Anchor = Anchor.Centre,
|
Anchor = Anchor.Centre,
|
||||||
Origin = Anchor.Centre,
|
Origin = Anchor.Centre,
|
||||||
|
@ -1,62 +0,0 @@
|
|||||||
// 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 osu.Framework.Allocation;
|
|
||||||
using osu.Framework.Extensions.LocalisationExtensions;
|
|
||||||
using osu.Framework.Graphics;
|
|
||||||
using osu.Framework.Graphics.Containers;
|
|
||||||
using osu.Framework.Graphics.Sprites;
|
|
||||||
using osu.Framework.Localisation;
|
|
||||||
using osu.Game.Graphics;
|
|
||||||
using osu.Game.Graphics.Sprites;
|
|
||||||
using osu.Game.Resources.Localisation.Web;
|
|
||||||
using osu.Game.Screens.Play.HUD;
|
|
||||||
using osu.Game.Skinning;
|
|
||||||
|
|
||||||
namespace osu.Game.Screens.Play
|
|
||||||
{
|
|
||||||
public partial class ArgonPerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
|
|
||||||
{
|
|
||||||
public bool UsesFixedAnchor { get; set; }
|
|
||||||
|
|
||||||
[BackgroundDependencyLoader]
|
|
||||||
private void load()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override IHasText CreateText() => new TextComponent();
|
|
||||||
|
|
||||||
private partial class TextComponent : CompositeDrawable, IHasText
|
|
||||||
{
|
|
||||||
private readonly OsuSpriteText text;
|
|
||||||
|
|
||||||
public LocalisableString Text
|
|
||||||
{
|
|
||||||
get => text.Text;
|
|
||||||
set => text.Text = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TextComponent()
|
|
||||||
{
|
|
||||||
AutoSizeAxes = Axes.Both;
|
|
||||||
|
|
||||||
InternalChild = new FillFlowContainer
|
|
||||||
{
|
|
||||||
Direction = FillDirection.Vertical,
|
|
||||||
Children = new[]
|
|
||||||
{
|
|
||||||
new OsuSpriteText
|
|
||||||
{
|
|
||||||
Text = BeatmapsetsStrings.ShowScoreboardHeaderspp.ToUpper(),
|
|
||||||
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
|
|
||||||
},
|
|
||||||
text = new OsuSpriteText
|
|
||||||
{
|
|
||||||
Font = OsuFont.Torus.With(size: 16.8f, weight: FontWeight.Regular),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user