mirror of
https://github.com/ppy/osu.git
synced 2025-03-18 06:27:18 +08:00
Centralise track handling
This commit is contained in:
parent
c3d56088d8
commit
449e53ee6d
@ -30,19 +30,11 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
if (!resuming)
|
||||
{
|
||||
Beatmap.Value = IntroBeatmap;
|
||||
IntroBeatmap = null;
|
||||
|
||||
Welcome?.Play();
|
||||
|
||||
Scheduler.AddDelayed(delegate
|
||||
{
|
||||
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
|
||||
if (MenuMusic.Value)
|
||||
{
|
||||
Track.Restart();
|
||||
Track = null;
|
||||
}
|
||||
StartTrack();
|
||||
|
||||
PrepareMenuLoad();
|
||||
|
||||
@ -57,8 +49,6 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
public override void OnSuspending(IScreen next)
|
||||
{
|
||||
Track = null;
|
||||
|
||||
this.FadeOut(300);
|
||||
base.OnSuspending(next);
|
||||
}
|
||||
|
@ -47,7 +47,7 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
protected Bindable<bool> MenuMusic;
|
||||
|
||||
protected Track Track;
|
||||
protected Track Track { get; private set; }
|
||||
|
||||
protected WorkingBeatmap IntroBeatmap;
|
||||
|
||||
@ -57,6 +57,13 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
protected override BackgroundScreen CreateBackground() => new BackgroundScreenBlack();
|
||||
|
||||
protected void StartTrack()
|
||||
{
|
||||
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
|
||||
if (MenuMusic.Value)
|
||||
Track.Restart();
|
||||
}
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuConfigManager config, SkinManager skinManager, BeatmapManager beatmaps, Framework.Game game)
|
||||
{
|
||||
@ -136,6 +143,9 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
if (!resuming)
|
||||
{
|
||||
Beatmap.Value = IntroBeatmap;
|
||||
IntroBeatmap = null;
|
||||
|
||||
logo.MoveTo(new Vector2(0.5f));
|
||||
logo.ScaleTo(Vector2.One);
|
||||
logo.Hide();
|
||||
@ -156,6 +166,12 @@ namespace osu.Game.Screens.Menu
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnSuspending(IScreen next)
|
||||
{
|
||||
base.OnSuspending(next);
|
||||
Track = null;
|
||||
}
|
||||
|
||||
private MainMenu mainMenu;
|
||||
|
||||
protected void PrepareMenuLoad()
|
||||
|
@ -55,9 +55,6 @@ namespace osu.Game.Screens.Menu
|
||||
|
||||
if (!resuming)
|
||||
{
|
||||
Beatmap.Value = IntroBeatmap;
|
||||
IntroBeatmap = null;
|
||||
|
||||
PrepareMenuLoad();
|
||||
|
||||
LoadComponentAsync(new TrianglesIntroSequence(logo, background)
|
||||
@ -70,9 +67,7 @@ namespace osu.Game.Screens.Menu
|
||||
AddInternal(t);
|
||||
Welcome?.Play();
|
||||
|
||||
// Only start the current track if it is the menu music. A beatmap's track is started when entering the Main Menu.
|
||||
if (MenuMusic.Value)
|
||||
Track.Start();
|
||||
StartTrack();
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -83,12 +78,6 @@ namespace osu.Game.Screens.Menu
|
||||
background.FadeOut(100);
|
||||
}
|
||||
|
||||
public override void OnSuspending(IScreen next)
|
||||
{
|
||||
Track = null;
|
||||
base.OnSuspending(next);
|
||||
}
|
||||
|
||||
private class TrianglesIntroSequence : CompositeDrawable
|
||||
{
|
||||
private readonly OsuLogo logo;
|
||||
|
Loading…
x
Reference in New Issue
Block a user