h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:17:51 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4678 from peppy/fix-retry-sound

Browse Source 
Don't play screen "back" sample when retrying
This commit is contained in:
Dan Balasescu 2019-05-07 13:00:20 +09:00 committed by GitHub
commit 5cf7e4603a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/OsuScreen.cs
View File

@ -59,6 +59,8 @@ namespace osu.Game.Screens
private SampleChannel sampleExit; private SampleChannel sampleExit;
protected virtual bool PlayResumeSound => true;
public virtual float BackgroundParallaxAmount => 1; public virtual float BackgroundParallaxAmount => 1;
public Bindable<WorkingBeatmap> Beatmap { get; private set; } public Bindable<WorkingBeatmap> Beatmap { get; private set; }
@ -117,7 +119,8 @@ namespace osu.Game.Screens
public override void OnResuming(IScreen last) public override void OnResuming(IScreen last)
{ {
sampleExit?.Play(); if (PlayResumeSound)
sampleExit?.Play();
applyArrivingDefaults(true); applyArrivingDefaults(true);
base.OnResuming(last); base.OnResuming(last);

2
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -44,6 +44,8 @@ namespace osu.Game.Screens.Play
public override bool DisallowExternalBeatmapRulesetChanges => true; public override bool DisallowExternalBeatmapRulesetChanges => true;
protected override bool PlayResumeSound => false;
private Task loadTask; private Task loadTask;
private InputManager inputManager; private InputManager inputManager;