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

Add length display to room screen as well

Browse Source
This commit is contained in:
Dean Herbert 2020-12-03 16:42:06 +09:00
parent 598572195c
commit 3550e5b30f
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
View File

@ -75,6 +75,7 @@ namespace osu.Game.Online.API.Requests.Responses
StarDifficulty = starDifficulty, StarDifficulty = starDifficulty,
OnlineBeatmapID = OnlineBeatmapID, OnlineBeatmapID = OnlineBeatmapID,
Version = version, Version = version,
// this is actually an incorrect mapping (Length is calculated as drain length in lazer's import process, see BeatmapManager.calculateLength).
Length = TimeSpan.FromSeconds(length).TotalMilliseconds, Length = TimeSpan.FromSeconds(length).TotalMilliseconds,
Status = Status, Status = Status,
BeatmapSet = set, BeatmapSet = set,

16
osu.Game/Online/Multiplayer/PlaylistExtensions.cs Normal file
View File

@ -0,0 +1,16 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using Humanizer;
using Humanizer.Localisation;
using osu.Framework.Bindables;
namespace osu.Game.Online.Multiplayer
{
public static class PlaylistExtensions
{
public static string GetTotalDuration(this BindableList<PlaylistItem> playlist) =>
playlist.Select(p => p.Beatmap.Value.Length).Sum().Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2);
}
}

9
osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
View File

@ -3,9 +3,7 @@
using System; using System;
using System.Collections.Specialized; using System.Collections.Specialized;
using System.Linq;
using Humanizer; using Humanizer;
using Humanizer.Localisation;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -339,11 +337,8 @@ namespace osu.Game.Screens.Multi.Match.Components
ApplyButton.Enabled.Value = hasValidSettings; ApplyButton.Enabled.Value = hasValidSettings;
} }
private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) private void onPlaylistChanged(object sender, NotifyCollectionChangedEventArgs e) =>
{ playlistLength.Text = $"Length: {Playlist.GetTotalDuration()}";
double totalLength = Playlist.Select(p => p.Beatmap.Value.Length).Sum();
playlistLength.Text = $"Length: {totalLength.Milliseconds().Humanize(minUnit: TimeUnit.Second, maxUnit: TimeUnit.Hour, precision: 2)}";
}
private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0; private bool hasValidSettings => RoomID.Value == null && NameField.Text.Length > 0 && Playlist.Count > 0;

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

@ -57,6 +57,7 @@ namespace osu.Game.Screens.Multi.Match
private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated; private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
private OverlinedHeader participantsHeader; private OverlinedHeader participantsHeader;
private OverlinedHeader playlistHeader;
public MatchSubScreen(Room room) public MatchSubScreen(Room room)
{ {
@ -135,7 +136,7 @@ namespace osu.Game.Screens.Multi.Match
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Content = new[] Content = new[]
{ {
new Drawable[] { new OverlinedHeader("Playlist"), }, new Drawable[] { playlistHeader = new OverlinedHeader("Playlist"), },
new Drawable[] new Drawable[]
{ {
new DrawableRoomPlaylistWithResults new DrawableRoomPlaylistWithResults
@ -243,6 +244,8 @@ namespace osu.Game.Screens.Multi.Match
managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy(); managerUpdated = beatmapManager.ItemUpdated.GetBoundCopy();
managerUpdated.BindValueChanged(beatmapUpdated); managerUpdated.BindValueChanged(beatmapUpdated);
playlist.BindCollectionChanged((_, __) => playlistHeader.Details.Value = playlist.GetTotalDuration(), true);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)