RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-14 02:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove osu!catch GotoFrame usage"

Browse Source 
This reverts commit 4406f44165.
This commit is contained in:
Dean Herbert 2020-03-31 11:49:18 +09:00
parent 4406f44165
commit 6d4f9247ea
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics.Animations;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Framework.Timing;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Objects; using osu.Game.Rulesets.Catch.Objects;
@ -380,9 +379,7 @@ namespace osu.Game.Rulesets.Catch.UI
} }
currentCatcher.Show(); currentCatcher.Show();
(currentCatcher.Drawable as IAnimation)?.GotoFrame(0);
if (currentCatcher.Drawable.Clock is FramedOffsetClock offsetClock)
offsetClock.Offset = -Time.Current;
} }
private void beginTrail() private void beginTrail()

2
osu.Game/Skinning/LegacySkinExtensions.cs
View File

@ -71,8 +71,6 @@ namespace osu.Game.Skinning
if (timeReference != null) if (timeReference != null)
Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime }; Clock = new FramedOffsetClock(timeReference.Clock) { Offset = -timeReference.AnimationStartTime };
else
Clock = new FramedOffsetClock(Clock);
} }
} }