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

Change ready button to "Start" and make it enter player

Browse Source
This commit is contained in:
smoogipoo
2018-12-11 17:32:01 +09:00
parent 1ac615b490
commit bf3f5ab685
6 changed files with 100 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
@ -13,21 +14,20 @@ using osu.Game.Screens.Multi.Lounge;
namespace osu.Game.Screens.Multi
{
[Cached]
public class Multiplayer : OsuScreen
{
private readonly MultiplayerWaveContainer waves;
protected override Container<Drawable> Content => waves;
public Multiplayer()
{
InternalChild = waves = new MultiplayerWaveContainer
Child = waves = new MultiplayerWaveContainer
{
RelativeSizeAxes = Axes.Both,
};
LoungeScreen loungeScreen;
Children = new Drawable[]
waves.AddRange(new Drawable[]
{
new Container
{
@ -56,7 +56,7 @@ namespace osu.Game.Screens.Multi
Child = loungeScreen = new LoungeScreen(),
},
new Header(loungeScreen),
};
});
loungeScreen.Exited += s => Exit();
}
@ -76,13 +76,17 @@ namespace osu.Game.Screens.Multi
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
waves.Show();
Content.FadeIn(250);
Content.ScaleTo(1, 250, Easing.OutSine);
}
protected override void OnSuspending(Screen next)
{
Content.ScaleTo(1.1f, 250, Easing.InSine);
Content.FadeOut(250);
base.OnSuspending(next);
waves.Hide();
}
protected override void LogoExiting(OsuLogo logo)