Skip to content

Commit

Permalink
Merge pull request #26839 from bdach/fix-judgement-fade
Browse files Browse the repository at this point in the history
  • Loading branch information
peppy committed Jan 31, 2024
2 parents 6931af6 + c5e118b commit 012039f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions osu.Game/Skinning/LegacyJudgementPieceOld.cs
Expand Up @@ -46,6 +46,7 @@ public virtual void PlayAnimation()
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)
Expand Down Expand Up @@ -79,8 +80,6 @@ public virtual void PlayAnimation()
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
Expand All @@ -94,8 +93,6 @@ public virtual void PlayAnimation()
// 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);
}
}

Expand Down

0 comments on commit 012039f

Please sign in to comment.