sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/ppy/osu into multiplayer-match

Browse Source
This commit is contained in:
DrabWeb
2018-06-01 04:01:14 -03:00
parent 9a7e5a3e2c 6b48370092
commit 9989517ff0
49 changed files with 905 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Multi/Components/BeatmapTitle.cs
View File

@ -22,6 +22,7 @@ namespace osu.Game.Screens.Multi.Components
}
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
{
set
@ -41,18 +42,9 @@ namespace osu.Game.Screens.Multi.Components
Children = new[]
{
beatmapTitle = new OsuSpriteText
{
Font = @"Exo2.0-BoldItalic",
},
beatmapDash = new OsuSpriteText
{
Font = @"Exo2.0-BoldItalic",
},
beatmapArtist = new OsuSpriteText
{
Font = @"Exo2.0-RegularItalic",
},
beatmapTitle = new OsuSpriteText { Font = @"Exo2.0-BoldItalic", },
beatmapDash = new OsuSpriteText { Font = @"Exo2.0-BoldItalic", },
beatmapArtist = new OsuSpriteText { Font = @"Exo2.0-RegularItalic", },
};
}
@ -65,7 +57,6 @@ namespace osu.Game.Screens.Multi.Components
protected override void LoadComplete()
{
base.LoadComplete();
updateText();
}
@ -74,7 +65,6 @@ namespace osu.Game.Screens.Multi.Components
if (beatmap == null)
{
beatmapTitle.Current = beatmapArtist.Current = null;
beatmapTitle.Text = "Changing map";
beatmapDash.Text = beatmapArtist.Text = string.Empty;
}

4
osu.Game/Screens/Multi/Components/ParticipantCount.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Multi.Components
public int Count
{
set { count.Text = value.ToString(); }
set => count.Text = value.ToString();
}
public int? Max
@ -31,8 +31,8 @@ namespace osu.Game.Screens.Multi.Components
else
{
slash.FadeIn(transition_duration);
max.FadeIn(transition_duration);
max.Text = value.ToString();
max.FadeIn(transition_duration);
}
}
}

8
osu.Game/Screens/Multi/Header.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Screens.Multi
{
public const float HEIGHT = 121;
private readonly OsuSpriteText screenTitle;
private readonly OsuSpriteText screenType;
private readonly HeaderBreadcrumbControl breadcrumbs;
public Header(Screen initialScreen)
@ -67,7 +67,7 @@ namespace osu.Game.Screens.Multi
Text = "multiplayer ",
TextSize = 25,
},
screenTitle = new OsuSpriteText
screenType = new OsuSpriteText
{
TextSize = 25,
Font = @"Exo2.0-Light",
@ -86,14 +86,14 @@ namespace osu.Game.Screens.Multi
},
};
breadcrumbs.Current.ValueChanged += s => screenTitle.Text = ((MultiplayerScreen)s).Title;
breadcrumbs.Current.ValueChanged += s => screenType.Text = ((MultiplayerScreen)s).Type.ToLower();
breadcrumbs.Current.TriggerChange();
}
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
screenTitle.Colour = colours.Yellow;
screenType.Colour = colours.Yellow;
breadcrumbs.StripColour = colours.Green;
}

2
osu.Game/Screens/Multi/Screens/Lounge/Lounge.cs
View File

@ -25,7 +25,7 @@ namespace osu.Game.Screens.Multi.Screens.Lounge
protected readonly FillFlowContainer<DrawableRoom> RoomsContainer;
protected readonly RoomInspector Inspector;
public override string Title => "lounge";
public override string Title => "Lounge";
protected override Container<Drawable> TransitionContent => content;

5
osu.Game/Screens/Multi/Screens/MultiplayerScreen.cs
View File

@ -15,6 +15,11 @@ namespace osu.Game.Screens.Multi.Screens
protected virtual Container<Drawable> TransitionContent => Content;
/// <summary>
/// The type to display in the title of the <see cref="Header"/>.
/// </summary>
public virtual string Type => Title;
protected override void OnEntering(Screen last)
{
base.OnEntering(last);