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

Add mods to the match info

Browse Source
This commit is contained in:
smoogipoo
2018-12-12 14:38:03 +09:00
parent 6661b5870f
commit 170955110f
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Multi/Match/Components/Info.cs
View File

@ -1,6 +1,7 @@
// 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.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions;
@ -14,14 +15,16 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer;
using osu.Game.Overlays.SearchableList;
using osu.Game.Rulesets.Mods;
using osu.Game.Screens.Multi.Components;
using osu.Game.Screens.Play.HUD;
using osuTK;
namespace osu.Game.Screens.Multi.Match.Components
{
public class Info : Container
{
public const float HEIGHT = 128;
public const float HEIGHT = 156;
private readonly OsuSpriteText availabilityStatus;
private readonly ReadyButton readyButton;
@ -35,6 +38,7 @@ namespace osu.Game.Screens.Multi.Match.Components
public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>();
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
public readonly Bindable<GameType> Type = new Bindable<GameType>();
public readonly Bindable<IEnumerable<Mod>> Mods = new Bindable<IEnumerable<Mod>>();
public Info()
{
@ -43,6 +47,7 @@ namespace osu.Game.Screens.Multi.Match.Components
BeatmapTypeInfo beatmapTypeInfo;
OsuSpriteText name;
ModDisplay modDisplay;
Children = new Drawable[]
{
@ -74,11 +79,23 @@ namespace osu.Game.Screens.Multi.Match.Components
availabilityStatus = new OsuSpriteText { TextSize = 14 },
},
},
beatmapTypeInfo = new BeatmapTypeInfo
new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
beatmapTypeInfo = new BeatmapTypeInfo(),
modDisplay = new ModDisplay
{
Scale = new Vector2(0.75f),
DisplayUnrankedText = false
},
}
}
},
},
readyButton = new ReadyButton
@ -95,6 +112,7 @@ namespace osu.Game.Screens.Multi.Match.Components
beatmapTypeInfo.Beatmap.BindTo(Beatmap);
beatmapTypeInfo.Type.BindTo(Type);
modDisplay.Current.BindTo(Mods);
Availability.BindValueChanged(_ => updateAvailabilityStatus());
Status.BindValueChanged(_ => updateAvailabilityStatus());