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

Fix latch reset logic

Browse Source
This commit is contained in:
Dean Herbert 2022-06-21 14:52:57 +09:00
parent 8ad96fd94b
commit 42701757c3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading;
using osu.Framework.Timing;
using osu.Framework.Utils;
using osu.Game.Beatmaps.ControlPoints;
@ -219,6 +220,8 @@ namespace osu.Game.Screens.Edit.Timing
private readonly BindableInt interpolatedBpm = new BindableInt();
private ScheduledDelegate latchDelegate;
protected override void LoadComplete()
{
base.LoadComplete();
@ -266,12 +269,9 @@ namespace osu.Game.Screens.Edit.Timing
using (swing.BeginDelayedSequence(350))
{
swing.RotateTo(0, 1000, Easing.OutQuint);
swing.Delay(250).Schedule(() =>
{
// prevent playing latch sound if metronome has started back up again
if (!isSwinging)
latch?.Play();
});
using (swing.BeginDelayedSequence(250))
latchDelegate = Schedule(() => latch?.Play());
}
}
}
@ -287,6 +287,9 @@ namespace osu.Game.Screens.Edit.Timing
isSwinging = true;
latchDelegate?.Cancel();
latchDelegate = null;
float currentAngle = swing.Rotation;
float targetAngle = currentAngle > 0 ? -angle : angle;