1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00

Merge pull request #26839 from bdach/fix-judgement-fade

This commit is contained in:
Dean Herbert 2024-01-31 09:14:05 +09:00 committed by GitHub
commit 012039ff90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -46,6 +46,7 @@ namespace osu.Game.Skinning
const double fade_out_length = 600;
this.FadeInFromZero(fade_in_length);
this.Delay(fade_out_delay).FadeOut(fade_out_length);
// legacy judgements don't play any transforms if they are an animation.... UNLESS they are the temporary displayed judgement from new piece.
if (animation?.FrameCount > 1 && !forceTransforms)
@ -79,8 +80,6 @@ namespace osu.Game.Skinning
this.RotateTo(0);
this.RotateTo(rotation, fade_in_length)
.Then().RotateTo(rotation * 2, fade_out_delay + fade_out_length - fade_in_length, Easing.In);
this.Delay(fade_out_delay).FadeOut(fade_out_length);
}
}
else
@ -94,8 +93,6 @@ namespace osu.Game.Skinning
// so we need to force the current value to be correct at 1.2 (0.95) then complete the
// second half of the transform.
.ScaleTo(0.95f).ScaleTo(finalScale, fade_in_length * 0.2f); // t = 1.4
this.Delay(fade_out_delay).FadeOut(fade_out_length);
}
}