h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:28:00 +08:00
Code Issues Releases Wiki Activity

Update in line with screen changes

Browse Source
This commit is contained in:
Dean Herbert 2019-02-17 18:20:03 +09:00
parent f0743ebecf
commit fcab21908b
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tournament/Screens/Drawings/DrawingsScreen.cs
View File

@ -13,11 +13,9 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Screens;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Drawings.Components;
using osuTK;
@ -25,14 +23,10 @@ using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Drawings
{
public class DrawingsScreen : OsuScreen
public class DrawingsScreen : CompositeDrawable
{
private const string results_filename = "drawings_results.txt";
public override bool HideOverlaysOnEnter => true;
protected override BackgroundScreen CreateBackground() => null;
private ScrollingTeamContainer teamsContainer;
private GroupContainer groupsContainer;
private OsuSpriteText fullTeamNameText;
@ -59,7 +53,6 @@ namespace osu.Game.Tournament.Screens.Drawings
if (!TeamList.Teams.Any())
{
this.Exit();
return;
}

9
osu.Game.Tournament/Screens/TournamentScreen.cs
View File

@ -3,15 +3,20 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Screens;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Tournament.Screens
{
public class TournamentScreen : OsuScreen
public class TournamentScreen : CompositeDrawable
{
[Resolved]
protected LadderInfo LadderInfo { get; private set; }
public TournamentScreen()
{
RelativeSizeAxes = Axes.Both;
}
public override void Hide()
{
this.FadeOut(200);

3
osu.Game.Tournament/TournamentGame.cs
View File

@ -2,6 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Graphics;
using osu.Framework.Screens;
using osu.Game.Graphics.Cursor;
using osu.Game.Tournament.Screens;
@ -16,7 +17,7 @@ namespace osu.Game.Tournament
Add(new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,
Child = new TournamentSceneManager()
Child = new ScreenStack(new TournamentSceneManager()) { RelativeSizeAxes = Axes.Both }
});
MenuCursorContainer.Cursor.Alpha = 0;