h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 06:52:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #4017 from smoogipoo/lounge-leaderboard

Browse Source 
Show match participants in the lounge
This commit is contained in:
Dean Herbert 2019-01-10 14:36:26 +09:00 committed by GitHub
commit e04da7de1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 220 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/TestCaseMatchLeaderboard.cs
View File

@ -17,12 +17,13 @@ namespace osu.Game.Tests.Visual
{ {
public TestCaseMatchLeaderboard() public TestCaseMatchLeaderboard()
{ {
Add(new MatchLeaderboard(new Room { RoomID = { Value = 3 } }) Add(new MatchLeaderboard
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Size = new Vector2(550f, 450f), Size = new Vector2(550f, 450f),
Scope = MatchLeaderboardScope.Overall, Scope = MatchLeaderboardScope.Overall,
Room = new Room { RoomID = { Value = 3 } }
}); });
} }

340
osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
View File

@ -1,7 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Linq; using System;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -13,8 +13,9 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi.Components; using osu.Game.Screens.Multi.Components;
using osu.Game.Users; using osu.Game.Users;
@ -37,11 +38,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private Box statusStrip; private Box statusStrip;
private UpdateableBeatmapBackgroundSprite background; private UpdateableBeatmapBackgroundSprite background;
private ParticipantCountDisplay participantCount; private ParticipantCountDisplay participantCount;
private FillFlowContainer topFlow, participantsFlow;
private OsuSpriteText name, status; private OsuSpriteText name, status;
private BeatmapTypeInfo beatmapTypeInfo; private BeatmapTypeInfo beatmapTypeInfo;
private ScrollContainer participantsScroll;
private ParticipantInfo participantInfo; private ParticipantInfo participantInfo;
private MatchParticipants participants;
[Resolved] [Resolved]
private BeatmapManager beatmaps { get; set; } private BeatmapManager beatmaps { get; set; }
@ -58,141 +58,141 @@ namespace osu.Game.Screens.Multi.Lounge.Components
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"343138"), Colour = OsuColour.FromHex(@"343138"),
}, },
topFlow = new FillFlowContainer new GridContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.Both,
AutoSizeAxes = Axes.Y, RowDimensions = new[]
Direction = FillDirection.Vertical,
Children = new Drawable[]
{ {
new Container new Dimension(GridSizeMode.AutoSize),
new Dimension(GridSizeMode.Distributed),
},
Content = new[]
{
new Drawable[]
{ {
RelativeSizeAxes = Axes.X, new FillFlowContainer
Height = 200,
Masking = true,
Children = new Drawable[]
{ {
background = new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both }, RelativeSizeAxes = Axes.X,
new Box AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{ {
RelativeSizeAxes = Axes.Both, new Container
Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)),
},
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(20),
Children = new Drawable[]
{ {
participantCount = new ParticipantCountDisplay RelativeSizeAxes = Axes.X,
Height = 200,
Masking = true,
Children = new Drawable[]
{ {
Anchor = Anchor.TopRight, background = new UpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both },
Origin = Anchor.TopRight, new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ColourInfo.GradientVertical(Color4.Black.Opacity(0.5f), Color4.Black.Opacity(0)),
},
new Container
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(20),
Children = new Drawable[]
{
participantCount = new ParticipantCountDisplay
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
},
name = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
TextSize = 30,
},
},
},
}, },
name = new OsuSpriteText },
statusStrip = new Box
{
RelativeSizeAxes = Axes.X,
Height = 5,
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{ {
Anchor = Anchor.BottomLeft, new Box
Origin = Anchor.BottomLeft, {
TextSize = 30, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"28242d"),
},
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
LayoutDuration = transition_duration,
Padding = contentPadding,
Spacing = new Vector2(0f, 5f),
Children = new Drawable[]
{
status = new OsuSpriteText
{
TextSize = 14,
Font = @"Exo2.0-Bold",
},
beatmapTypeInfo = new BeatmapTypeInfo(),
},
},
},
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = contentPadding,
Children = new Drawable[]
{
participantInfo = new ParticipantInfo(),
}, },
}, },
}, },
}, },
}, },
statusStrip = new Box new Drawable[]
{ {
RelativeSizeAxes = Axes.X, participants = new MatchParticipants
Height = 5,
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Children = new Drawable[]
{ {
new Box RelativeSizeAxes = Axes.Both,
{ }
RelativeSizeAxes = Axes.Both, }
Colour = OsuColour.FromHex(@"28242d"), }
}, }
new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
LayoutDuration = transition_duration,
Padding = contentPadding,
Spacing = new Vector2(0f, 5f),
Children = new Drawable[]
{
status = new OsuSpriteText
{
TextSize = 14,
Font = @"Exo2.0-Bold",
},
beatmapTypeInfo = new BeatmapTypeInfo(),
},
},
},
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = contentPadding,
Children = new Drawable[]
{
participantInfo = new ParticipantInfo(),
},
},
},
},
participantsScroll = new OsuScrollContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
RelativeSizeAxes = Axes.X,
Padding = new MarginPadding { Top = contentPadding.Top, Left = 38, Right = 37 },
Children = new[]
{
participantsFlow = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
LayoutDuration = transition_duration,
Spacing = new Vector2(5f),
},
},
},
}; };
participantInfo.Host.BindTo(bindings.Host); participantInfo.Host.BindTo(bindings.Host);
participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount); participantInfo.ParticipantCount.BindTo(bindings.ParticipantCount);
participantInfo.Participants.BindTo(bindings.Participants); participantInfo.Participants.BindTo(bindings.Participants);
participantCount.Participants.BindTo(bindings.Participants); participantCount.Participants.BindTo(bindings.Participants);
participantCount.ParticipantCount.BindTo(bindings.ParticipantCount); participantCount.ParticipantCount.BindTo(bindings.ParticipantCount);
participantCount.MaxParticipants.BindTo(bindings.MaxParticipants); participantCount.MaxParticipants.BindTo(bindings.MaxParticipants);
beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap); beatmapTypeInfo.Beatmap.BindTo(bindings.CurrentBeatmap);
beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset); beatmapTypeInfo.Ruleset.BindTo(bindings.CurrentRuleset);
beatmapTypeInfo.Type.BindTo(bindings.Type); beatmapTypeInfo.Type.BindTo(bindings.Type);
background.Beatmap.BindTo(bindings.CurrentBeatmap); background.Beatmap.BindTo(bindings.CurrentBeatmap);
bindings.Status.BindValueChanged(displayStatus); bindings.Status.BindValueChanged(displayStatus);
bindings.Participants.BindValueChanged(p => participantsFlow.ChildrenEnumerable = p.Select(u => new UserTile(u)));
bindings.Name.BindValueChanged(n => name.Text = n); bindings.Name.BindValueChanged(n => name.Text = n);
Room.BindValueChanged(updateRoom, true); Room.BindValueChanged(updateRoom, true);
} }
private void updateRoom(Room room) private void updateRoom(Room room)
{ {
bindings.Room = room; bindings.Room = room;
participants.Room = room;
if (room != null) if (room != null)
{ {
participantsFlow.FadeIn(transition_duration);
participantCount.FadeIn(transition_duration); participantCount.FadeIn(transition_duration);
beatmapTypeInfo.FadeIn(transition_duration); beatmapTypeInfo.FadeIn(transition_duration);
name.FadeIn(transition_duration); name.FadeIn(transition_duration);
@ -200,7 +200,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
} }
else else
{ {
participantsFlow.FadeOut(transition_duration);
participantCount.FadeOut(transition_duration); participantCount.FadeOut(transition_duration);
beatmapTypeInfo.FadeOut(transition_duration); beatmapTypeInfo.FadeOut(transition_duration);
name.FadeOut(transition_duration); name.FadeOut(transition_duration);
@ -210,13 +209,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
} }
} }
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
participantsScroll.Height = DrawHeight - topFlow.DrawHeight;
}
private void displayStatus(RoomStatus s) private void displayStatus(RoomStatus s)
{ {
status.Text = s.Message; status.Text = s.Message;
@ -226,39 +218,113 @@ namespace osu.Game.Screens.Multi.Lounge.Components
status.FadeColour(c, transition_duration); status.FadeColour(c, transition_duration);
} }
private class UserTile : Container, IHasTooltip
{
private readonly User user;
public string TooltipText => user.Username;
public UserTile(User user)
{
this.user = user;
Size = new Vector2(70f);
CornerRadius = 5f;
Masking = true;
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"27252d"),
},
new UpdateableAvatar
{
RelativeSizeAxes = Axes.Both,
User = user,
},
};
}
}
private class RoomStatusNoneSelected : RoomStatus private class RoomStatusNoneSelected : RoomStatus
{ {
public override string Message => @"No Room Selected"; public override string Message => @"No Room Selected";
public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8; public override Color4 GetAppropriateColour(OsuColour colours) => colours.Gray8;
} }
private class MatchParticipants : CompositeDrawable
{
private Room room;
private readonly FillFlowContainer fill;
public Room Room
{
get { return room; }
set
{
if (room == value)
return;
room = value;
updateParticipants();
}
}
public MatchParticipants()
{
Padding = new MarginPadding { Horizontal = 10 };
InternalChild = new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Child = fill = new FillFlowContainer
{
Spacing = new Vector2(10),
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Full,
}
};
}
[Resolved]
private APIAccess api { get; set; }
private GetRoomScoresRequest request;
private void updateParticipants()
{
var roomId = room.RoomID.Value ?? 0;
request?.Cancel();
// nice little progressive fade
int time = 500;
foreach (var c in fill.Children)
{
c.Delay(500 - time).FadeOut(time, Easing.Out);
time = Math.Max(20, time - 20);
c.Expire();
}
if (roomId == 0) return;
request = new GetRoomScoresRequest(roomId);
request.Success += scores =>
{
if (roomId != room.RoomID.Value)
return;
fill.Clear();
foreach (var s in scores)
fill.Add(new UserTile(s.User));
fill.FadeInFromZero(1000, Easing.OutQuint);
};
api.Queue(request);
}
private class UserTile : CompositeDrawable, IHasTooltip
{
private readonly User user;
public string TooltipText => user.Username;
public UserTile(User user)
{
this.user = user;
Size = new Vector2(70f);
CornerRadius = 5f;
Masking = true;
InternalChildren = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = OsuColour.FromHex(@"27252d"),
},
new UpdateableAvatar
{
RelativeSizeAxes = Axes.Both,
User = user,
},
};
}
}
}
} }
} }

15
osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
View File

@ -16,17 +16,18 @@ namespace osu.Game.Screens.Multi.Match.Components
{ {
public Action<IEnumerable<APIRoomScoreInfo>> ScoresLoaded; public Action<IEnumerable<APIRoomScoreInfo>> ScoresLoaded;
private readonly Room room; public Room Room
public MatchLeaderboard(Room room)
{ {
this.room = room; get => bindings.Room;
set => bindings.Room = value;
} }
private readonly RoomBindings bindings = new RoomBindings();
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
room.RoomID.BindValueChanged(id => bindings.RoomID.BindValueChanged(id =>
{ {
if (id == null) if (id == null)
return; return;
@ -38,10 +39,10 @@ namespace osu.Game.Screens.Multi.Match.Components
protected override APIRequest FetchScores(Action<IEnumerable<APIRoomScoreInfo>> scoresCallback) protected override APIRequest FetchScores(Action<IEnumerable<APIRoomScoreInfo>> scoresCallback)
{ {
if (room.RoomID == null) if (bindings.RoomID.Value == null)
return null; return null;
var req = new GetRoomScoresRequest(room.RoomID.Value ?? 0); var req = new GetRoomScoresRequest(bindings.RoomID.Value ?? 0);
req.Success += r => req.Success += r =>
{ {

5
osu.Game/Screens/Multi/Match/MatchSubScreen.cs
View File

@ -71,10 +71,11 @@ namespace osu.Game.Screens.Multi.Match
{ {
new Drawable[] new Drawable[]
{ {
leaderboard = new MatchLeaderboard(room) leaderboard = new MatchLeaderboard
{ {
Padding = new MarginPadding(10), Padding = new MarginPadding(10),
RelativeSizeAxes = Axes.Both RelativeSizeAxes = Axes.Both,
Room = room
}, },
new Container new Container
{ {

2
osu.Game/Screens/Multi/Ranking/Pages/RoomLeaderboardPage.cs
View File

@ -103,8 +103,8 @@ namespace osu.Game.Screens.Multi.Ranking.Pages
public class ResultsMatchLeaderboard : MatchLeaderboard public class ResultsMatchLeaderboard : MatchLeaderboard
{ {
public ResultsMatchLeaderboard(Room room) public ResultsMatchLeaderboard(Room room)
: base(room)
{ {
Room = room;
} }
protected override bool FadeTop => true; protected override bool FadeTop => true;

3
osu.Game/Screens/Multi/RoomBindings.cs
View File

@ -39,6 +39,7 @@ namespace osu.Game.Screens.Multi
if (room != null) if (room != null)
{ {
RoomID.UnbindFrom(room.RoomID);
Name.UnbindFrom(room.Name); Name.UnbindFrom(room.Name);
Host.UnbindFrom(room.Host); Host.UnbindFrom(room.Host);
Status.UnbindFrom(room.Status); Status.UnbindFrom(room.Status);
@ -56,6 +57,7 @@ namespace osu.Game.Screens.Multi
if (room != null) if (room != null)
{ {
RoomID.BindTo(room.RoomID);
Name.BindTo(room.Name); Name.BindTo(room.Name);
Host.BindTo(room.Host); Host.BindTo(room.Host);
Status.BindTo(room.Status); Status.BindTo(room.Status);
@ -82,6 +84,7 @@ namespace osu.Game.Screens.Multi
currentRuleset.Value = playlistItem?.Ruleset; currentRuleset.Value = playlistItem?.Ruleset;
} }
public readonly Bindable<int?> RoomID = new Bindable<int?>();
public readonly Bindable<string> Name = new Bindable<string>(); public readonly Bindable<string> Name = new Bindable<string>();
public readonly Bindable<User> Host = new Bindable<User>(); public readonly Bindable<User> Host = new Bindable<User>();
public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>(); public readonly Bindable<RoomStatus> Status = new Bindable<RoomStatus>();