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

Merge pull request #53 from Tom94/use_drawable_scheduler

Browse Source 
Use drawable scheduler
This commit is contained in:
Dean Herbert 2016-10-09 15:25:22 +09:00 committed by GitHub
commit 76f1653090
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 6b884e1b80444c5249754634a4b5529c50b52934 Subproject commit c3a7ebd979c9a6b19871dc84337905f97c56a6aa

8
osu.Game/GameModes/Menu/Intro.cs
View File

@ -44,18 +44,18 @@ namespace osu.Game.GameModes.Menu
AudioTrack bgm = Game.Audio.Track.Get(@"circles"); AudioTrack bgm = Game.Audio.Track.Get(@"circles");
bgm.Looping = true; bgm.Looping = true;
Game.Scheduler.Add(delegate Scheduler.Add(delegate
{ {
welcome.Play(); welcome.Play();
}, true); }, true);
Game.Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {
bgm.Start(); bgm.Start();
}, 600); }, 600);
Game.Scheduler.AddDelayed(delegate Scheduler.AddDelayed(delegate
{ {
DidLoadMenu = true; DidLoadMenu = true;
Push(new MainMenu()); Push(new MainMenu());
@ -82,7 +82,7 @@ namespace osu.Game.GameModes.Menu
protected override void OnResuming(GameMode last) protected override void OnResuming(GameMode last)
{ {
//we are just an intro. if we are resumed, we just want to exit after a short delay (to allow the last mode to transition out). //we are just an intro. if we are resumed, we just want to exit after a short delay (to allow the last mode to transition out).
Game.Scheduler.AddDelayed(Exit, 300); Scheduler.AddDelayed(Exit, 300);
base.OnResuming(last); base.OnResuming(last);
} }

2
osu.Game/GameModes/Menu/MainMenu.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.GameModes.Menu
OnSolo = delegate { Push(new PlaySongSelect()); }, OnSolo = delegate { Push(new PlaySongSelect()); },
OnMulti = delegate { Push(new Lobby()); }, OnMulti = delegate { Push(new Lobby()); },
OnTest = delegate { Push(new TestBrowser()); }, OnTest = delegate { Push(new TestBrowser()); },
OnExit = delegate { Game.Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); }, OnExit = delegate { Scheduler.AddDelayed(Exit, ButtonSystem.EXIT_DELAY); },
OnSettings = delegate { OnSettings = delegate {
osu.Options.PoppedOut = !osu.Options.PoppedOut; osu.Options.PoppedOut = !osu.Options.PoppedOut;
}, },