mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 20:13:21 +08:00
Merge branch 'new-overlay-sounds' into update-resources
This commit is contained in:
commit
cbdc189ab2
@ -20,6 +20,8 @@ namespace osu.Game.Graphics.Containers
|
||||
{
|
||||
private SampleChannel samplePopIn;
|
||||
private SampleChannel samplePopOut;
|
||||
protected virtual string PopInSampleName => "UI/overlay-pop-in";
|
||||
protected virtual string PopOutSampleName => "UI/overlay-pop-out";
|
||||
|
||||
protected override bool BlockNonPositionalInput => true;
|
||||
|
||||
@ -40,8 +42,8 @@ namespace osu.Game.Graphics.Containers
|
||||
[BackgroundDependencyLoader(true)]
|
||||
private void load(AudioManager audio)
|
||||
{
|
||||
samplePopIn = audio.Samples.Get(@"UI/overlay-pop-in");
|
||||
samplePopOut = audio.Samples.Get(@"UI/overlay-pop-out");
|
||||
samplePopIn = audio.Samples.Get(PopInSampleName);
|
||||
samplePopOut = audio.Samples.Get(PopOutSampleName);
|
||||
}
|
||||
|
||||
protected override void LoadComplete()
|
||||
|
@ -14,6 +14,9 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
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 DialogOverlay()
|
||||
|
@ -51,6 +51,9 @@ namespace osu.Game.Overlays
|
||||
private Container dragContainer;
|
||||
private Container playerContainer;
|
||||
|
||||
protected override string PopInSampleName => "UI/now-playing-pop-in";
|
||||
protected override string PopOutSampleName => "UI/now-playing-pop-out";
|
||||
|
||||
/// <summary>
|
||||
/// Provide a source for the toolbar height.
|
||||
/// </summary>
|
||||
|
@ -40,6 +40,8 @@ namespace osu.Game.Overlays
|
||||
|
||||
private SeekLimitedSearchTextBox searchTextBox;
|
||||
|
||||
protected override string PopInSampleName => "UI/settings-pop-in";
|
||||
|
||||
/// <summary>
|
||||
/// Provide a source for the toolbar height.
|
||||
/// </summary>
|
||||
|
@ -18,6 +18,8 @@ namespace osu.Game.Overlays
|
||||
|
||||
protected override bool StartHidden => true;
|
||||
|
||||
protected override string PopInSampleName => "UI/wave-pop-in";
|
||||
|
||||
protected WaveOverlayContainer()
|
||||
{
|
||||
AddInternal(Waves = new WaveContainer
|
||||
|
Loading…
Reference in New Issue
Block a user