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

Update catcher hyper-dashing colours on changing hyper-dash state only

Browse Source
This commit is contained in:
Salman Ahmed 2020-04-04 19:29:06 +03:00
parent f3bcb0628c
commit 50604dc7b2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -254,7 +254,10 @@ namespace osu.Game.Rulesets.Catch.UI
hyperDashDirection = 0; hyperDashDirection = 0;
if (wasHyperDashing) if (wasHyperDashing)
{
updateCatcherColour(false);
Trail &= Dashing; Trail &= Dashing;
}
} }
else else
{ {
@ -264,6 +267,7 @@ namespace osu.Game.Rulesets.Catch.UI
if (!wasHyperDashing) if (!wasHyperDashing)
{ {
updateCatcherColour(true);
Trail = true; Trail = true;
var hyperDashEndGlow = createAdditiveSprite(endGlowSprites); var hyperDashEndGlow = createAdditiveSprite(endGlowSprites);
@ -273,15 +277,13 @@ namespace osu.Game.Rulesets.Catch.UI
hyperDashEndGlow.Expire(true); hyperDashEndGlow.Expire(true);
} }
} }
updateCatcherColour();
} }
private void updateCatcherColour() private void updateCatcherColour(bool hyperDashing)
{ {
const float hyper_dash_transition_length = 180; const float hyper_dash_transition_length = 180;
if (HyperDashing) if (hyperDashing)
{ {
this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint); this.FadeColour(hyperDashColour == DefaultHyperDashColour ? Color4.OrangeRed : hyperDashColour, hyper_dash_transition_length, Easing.OutQuint);
this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint); this.FadeTo(0.2f, hyper_dash_transition_length, Easing.OutQuint);
@ -389,9 +391,9 @@ namespace osu.Game.Rulesets.Catch.UI
{ {
base.SkinChanged(skin, allowFallback); base.SkinChanged(skin, allowFallback);
updateCatcherColour();
hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour; hyperDashColour = skin.GetHyperDashCatcherColour()?.Value ?? DefaultHyperDashColour;
hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour; hyperDashEndGlowColour = skin.GetHyperDashEndGlowColour()?.Value ?? DefaultHyperDashColour;
updateCatcherColour(HyperDashing);
} }
protected override void Update() protected override void Update()