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

Merge branch 'new-overlay-sounds' into update-resources

Browse Source
This commit is contained in:
Dean Herbert 2021-02-11 14:20:23 +09:00
commit cbdc189ab2
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs
View File

@ -20,6 +20,8 @@ namespace osu.Game.Graphics.Containers
{ {
private SampleChannel samplePopIn; private SampleChannel samplePopIn;
private SampleChannel samplePopOut; private SampleChannel samplePopOut;
protected virtual string PopInSampleName => "UI/overlay-pop-in";
protected virtual string PopOutSampleName => "UI/overlay-pop-out";
protected override bool BlockNonPositionalInput => true; protected override bool BlockNonPositionalInput => true;
@ -40,8 +42,8 @@ namespace osu.Game.Graphics.Containers
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in"); samplePopIn = audio.Samples.Get(PopInSampleName);
samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out"); samplePopOut = audio.Samples.Get(PopOutSampleName);
} }
protected override void LoadComplete() protected override void LoadComplete()

3
osu.Game/Overlays/DialogOverlay.cs
View File

@ -14,6 +14,9 @@ namespace osu.Game.Overlays
{ {
private readonly Container dialogContainer; private readonly Container dialogContainer;
protected override string PopInSampleName => "UI/dialog-pop-in";
protected override string PopOutSampleName => "UI/dialog-pop-out";
public PopupDialog CurrentDialog { get; private set; } public PopupDialog CurrentDialog { get; private set; }
public DialogOverlay() public DialogOverlay()

3
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -51,6 +51,9 @@ namespace osu.Game.Overlays
private Container dragContainer; private Container dragContainer;
private Container playerContainer; private Container playerContainer;
protected override string PopInSampleName => "UI/now-playing-pop-in";
protected override string PopOutSampleName => "UI/now-playing-pop-out";
/// <summary> /// <summary>
/// Provide a source for the toolbar height. /// Provide a source for the toolbar height.
/// </summary> /// </summary>

2
osu.Game/Overlays/SettingsPanel.cs
View File

@ -40,6 +40,8 @@ namespace osu.Game.Overlays
private SeekLimitedSearchTextBox searchTextBox; private SeekLimitedSearchTextBox searchTextBox;
protected override string PopInSampleName => "UI/settings-pop-in";
/// <summary> /// <summary>
/// Provide a source for the toolbar height. /// Provide a source for the toolbar height.
/// </summary> /// </summary>

2
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -18,6 +18,8 @@ namespace osu.Game.Overlays
protected override bool StartHidden => true; protected override bool StartHidden => true;
protected override string PopInSampleName => "UI/wave-pop-in";
protected WaveOverlayContainer() protected WaveOverlayContainer()
{ {
AddInternal(Waves = new WaveContainer AddInternal(Waves = new WaveContainer