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

General fixes.

Browse Source
This commit is contained in:
smoogipooo 2017-03-10 13:02:50 +09:00
parent 4cc032e1d7
commit 444c645da0
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Modes/UI/HUDOverlay.cs
View File

@ -13,7 +13,7 @@ using System;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
{ {
internal abstract class HUDOverlay : Container internal abstract class HudOverlay : Container
{ {
public readonly KeyCounterCollection KeyCounter; public readonly KeyCounterCollection KeyCounter;
public readonly ComboCounter ComboCounter; public readonly ComboCounter ComboCounter;
@ -42,7 +42,7 @@ namespace osu.Game.Modes.UI
AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f); AccuracyCounter?.Set(AccuracyCounter.Count - 0.01f);
} }
protected HUDOverlay(Ruleset ruleset) protected HudOverlay(Ruleset ruleset)
{ {
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;

6
osu.Game/Modes/UI/HealthDisplay.cs
View File

@ -14,11 +14,11 @@ namespace osu.Game.Modes.UI
MaxValue = 1 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);
} }
} }

4
osu.Game/Modes/UI/StandardHUDOverlay.cs
View File

@ -10,9 +10,9 @@ using osu.Game.Screens.Play;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
{ {
internal class StandardHUDOverlay : HUDOverlay internal class StandardHudOverlay : HudOverlay
{ {
public StandardHUDOverlay(Ruleset ruleset) public StandardHudOverlay(Ruleset ruleset)
: base(ruleset) : base(ruleset)
{ {
} }

4
osu.Game/Modes/UI/StandardHealthDisplay.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Graphics;
namespace osu.Game.Modes.UI namespace osu.Game.Modes.UI
{ {
class StandardHealthDisplay : HealthDisplay internal class StandardHealthDisplay : HealthDisplay
{ {
private Container fill; 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);
} }
} }

4
osu.Game/Screens/Play/Player.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game.Screens.Play
private Bindable<int> dimLevel; private Bindable<int> dimLevel;
private SkipButton skipButton; private SkipButton skipButton;
private HUDOverlay hudOverlay; private HudOverlay hudOverlay;
private PauseOverlay pauseOverlay; private PauseOverlay pauseOverlay;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -112,7 +112,7 @@ namespace osu.Game.Screens.Play
ruleset = Ruleset.GetRuleset(Beatmap.PlayMode); ruleset = Ruleset.GetRuleset(Beatmap.PlayMode);
hudOverlay = new StandardHUDOverlay(ruleset); hudOverlay = new StandardHudOverlay(ruleset);
hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count)); hudOverlay.BindProcessor(scoreProcessor = ruleset.CreateScoreProcessor(beatmap.HitObjects.Count));
pauseOverlay = new PauseOverlay pauseOverlay = new PauseOverlay

4
osu.Game/osu.Game.csproj
View File

@ -169,7 +169,7 @@
<Compile Include="Screens\Play\PlayerLoader.cs" /> <Compile Include="Screens\Play\PlayerLoader.cs" />
<Compile Include="Screens\Play\SkipButton.cs" /> <Compile Include="Screens\Play\SkipButton.cs" />
<Compile Include="Modes\UI\StandardComboCounter.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\CarouselContainer.cs" />
<Compile Include="Screens\Select\MatchSongSelect.cs" /> <Compile Include="Screens\Select\MatchSongSelect.cs" />
<Compile Include="Screens\OsuGameScreen.cs" /> <Compile Include="Screens\OsuGameScreen.cs" />
@ -184,7 +184,7 @@
<Compile Include="Screens\Select\PlaySongSelect.cs" /> <Compile Include="Screens\Select\PlaySongSelect.cs" />
<Compile Include="Modes\UI\HitRenderer.cs" /> <Compile Include="Modes\UI\HitRenderer.cs" />
<Compile Include="Modes\UI\Playfield.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="Screens\Select\EditSongSelect.cs" />
<Compile Include="Modes\UI\ComboCounter.cs" /> <Compile Include="Modes\UI\ComboCounter.cs" />
<Compile Include="Modes\UI\ComboResultCounter.cs" /> <Compile Include="Modes\UI\ComboResultCounter.cs" />