sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into intro-testing-improvements

Browse Source
This commit is contained in:
Dean Herbert
2019-07-11 23:46:02 +09:00
committed by GitHub
parent a0d048ad8d 3be5aff82d
commit a1e64106d4
49 changed files with 1000 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -42,6 +42,9 @@ namespace osu.Game.Screens.Menu
[Resolved]
private GameHost host { get; set; }
[Resolved(canBeNull: true)]
private MusicController music { get; set; }
private BackgroundScreenDefault background;
protected override BackgroundScreen CreateBackground() => background;
@ -189,6 +192,9 @@ namespace osu.Game.Screens.Menu
//we may have consumed our preloaded instance, so let's make another.
preloadSongSelect();
if (Beatmap.Value.Track != null && music?.IsUserPaused != true)
Beatmap.Value.Track.Start();
}
public override bool OnExiting(IScreen next)