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 stateful-drawables

Browse Source 
Conflicts:
	osu.Game/GameModes/Menu/Intro.cs
This commit is contained in:
Dean Herbert
2016-10-09 22:08:32 +09:00
parent 926c46dbd4 de24c86c81
commit 25de055802
9 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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");
bgm.Looping = true;
Game.Scheduler.Add(delegate
Scheduler.Add(delegate
{
welcome.Play();
}, true);
Game.Scheduler.AddDelayed(delegate
Scheduler.AddDelayed(delegate
{
bgm.Start();
}, 600);
Game.Scheduler.AddDelayed(delegate
Scheduler.AddDelayed(delegate
{
DidLoadMenu = true;
Push(new MainMenu());
@ -82,7 +82,7 @@ namespace osu.Game.GameModes.Menu
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).
Game.Scheduler.AddDelayed(Exit, 600);
Scheduler.AddDelayed(Exit, 600);
base.OnResuming(last);
}