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

Merge pull request #11236 from peppy/fix-mania-legacy-judgement-animation

Browse Source 
Update osu!mania legacy skin's judgement animation to match stable
This commit is contained in:
Dean Herbert 2020-12-22 17:09:54 +09:00 committed by GitHub
commit ecacf3868e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyManiaJudgementPiece.cs
View File

@ -5,11 +5,11 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Animations; using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Utils;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.UI; using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Skinning; using osu.Game.Skinning;
using osuTK;
namespace osu.Game.Rulesets.Mania.Skinning.Legacy namespace osu.Game.Rulesets.Mania.Skinning.Legacy
{ {
@ -56,31 +56,30 @@ namespace osu.Game.Rulesets.Mania.Skinning.Legacy
(animation as IFramedAnimation)?.GotoFrame(0); (animation as IFramedAnimation)?.GotoFrame(0);
this.FadeInFromZero(20, Easing.Out)
.Then().Delay(160)
.FadeOutFromOne(40, Easing.In);
switch (result) switch (result)
{ {
case HitResult.None: case HitResult.None:
break; break;
case HitResult.Miss: case HitResult.Miss:
animation.ScaleTo(1.6f); animation.ScaleTo(1.2f).Then().ScaleTo(1, 100, Easing.Out);
animation.ScaleTo(1, 100, Easing.In);
animation.MoveTo(Vector2.Zero);
animation.MoveToOffset(new Vector2(0, 100), 800, Easing.InQuint);
animation.RotateTo(0); animation.RotateTo(0);
animation.RotateTo(40, 800, Easing.InQuint); animation.RotateTo(RNG.NextSingle(-5.73f, 5.73f), 100, Easing.Out);
this.FadeOutFromOne(800);
break; break;
default: default:
animation.ScaleTo(0.8f); animation.ScaleTo(0.8f)
animation.ScaleTo(1, 250, Easing.OutElastic); .Then().ScaleTo(1, 40)
// this is actually correct to match stable; there were overlapping transforms.
animation.Delay(50).ScaleTo(0.75f, 250); .Then().ScaleTo(0.85f)
.Then().ScaleTo(0.7f, 40)
this.Delay(50).FadeOut(200); .Then().Delay(100)
.Then().ScaleTo(0.4f, 40, Easing.In);
break; break;
} }
} }