h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 17:13:06 +08:00
Code Issues Releases Wiki Activity

Fix sizing and colour not correct on hit

Browse Source
This commit is contained in:
Dean Herbert 2020-07-20 17:22:17 +09:00
parent 55d921ef85
commit 33e58bb7db
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -147,15 +147,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
if (Progress >= 1 && !Disc.Complete) if (Progress >= 1 && !Disc.Complete)
{ {
Disc.Complete = true; Disc.Complete = true;
transformFillColour(completeColour, 200);
const float duration = 200;
Disc.FadeAccent(completeColour, duration);
Background.FadeAccent(completeColour.Darken(1), duration);
circle.FadeColour(completeColour, duration);
glow.FadeColour(completeColour, duration);
} }
if (userTriggered || Time.Current < Spinner.EndTime) if (userTriggered || Time.Current < Spinner.EndTime)
@ -208,18 +200,18 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
using (BeginDelayedSequence(HitObject.TimePreempt / 2, true)) using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
{ {
float phaseOneScale = Spinner.Scale * 0.8f; float phaseOneScale = Spinner.Scale * 0.7f;
circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 2f, Easing.OutQuint); circleContainer.ScaleTo(phaseOneScale, HitObject.TimePreempt / 4, Easing.OutQuint);
mainContainer mainContainer
.ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.4f, HitObject.TimePreempt / 2, Easing.OutElasticHalf) .ScaleTo(phaseOneScale * circle.DrawHeight / DrawHeight * 1.5f, HitObject.TimePreempt / 4, Easing.OutQuint)
.RotateTo(25, HitObject.TimePreempt + Spinner.Duration); .RotateTo((float)(25 * Spinner.Duration / 2000), HitObject.TimePreempt + Spinner.Duration);
using (BeginDelayedSequence(HitObject.TimePreempt / 2, true)) using (BeginDelayedSequence(HitObject.TimePreempt / 2, true))
{ {
circleContainer.ScaleTo(Spinner.Scale * 1.4f, 400, Easing.OutQuint); circleContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint);
mainContainer.ScaleTo(Spinner.Scale, 400, Easing.OutQuint); mainContainer.ScaleTo(1, 400, Easing.OutQuint);
} }
} }
} }
@ -228,18 +220,33 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
base.UpdateStateTransforms(state); base.UpdateStateTransforms(state);
var sequence = this.Delay(Spinner.Duration).FadeOut(160); using (BeginDelayedSequence(Spinner.Duration, true))
{
this.FadeOut(160);
switch (state) switch (state)
{ {
case ArmedState.Hit: case ArmedState.Hit:
sequence.ScaleTo(Scale * 1.2f, 320, Easing.Out); transformFillColour(completeColour, 0);
this.ScaleTo(Scale * 1.2f, 320, Easing.Out);
mainContainer.RotateTo(mainContainer.Rotation + 180, 320);
break; break;
case ArmedState.Miss: case ArmedState.Miss:
sequence.ScaleTo(Scale * 0.8f, 320, Easing.In); this.ScaleTo(Scale * 0.8f, 320, Easing.In);
break; break;
} }
} }
} }
private void transformFillColour(Colour4 colour, double duration)
{
Disc.FadeAccent(colour, duration);
Background.FadeAccent(colour.Darken(1), duration);
circle.FadeColour(colour, duration);
glow.FadeColour(colour, duration);
}
}
} }