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

Tidy up JudgementCounter classes

Browse Source
This commit is contained in:
Dean Herbert 2024-09-18 14:35:18 +09:00
parent 2d993645af
commit c46e9cbce3
No known key found for this signature in database
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCount.cs Normal file
View File

@ -0,0 +1,18 @@
// 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.Bindables;
using osu.Framework.Localisation;
using osu.Game.Rulesets.Scoring;
namespace osu.Game.Screens.Play.HUD.JudgementCounter
{
public struct JudgementCount
{
public LocalisableString DisplayName { get; set; }
public HitResult[] Types { get; set; }
public BindableInt ResultCount { get; set; }
}
}

9
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
View File

@ -67,14 +67,5 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
else else
count.ResultCount.Value++; count.ResultCount.Value++;
} }
public struct JudgementCount
{
public LocalisableString DisplayName { get; set; }
public HitResult[] Types { get; set; }
public BindableInt ResultCount { get; set; }
}
} }
} }

7
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
namespace osu.Game.Screens.Play.HUD.JudgementCounter namespace osu.Game.Screens.Play.HUD.JudgementCounter
@ -19,16 +18,16 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
public BindableBool ShowName = new BindableBool(); public BindableBool ShowName = new BindableBool();
public Bindable<FillDirection> Direction = new Bindable<FillDirection>(); public Bindable<FillDirection> Direction = new Bindable<FillDirection>();
public readonly JudgementCountController.JudgementCount Result; public readonly JudgementCount Result;
public JudgementCounter(JudgementCountController.JudgementCount result) => Result = result; public JudgementCounter(JudgementCount result) => Result = result;
public OsuSpriteText ResultName = null!; public OsuSpriteText ResultName = null!;
private FillFlowContainer flowContainer = null!; private FillFlowContainer flowContainer = null!;
private JudgementRollingCounter counter = null!; private JudgementRollingCounter counter = null!;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, IBindable<RulesetInfo> ruleset) private void load(OsuColour colours)
{ {
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;

2
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
View File

@ -126,7 +126,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
} }
} }
private JudgementCounter createCounter(JudgementCountController.JudgementCount info) => private JudgementCounter createCounter(JudgementCount info) =>
new JudgementCounter(info) new JudgementCounter(info)
{ {
State = { Value = Visibility.Hidden }, State = { Value = Visibility.Hidden },