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

Fix missing logo

Browse Source
This commit is contained in:
Dean Herbert 2018-11-11 09:16:46 +09:00
parent 9c18f7a25a
commit 2683b161d5
4 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Events;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.Showcase;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
@ -28,16 +28,7 @@ namespace osu.Game.Tournament.Screens.Gameplay
Height = 100;
Children = new Drawable[]
{
new Sprite
{
Y = 5,
Texture = textures.Get("game-screen-logo"),
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
FillMode = FillMode.Fit,
RelativeSizeAxes = Axes.Both,
Size = Vector2.One
},
new TournamentLogo(),
new RoundDisplay
{
Y = 10,

8
osu.Game.Tournament/Screens/Showcase/ShowcaseScreen.cs
View File

@ -1,9 +1,17 @@
// 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.Textures;
namespace osu.Game.Tournament.Screens.Showcase
{
public class ShowcaseScreen : BeatmapInfoScreen
{
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
Add(new TournamentLogo());
}
}
}

33
osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs Normal file
View File

@ -0,0 +1,33 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using OpenTK;
namespace osu.Game.Tournament.Screens.Showcase
{
public class TournamentLogo : CompositeDrawable
{
public TournamentLogo()
{
RelativeSizeAxes = Axes.X;
Height = 100;
Margin = new MarginPadding { Vertical = 5 };
}
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
InternalChild = new Sprite
{
Texture = textures.Get("game-screen-logo"),
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
FillMode = FillMode.Fit,
RelativeSizeAxes = Axes.Both,
Size = Vector2.One
};
}
}
}

6
osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
View File

@ -1,17 +1,18 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Video;
using osu.Framework.Platform;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.Showcase;
using OpenTK;
using OpenTK.Graphics;
@ -24,7 +25,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
private readonly Bindable<MatchPairing> currentMatch = new Bindable<MatchPairing>();
[BackgroundDependencyLoader]
private void load(LadderInfo ladder, Storage storage)
private void load(TextureStore textures, LadderInfo ladder, Storage storage)
{
RelativeSizeAxes = Axes.Both;
@ -35,6 +36,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
RelativeSizeAxes = Axes.Both,
Loop = true,
},
new TournamentLogo(),
mainContainer = new Container
{
RelativeSizeAxes = Axes.Both,