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

Merge pull request #26668 from peppy/adjust-tick-end-misses

Browse Source 
Adjust slider tick / end miss animations to be less busy
This commit is contained in:
Bartłomiej Dach 2024-01-22 15:03:33 +01:00 committed by GitHub
commit b85a861175
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game.Rulesets.Osu/Skinning/Argon/ArgonJudgementPiece.cs
View File

@ -65,14 +65,15 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss) if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
{ {
this.RotateTo(-45); this.RotateTo(-45);
this.ScaleTo(1.8f); this.ScaleTo(1.6f);
this.ScaleTo(1.2f, 100, Easing.In); this.ScaleTo(1.2f, 100, Easing.In);
this.MoveTo(Vector2.Zero); this.FadeOutFromOne(400);
this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint);
} }
else if (Result.IsMiss()) else if (Result.IsMiss())
{ {
this.FadeOutFromOne(800);
this.ScaleTo(1.6f); this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In); this.ScaleTo(1, 100, Easing.In);
@ -84,14 +85,14 @@ namespace osu.Game.Rulesets.Osu.Skinning.Argon
} }
else else
{ {
this.FadeOutFromOne(800);
JudgementText JudgementText
.FadeInFromZero(300, Easing.OutQuint) .FadeInFromZero(300, Easing.OutQuint)
.ScaleTo(Vector2.One) .ScaleTo(Vector2.One)
.ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint); .ScaleTo(new Vector2(1.2f), 1800, Easing.OutQuint);
} }
this.FadeOutFromOne(800);
ringExplosion?.PlayAnimation(); ringExplosion?.PlayAnimation();
} }

9
osu.Game/Rulesets/Judgements/DefaultJudgementPiece.cs
View File

@ -45,13 +45,14 @@ namespace osu.Game.Rulesets.Judgements
if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss) if (Result == HitResult.IgnoreMiss || Result == HitResult.LargeTickMiss)
{ {
this.RotateTo(-45); this.RotateTo(-45);
this.ScaleTo(1.8f); this.ScaleTo(1.6f);
this.ScaleTo(1.2f, 100, Easing.In); this.ScaleTo(1.2f, 100, Easing.In);
this.MoveTo(Vector2.Zero); this.FadeOutFromOne(400);
this.MoveToOffset(new Vector2(0, 10), 800, Easing.InQuint); return;
} }
else if (Result.IsMiss())
if (Result.IsMiss())
{ {
this.ScaleTo(1.6f); this.ScaleTo(1.6f);
this.ScaleTo(1, 100, Easing.In); this.ScaleTo(1, 100, Easing.In);

10
osu.Game/Skinning/LegacyJudgementPieceOld.cs
View File

@ -63,14 +63,10 @@ namespace osu.Game.Skinning
// missed ticks / slider end don't get the normal animation. // missed ticks / slider end don't get the normal animation.
if (isMissedTick()) if (isMissedTick())
{ {
this.ScaleTo(1.6f); this.ScaleTo(1.2f);
this.ScaleTo(1, 100, Easing.In); this.ScaleTo(1f, 100, Easing.In);
if (legacyVersion > 1.0m) this.FadeOutFromOne(400);
{
this.MoveTo(new Vector2(0, -2f));
this.MoveToOffset(new Vector2(0, 10), fade_out_delay + fade_out_length, Easing.In);
}
} }
else else
{ {