sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Share ruleset and type displaying, fix tag team icon.

Browse Source
This commit is contained in:
DrabWeb
2017-06-24 05:43:52 -03:00
parent 35951ffc40
commit fe875957a7
5 changed files with 118 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -27,12 +27,12 @@ namespace osu.Game.Screens.Multiplayer
private const float height = 100;
private const float side_strip_width = 5;
private const float cover_width = 145;
private const float ruleset_height = 30;
private readonly Box sideStrip;
private readonly Container coverContainer, rulesetContainer, gameTypeContainer;
private readonly Container coverContainer;
private readonly OsuSpriteText name;
private readonly ParticipantInfo participantInfo;
private readonly ModeTypeInfo modeTypeInfo;
private readonly OsuSpriteText status;
private readonly FillFlowContainer<OsuSpriteText> beatmapInfoFlow;
private readonly OsuSpriteText beatmapTitle;
@ -159,29 +159,10 @@ namespace osu.Game.Screens.Multiplayer
},
},
},
new FillFlowContainer
modeTypeInfo = new ModeTypeInfo
{
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Height = ruleset_height,
Direction = FillDirection.Horizontal,
LayoutDuration = transition_duration,
Spacing = new Vector2(5f, 0f),
Children = new[]
{
rulesetContainer = new Container
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
AutoSizeAxes = Axes.Both,
},
gameTypeContainer = new Container
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
AutoSizeAxes = Axes.Both,
},
},
},
},
},
@ -239,17 +220,13 @@ namespace osu.Game.Screens.Multiplayer
private void displayGameType(GameType value)
{
gameTypeContainer.Children = new[]
{
new DrawableGameType(value)
{
Size = new Vector2(ruleset_height),
},
};
modeTypeInfo.Type = value;
}
private void displayBeatmap(BeatmapInfo value)
{
modeTypeInfo.Beatmap = value;
if (value != null)
{
coverContainer.FadeIn(transition_duration);
@ -264,15 +241,6 @@ namespace osu.Game.Screens.Multiplayer
}) { RelativeSizeAxes = Axes.Both }
};
rulesetContainer.FadeIn(transition_duration);
rulesetContainer.Children = new[]
{
new DifficultyIcon(value)
{
Size = new Vector2(ruleset_height),
}
};
beatmapTitle.Current = localisation.GetUnicodePreference(value.Metadata.TitleUnicode, value.Metadata.Title);
beatmapDash.Text = @" - ";
beatmapArtist.Current = localisation.GetUnicodePreference(value.Metadata.ArtistUnicode, value.Metadata.Artist);
@ -280,7 +248,6 @@ namespace osu.Game.Screens.Multiplayer
else
{
coverContainer.FadeOut(transition_duration);
rulesetContainer.FadeOut(transition_duration);
beatmapTitle.Current = null;
beatmapArtist.Current = null;