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

Merge remote-tracking branch 'upstream/master' into back-button-part-2

Browse Source
This commit is contained in:
David Zhao
2019-07-30 12:05:23 +09:00
parent 6d1203a599 5fa820cdd4
commit d70b99b4c0
38 changed files with 743 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/OsuGame.cs
View File

@ -88,7 +88,8 @@ namespace osu.Game
private OsuLogo osuLogo;
private MainMenu menuScreen;
private Intro introScreen;
private IntroScreen introScreen;
private Bindable<int> configRuleset;
@ -764,7 +765,7 @@ namespace osu.Game
if (introScreen == null)
return true;
if (!introScreen.DidLoadMenu || !(ScreenStack.CurrentScreen is Intro))
if (!introScreen.DidLoadMenu || !(screenStack.CurrentScreen is IntroScreen))
{
Scheduler.Add(introScreen.MakeCurrent);
return true;
@ -799,7 +800,7 @@ namespace osu.Game
{
switch (newScreen)
{
case Intro intro:
case IntroScreen intro:
introScreen = intro;
break;