mirror of
https://github.com/ppy/osu.git
synced 2025-01-15 15:12:57 +08:00
rename AccuracyBar to HitErrorDisplay
This commit is contained in:
parent
2a35c3c3e2
commit
177a317a48
@ -16,7 +16,7 @@ using osu.Framework.Allocation;
|
|||||||
|
|
||||||
namespace osu.Game.Screens.Play.HUD
|
namespace osu.Game.Screens.Play.HUD
|
||||||
{
|
{
|
||||||
public class AccuracyBar : Container
|
public class HitErrorDisplay : Container
|
||||||
{
|
{
|
||||||
private const int bar_width = 5;
|
private const int bar_width = 5;
|
||||||
private const int bar_height = 250;
|
private const int bar_height = 250;
|
||||||
@ -31,7 +31,7 @@ namespace osu.Game.Screens.Play.HUD
|
|||||||
private readonly SpriteIcon arrow;
|
private readonly SpriteIcon arrow;
|
||||||
private readonly List<double> judgementOffsets = new List<double>();
|
private readonly List<double> judgementOffsets = new List<double>();
|
||||||
|
|
||||||
public AccuracyBar(bool mirrored = false)
|
public HitErrorDisplay(bool mirrored = false)
|
||||||
{
|
{
|
||||||
this.mirrored = mirrored;
|
this.mirrored = mirrored;
|
||||||
|
|
@ -35,8 +35,8 @@ namespace osu.Game.Screens.Play
|
|||||||
public readonly ModDisplay ModDisplay;
|
public readonly ModDisplay ModDisplay;
|
||||||
public readonly HoldForMenuButton HoldToQuit;
|
public readonly HoldForMenuButton HoldToQuit;
|
||||||
public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
|
public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
|
||||||
public readonly AccuracyBar LeftAccuracyBar;
|
public readonly HitErrorDisplay LeftHitErrorDisplay;
|
||||||
public readonly AccuracyBar RightAccuracyBar;
|
public readonly HitErrorDisplay RightHitErrorDisplay;
|
||||||
|
|
||||||
public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
|
public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
|
||||||
|
|
||||||
@ -86,8 +86,8 @@ namespace osu.Game.Screens.Play
|
|||||||
HealthDisplay = CreateHealthDisplay(),
|
HealthDisplay = CreateHealthDisplay(),
|
||||||
Progress = CreateProgress(),
|
Progress = CreateProgress(),
|
||||||
ModDisplay = CreateModsContainer(),
|
ModDisplay = CreateModsContainer(),
|
||||||
LeftAccuracyBar = CreateAccuracyBar(false),
|
LeftHitErrorDisplay = CreateAccuracyBar(false),
|
||||||
RightAccuracyBar = CreateAccuracyBar(),
|
RightHitErrorDisplay = CreateAccuracyBar(),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
|
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
|
||||||
@ -260,7 +260,7 @@ namespace osu.Game.Screens.Play
|
|||||||
Margin = new MarginPadding { Top = 20, Right = 10 },
|
Margin = new MarginPadding { Top = 20, Right = 10 },
|
||||||
};
|
};
|
||||||
|
|
||||||
protected virtual AccuracyBar CreateAccuracyBar(bool mirrored = true) => new AccuracyBar(mirrored)
|
protected virtual HitErrorDisplay CreateAccuracyBar(bool mirrored = true) => new HitErrorDisplay(mirrored)
|
||||||
{
|
{
|
||||||
Anchor = mirrored ? Anchor.CentreRight : Anchor.CentreLeft,
|
Anchor = mirrored ? Anchor.CentreRight : Anchor.CentreLeft,
|
||||||
Origin = mirrored ? Anchor.CentreRight : Anchor.CentreLeft,
|
Origin = mirrored ? Anchor.CentreRight : Anchor.CentreLeft,
|
||||||
@ -276,16 +276,16 @@ namespace osu.Game.Screens.Play
|
|||||||
ComboCounter?.Current.BindTo(processor.Combo);
|
ComboCounter?.Current.BindTo(processor.Combo);
|
||||||
HealthDisplay?.Current.BindTo(processor.Health);
|
HealthDisplay?.Current.BindTo(processor.Health);
|
||||||
|
|
||||||
if (LeftAccuracyBar != null)
|
if (LeftHitErrorDisplay != null)
|
||||||
{
|
{
|
||||||
processor.NewJudgement += LeftAccuracyBar.OnNewJudgement;
|
processor.NewJudgement += LeftHitErrorDisplay.OnNewJudgement;
|
||||||
LeftAccuracyBar.HitWindows = processor.CreateHitWindows();
|
LeftHitErrorDisplay.HitWindows = processor.CreateHitWindows();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (RightAccuracyBar != null)
|
if (RightHitErrorDisplay != null)
|
||||||
{
|
{
|
||||||
processor.NewJudgement += RightAccuracyBar.OnNewJudgement;
|
processor.NewJudgement += RightHitErrorDisplay.OnNewJudgement;
|
||||||
RightAccuracyBar.HitWindows = processor.CreateHitWindows();
|
RightHitErrorDisplay.HitWindows = processor.CreateHitWindows();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HealthDisplay is StandardHealthDisplay shd)
|
if (HealthDisplay is StandardHealthDisplay shd)
|
||||||
|
Loading…
Reference in New Issue
Block a user