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

Add delay for exit process.

Browse Source
This commit is contained in:
Dean Herbert
2016-09-30 13:31:05 +09:00
parent 357c94ed8a
commit 463f606004
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/GameModes/Menu/ButtonSystem.cs
View File

@ -36,6 +36,8 @@ namespace osu.Game.GameModes.Menu
const float button_width = 180f; const float button_width = 180f;
const float wedge_width = 25.6f; const float wedge_width = 25.6f;
public const int EXIT_DELAY = 3000;
private OsuLogo osuLogo; private OsuLogo osuLogo;
private Drawable iconFacade; private Drawable iconFacade;
private Container buttonArea; private Container buttonArea;
@ -221,9 +223,10 @@ namespace osu.Game.GameModes.Menu
b.State = Button.ButtonState.Contracted; b.State = Button.ButtonState.Contracted;
osuLogo.Delay(150); osuLogo.Delay(150);
osuLogo.ScaleTo(1f, 4000);
osuLogo.RotateTo(20, 4000); osuLogo.ScaleTo(1f, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(4000); osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(EXIT_DELAY);
break; break;
} }

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

@ -21,16 +21,16 @@ namespace osu.Game.GameModes.Menu
//private AudioTrackBass bgm; //private AudioTrackBass bgm;
public override void Load() public override void Load()
{ {
base.Load(); base.Load();
AudioSample welcome = Game.Audio.Sample.Get(@"welcome"); AudioSample welcome = Game.Audio.Sample.Get(@"welcome");
welcome.Play(); welcome.Play();
Children = new Drawable[] Children = new Drawable[]
{ {
new ButtonSystem() new ButtonSystem()
{ {
OnChart = delegate { Push(new ChartListing()); }, OnChart = delegate { Push(new ChartListing()); },
OnDirect = delegate { Push(new OnlineListing()); }, OnDirect = delegate { Push(new OnlineListing()); },
@ -38,10 +38,16 @@ namespace osu.Game.GameModes.Menu
OnSolo = delegate { Push(new SongSelectPlay()); }, OnSolo = delegate { Push(new SongSelectPlay()); },
OnMulti = delegate { Push(new Lobby()); }, OnMulti = delegate { Push(new Lobby()); },
OnTest = delegate { Push(new TestBrowser()); }, OnTest = delegate { Push(new TestBrowser()); },
OnExit = delegate { Game.Host.Exit(); }, OnExit = delegate {
OnSettings = delegate { (Game as OsuGame).Options.PoppedOut = !(Game as OsuGame).Options.PoppedOut; }, Game.Scheduler.AddDelayed(delegate {
Game.Host.Exit();
}, ButtonSystem.EXIT_DELAY);
},
OnSettings = delegate {
Game.Options.PoppedOut = !Game.Options.PoppedOut;
},
} }
}; };
} }
} }
} }