sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove special case for moving catcher sprite

Browse Source
This commit is contained in:
Bartłomiej Dach
2020-05-06 23:25:25 +02:00
parent 6376128bde
commit ed83ac188e
2 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,15 +28,6 @@ namespace osu.Game.Rulesets.Catch.UI
/// </summary>
public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
/// <summary>
/// The default hyper-dash colour used directly for this
/// <see cref="Catcher"/>'s <see cref="Drawable.Colour"/>.
/// </summary>
/// <remarks>
/// This colour is only used when no skin overrides <see cref="CatchSkinColour.HyperDash"/>.
/// </remarks>
public static readonly Color4 DEFAULT_CATCHER_HYPER_DASH_COLOUR = Color4.OrangeRed;
/// <summary>
/// The duration between transitioning to hyper-dash state.
/// </summary>
@ -288,13 +279,7 @@ namespace osu.Game.Rulesets.Catch.UI
{
if (hyperDashing)
{
// special behaviour for catcher colour if no skin overrides.
var catcherColour =
hyperDashColour == DEFAULT_HYPER_DASH_COLOUR
? DEFAULT_CATCHER_HYPER_DASH_COLOUR
: hyperDashColour;
this.FadeColour(catcherColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
}
else