h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-12 10:27:20 +08:00
Code Issues Releases Wiki Activity

Update drawings design

Browse Source
This commit is contained in:
Dean Herbert 2018-11-04 04:58:35 +09:00
parent 5006dc47a3
commit b610095ff5
2 changed files with 131 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tournament/Screens/Drawings/Components/ScrollingTeamContainer.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Game.Graphics;
using osu.Game.Tournament.Components; using osu.Game.Tournament.Components;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
@ -52,6 +53,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
Origin = Anchor.Centre, Origin = Anchor.Centre,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Colour = OsuColour.Gray(0.33f),
Masking = true, Masking = true,
CornerRadius = 10f, CornerRadius = 10f,
@ -358,6 +360,7 @@ namespace osu.Game.Tournament.Screens.Drawings.Components
outline = new Box outline = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(0.33f),
Alpha = 0 Alpha = 0
}, },
Flag Flag

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

@ -12,13 +12,14 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Video;
using osu.Framework.IO.Stores; using osu.Framework.IO.Stores;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Screens; using osu.Game.Screens;
using osu.Game.Screens.Backgrounds;
using osu.Game.Tournament.Components; using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Drawings.Components; using osu.Game.Tournament.Screens.Drawings.Components;
using OpenTK; using OpenTK;
@ -32,7 +33,7 @@ namespace osu.Game.Tournament.Screens.Drawings
protected override bool HideOverlaysOnEnter => true; protected override bool HideOverlaysOnEnter => true;
protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault(); protected override BackgroundScreen CreateBackground() => null;
private ScrollingTeamContainer teamsContainer; private ScrollingTeamContainer teamsContainer;
private GroupContainer groupsContainer; private GroupContainer groupsContainer;
@ -56,6 +57,8 @@ namespace osu.Game.Tournament.Screens.Drawings
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures, Storage storage) private void load(TextureStore textures, Storage storage)
{ {
RelativeSizeAxes = Axes.Both;
this.storage = storage; this.storage = storage;
TextureStore flagStore = new TextureStore(); TextureStore flagStore = new TextureStore();
@ -79,10 +82,16 @@ namespace osu.Game.Tournament.Screens.Drawings
Children = new Drawable[] Children = new Drawable[]
{ {
new Box // Main container
new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(77, 77, 77, 255) Children = new Drawable[]
{
new VideoSprite(@"C:\Users\Dean\BG Logoless - OWC.m4v")
{
RelativeSizeAxes = Axes.Both,
Loop = true,
}, },
new Sprite new Sprite
{ {
@ -90,21 +99,6 @@ namespace osu.Game.Tournament.Screens.Drawings
FillMode = FillMode.Fill, FillMode = FillMode.Fill,
Texture = textures.Get(@"Backgrounds/Drawings/background.png") Texture = textures.Get(@"Backgrounds/Drawings/background.png")
}, },
new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
// Main container
new Container
{
RelativeSizeAxes = Axes.Both,
Width = 0.85f,
Children = new Drawable[]
{
// Visualiser // Visualiser
new VisualiserContainer new VisualiserContainer
{ {
@ -149,6 +143,8 @@ namespace osu.Game.Tournament.Screens.Drawings
Position = new Vector2(0, 45f), Position = new Vector2(0, 45f),
Colour = OsuColour.Gray(0.33f),
Alpha = 0, Alpha = 0,
Font = "Exo2.0-Light", Font = "Exo2.0-Light",
@ -160,7 +156,9 @@ namespace osu.Game.Tournament.Screens.Drawings
new Container new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
AlwaysPresent = true,
Width = 0.15f, Width = 0.15f,
Anchor = Anchor.TopRight,
Children = new Drawable[] Children = new Drawable[]
{ {
@ -244,8 +242,6 @@ namespace osu.Game.Tournament.Screens.Drawings
} }
} }
} }
}
}
}; };
teamsContainer.OnSelected += onTeamSelected; teamsContainer.OnSelected += onTeamSelected;