RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code formatting and slight changes to transitions.

This commit is contained in:
Dean Herbert 2016-10-08 13:05:15 +09:00
parent 9594b7193c
commit 926c46dbd4
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ public override void Load()
logo.ScaleTo(0);
logo.ScaleTo(1,5900, EasingTypes.OutQuint);
logo.ScaleTo(1, 5900, EasingTypes.OutQuint);
logo.FadeIn(30000, EasingTypes.OutQuint);
}
@ -82,7 +82,7 @@ protected override bool OnExiting(GameMode next)
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, 300);
Game.Scheduler.AddDelayed(Exit, 600);
base.OnResuming(last);
}

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

@ -1,8 +1,6 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Audio.Sample;
using osu.Framework.Audio.Track;
using osu.Framework.GameModes;
using osu.Framework.GameModes.Testing;
using osu.Framework.Graphics;

4
osu.Game/Overlays/Toolbar.cs
View File

@ -41,11 +41,11 @@ public ToolbarState State
{
case ToolbarState.Hidden:
MoveToY(-Size.Y, transition_time, EasingTypes.InQuint);
FadeOut(transition_time);
FadeOut(transition_time, EasingTypes.InQuint);
break;
case ToolbarState.Visible:
MoveToY(0, transition_time, EasingTypes.OutQuint);
FadeIn(transition_time);
FadeIn(transition_time, EasingTypes.OutQuint);
break;
}
}