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

Adjust gameplay screen size

Browse Source
This commit is contained in:
Dean Herbert 2018-11-18 12:39:25 +09:00
parent 925532508c
commit 5621101d40
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game.Tournament/Screens/Gameplay/GameplayScreen.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Tournament.Screens.Gameplay.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.MapPool;
using osu.Game.Tournament.Screens.TeamWin;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Tournament.Screens.Gameplay
@ -48,6 +49,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Y = 5,
Direction = FillDirection.Vertical,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -63,7 +65,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
Name = "top bar red",
RelativeSizeAxes = Axes.X,
Height = 10,
Height = 8,
Width = 0.5f,
Colour = red,
},
@ -71,7 +73,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
{
Name = "top bar blue",
RelativeSizeAxes = Axes.X,
Height = 10,
Height = 9,
Width = 0.5f,
Colour = blue,
Anchor = Anchor.TopRight,
@ -84,14 +86,15 @@ namespace osu.Game.Tournament.Screens.Gameplay
// chroma key area for stable gameplay
Name = "chroma",
RelativeSizeAxes = Axes.X,
Height = 480,
Height = 500,
Colour = new Color4(0, 255, 0, 255),
},
}
},
scoreDisplay = new MatchScoreDisplay
{
Y = -65,
Y = -60,
Scale = new Vector2(0.86f),
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
},
@ -168,7 +171,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
case TourneyState.Idle:
contract();
if (lastState == TourneyState.Ranking)
if (lastState == TourneyState.Ranking && !warmup.Value)
{
if (currentMatch.Value?.Completed == true)
scheduledOperation = Scheduler.AddDelayed(() => { sceneManager?.SetScreen(typeof(TeamWinScreen)); }, 4000);

2
osu.Game.Tournament/Screens/TournamentSceneManager.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Tournament.Screens
{
RelativeSizeAxes = Axes.X,
Y = 100,
Size = new Vector2(0.45f, 120),
Size = new Vector2(0.45f, 112),
Margin = new MarginPadding(10),
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,