h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 01:27:29 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1480 from peppy/fix-loader-in-release

Browse Source 
Fix loader pushing children screens before it is displayed itself
This commit is contained in:
Dean Herbert 2017-11-09 23:39:17 +09:00 committed by GitHub
commit 4175f52f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game/Screens/Loader.cs
View File

@ -5,11 +5,14 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Screens.Menu;
using OpenTK;
using osu.Framework.Screens;
namespace osu.Game.Screens
{
public class Loader : OsuScreen
{
private bool showDisclaimer;
public override bool ShowOverlays => false;
public Loader()
@ -21,21 +24,40 @@ namespace osu.Game.Screens
{
base.LogoArriving(logo, resuming);
logo.RelativePositionAxes = Axes.Both;
logo.RelativePositionAxes = Axes.None;
logo.Triangles = false;
logo.Position = new Vector2(0.9f);
logo.Origin = Anchor.BottomRight;
logo.Anchor = Anchor.BottomRight;
logo.Position = new Vector2(-40);
logo.Scale = new Vector2(0.2f);
logo.FadeInFromZero(5000, Easing.OutQuint);
}
[BackgroundDependencyLoader]
private void load(OsuGameBase game)
protected override void OnEntering(Screen last)
{
if (game.IsDeployedBuild)
base.OnEntering(last);
if (showDisclaimer)
LoadComponentAsync(new Disclaimer(), d => Push(d));
else
LoadComponentAsync(new Intro(), d => Push(d));
}
protected override void LogoSuspending(OsuLogo logo)
{
base.LogoSuspending(logo);
logo.FadeOut(100).OnComplete(l =>
{
l.Anchor = Anchor.TopLeft;
l.Origin = Anchor.Centre;
});
}
[BackgroundDependencyLoader]
private void load(OsuGameBase game)
{
showDisclaimer = game.IsDeployedBuild;
}
}
}