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

Don't play metronome click when tapping for timing

Browse Source
This commit is contained in:
Dean Herbert 2022-06-01 20:48:06 +09:00
parent d47a3bb8e4
commit 96ccd29bdc
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@ namespace osu.Game.Screens.Edit.Timing
[Resolved]
private OverlayColourProvider overlayColourProvider { get; set; }
public bool EnableClicking { get; set; } = true;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
@ -281,6 +283,9 @@ namespace osu.Game.Screens.Edit.Timing
Schedule(() =>
{
if (!EnableClicking)
return;
var channel = clunk?.GetChannel();
if (channel != null)

4
osu.Game/Screens/Edit/Timing/TapButton.cs
View File

@ -30,6 +30,8 @@ namespace osu.Game.Screens.Edit.Timing
{
public const float SIZE = 100;
public readonly BindableBool IsHandlingTapping = new BindableBool();
[Resolved]
private OverlayColourProvider colourProvider { get; set; } = null!;
@ -213,6 +215,7 @@ namespace osu.Game.Screens.Edit.Timing
const double in_duration = 100;
grabbedMouseDown = true;
IsHandlingTapping.Value = true;
handleTap();
@ -269,6 +272,7 @@ namespace osu.Game.Screens.Edit.Timing
light.Hide();
tapTimings.Clear();
IsHandlingTapping.Value = false;
}
private void handleTap()

12
osu.Game/Screens/Edit/Timing/TapTimingControl.cs
View File

@ -25,6 +25,10 @@ namespace osu.Game.Screens.Edit.Timing
[Resolved]
private Bindable<ControlPointGroup> selectedGroup { get; set; }
private readonly BindableBool isHandlingTapping = new BindableBool();
private MetronomeDisplay metronome;
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
{
@ -73,7 +77,7 @@ namespace osu.Game.Screens.Edit.Timing
{
new Drawable[]
{
new MetronomeDisplay
metronome = new MetronomeDisplay
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
@ -149,11 +153,17 @@ namespace osu.Game.Screens.Edit.Timing
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
IsHandlingTapping = { BindTarget = isHandlingTapping }
}
}
}
},
};
isHandlingTapping.BindValueChanged(handling =>
{
metronome.EnableClicking = !handling.NewValue;
}, true);
}
private void adjustOffset(double adjust)