mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 21:43:21 +08:00
General fixes.
This commit is contained in:
parent
4cc032e1d7
commit
444c645da0
@ -13,7 +13,7 @@ using System;
|
||||
|
||||
namespace osu.Game.Modes.UI
|
||||
{
|
||||
internal abstract class HUDOverlay : Container
|
||||
internal abstract class HudOverlay : Container
|
||||
{
|
||||
public readonly KeyCounterCollection KeyCounter;
|
||||
public readonly ComboCounter ComboCounter;
|
||||
@ -42,7 +42,7 @@ namespace osu.Game.Modes.UI
|
||||
AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f);
|
||||
}
|
||||
|
||||
protected HUDOverlay(Ruleset ruleset)
|
||||
protected HudOverlay(Ruleset ruleset)
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both;
|
||||
|
||||
|
@ -14,11 +14,11 @@ namespace osu.Game.Modes.UI
|
||||
MaxValue = 1
|
||||
};
|
||||
|
||||
public HealthDisplay()
|
||||
protected HealthDisplay()
|
||||
{
|
||||
Current.ValueChanged += (s, e) => setHP((float)Current);
|
||||
Current.ValueChanged += (s, e) => SetHP((float)Current);
|
||||
}
|
||||
|
||||
protected abstract void setHP(float value);
|
||||
protected abstract void SetHP(float value);
|
||||
}
|
||||
}
|
||||
|
@ -10,9 +10,9 @@ using osu.Game.Screens.Play;
|
||||
|
||||
namespace osu.Game.Modes.UI
|
||||
{
|
||||
internal class StandardHUDOverlay : HUDOverlay
|
||||
internal class StandardHudOverlay : HudOverlay
|
||||
{
|
||||
public StandardHUDOverlay(Ruleset ruleset)
|
||||
public StandardHudOverlay(Ruleset ruleset)
|
||||
: base(ruleset)
|
||||
{
|
||||
}
|
||||
|
@ -14,7 +14,7 @@ using osu.Game.Graphics;
|
||||
|
||||
namespace osu.Game.Modes.UI
|
||||
{
|
||||
class StandardHealthDisplay : HealthDisplay
|
||||
internal class StandardHealthDisplay : HealthDisplay
|
||||
{
|
||||
private Container fill;
|
||||
|
||||
@ -55,6 +55,6 @@ namespace osu.Game.Modes.UI
|
||||
};
|
||||
}
|
||||
|
||||
protected override void setHP(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
|
||||
protected override void SetHP(float value) => fill.ScaleTo(new Vector2(value, 1), 200, EasingTypes.OutQuint);
|
||||
}
|
||||
}
|
||||
|
@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
|
||||
private Bindable<int> dimLevel;
|
||||
private SkipButton skipButton;
|
||||
|
||||
private HUDOverlay hudOverlay;
|
||||
private HudOverlay hudOverlay;
|
||||
private PauseOverlay pauseOverlay;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play
|
||||
|
||||
ruleset = Ruleset.GetRuleset(Beatmap.PlayMode);
|
||||
|
||||
hudOverlay = new StandardHUDOverlay(ruleset);
|
||||
hudOverlay = new StandardHudOverlay(ruleset);
|
||||
hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
|
||||
|
||||
pauseOverlay = new PauseOverlay
|
||||
|
@ -169,7 +169,7 @@
|
||||
<Compile Include="Screens\Play\PlayerLoader.cs" />
|
||||
<Compile Include="Screens\Play\SkipButton.cs" />
|
||||
<Compile Include="Modes\UI\StandardComboCounter.cs" />
|
||||
<Compile Include="Modes\UI\StandardHUDOverlay.cs" />
|
||||
<Compile Include="Modes\UI\StandardHudOverlay.cs" />
|
||||
<Compile Include="Screens\Select\CarouselContainer.cs" />
|
||||
<Compile Include="Screens\Select\MatchSongSelect.cs" />
|
||||
<Compile Include="Screens\OsuGameScreen.cs" />
|
||||
@ -184,7 +184,7 @@
|
||||
<Compile Include="Screens\Select\PlaySongSelect.cs" />
|
||||
<Compile Include="Modes\UI\HitRenderer.cs" />
|
||||
<Compile Include="Modes\UI\Playfield.cs" />
|
||||
<Compile Include="Modes\UI\HUDOverlay.cs" />
|
||||
<Compile Include="Modes\UI\HudOverlay.cs" />
|
||||
<Compile Include="Screens\Select\EditSongSelect.cs" />
|
||||
<Compile Include="Modes\UI\ComboCounter.cs" />
|
||||
<Compile Include="Modes\UI\ComboResultCounter.cs" />
|
||||
|
Loading…
Reference in New Issue
Block a user