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

Fix gameplay limitations for adjusting offset not actually being applied

Browse Source
This commit is contained in:
Dean Herbert 2025-01-16 17:23:02 +09:00
parent a4174a3644
commit 1d240eb405
No known key found for this signature in database
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Screens/Play/Player.cs
View File

@ -322,6 +322,7 @@ namespace osu.Game.Screens.Play
} }
dependencies.CacheAs(DrawableRuleset.FrameStableClock); dependencies.CacheAs(DrawableRuleset.FrameStableClock);
dependencies.CacheAs<IGameplayClock>(DrawableRuleset.FrameStableClock);
// add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components. // add the overlay components as a separate step as they proxy some elements from the above underlay/gameplay components.
// also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.) // also give the overlays the ruleset skin provider to allow rulesets to potentially override HUD elements (used to disable combo counters etc.)

24
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
View File

@ -274,20 +274,36 @@ namespace osu.Game.Screens.Play.PlayerSettings
beatmapOffsetSubscription?.Dispose(); beatmapOffsetSubscription?.Dispose();
} }
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e) protected override void Update()
{
base.Update();
Current.Disabled = !allowOffsetAdjust;
}
private bool allowOffsetAdjust
{
get
{ {
// General limitations to ensure players don't do anything too weird. // General limitations to ensure players don't do anything too weird.
// These match stable for now. // These match stable for now.
if (player is SubmittingPlayer) if (player is SubmittingPlayer)
{ {
Debug.Assert(gameplayClock != null);
// TODO: the blocking conditions should probably display a message. // TODO: the blocking conditions should probably display a message.
if (player?.IsBreakTime.Value == false && gameplayClock?.CurrentTime - gameplayClock?.StartTime > 10000) if (!player.IsBreakTime.Value && gameplayClock.CurrentTime - gameplayClock.StartTime > 10000)
return false; return false;
if (gameplayClock?.IsPaused.Value == true) if (gameplayClock.IsPaused.Value)
return false; return false;
} }
return true;
}
}
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
// To match stable, this should adjust by 5 ms, or 1 ms when holding alt. // To match stable, this should adjust by 5 ms, or 1 ms when holding alt.
// But that is hard to make work with global actions due to the operating mode. // But that is hard to make work with global actions due to the operating mode.
// Let's use the more precise as a default for now. // Let's use the more precise as a default for now.
@ -296,10 +312,12 @@ namespace osu.Game.Screens.Play.PlayerSettings
switch (e.Action) switch (e.Action)
{ {
case GlobalAction.IncreaseOffset: case GlobalAction.IncreaseOffset:
if (!Current.Disabled)
Current.Value += amount; Current.Value += amount;
return true; return true;
case GlobalAction.DecreaseOffset: case GlobalAction.DecreaseOffset:
if (!Current.Disabled)
Current.Value -= amount; Current.Value -= amount;
return true; return true;
} }