h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:47:29 +08:00
Code Issues Releases Wiki Activity

Handle API returned difficulty range for rooms

Browse Source
This commit is contained in:
Dean Herbert 2022-02-17 19:15:09 +09:00
parent 7f4cc221d2
commit 39d64e779c
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Online/Rooms/Room.cs
View File

@ -37,6 +37,9 @@ namespace osu.Game.Online.Rooms
[JsonProperty("channel_id")]
public readonly Bindable<int> ChannelId = new Bindable<int>();
[JsonProperty("difficulty_range")]
public readonly Bindable<RoomDifficultyRange> DifficultyRange = new Bindable<RoomDifficultyRange>();
[Cached]
[JsonIgnore]
public readonly Bindable<RoomCategory> Category = new Bindable<RoomCategory>();
@ -228,5 +231,15 @@ namespace osu.Game.Online.Rooms
public bool ShouldSerializeEndDate() => false;
#endregion
[JsonObject(MemberSerialization.OptIn)]
public class RoomDifficultyRange
{
[JsonProperty("min")]
public double Min;
[JsonProperty("max")]
public double Max;
}
}
}

21
osu.Game/Screens/OnlinePlay/Components/StarRatingRangeDisplay.cs
View File

@ -12,6 +12,7 @@ using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Graphics;
using osu.Game.Online.Rooms;
using osuTK;
namespace osu.Game.Screens.OnlinePlay.Components
@ -71,6 +72,9 @@ namespace osu.Game.Screens.OnlinePlay.Components
};
}
[Resolved]
private Room room { get; set; }
protected override void LoadComplete()
{
base.LoadComplete();
@ -80,10 +84,21 @@ namespace osu.Game.Screens.OnlinePlay.Components
private void updateRange(object sender, NotifyCollectionChangedEventArgs e)
{
var orderedDifficulties = Playlist.Select(p => p.Beatmap).OrderBy(b => b.StarRating).ToArray();
StarDifficulty minDifficulty;
StarDifficulty maxDifficulty;
StarDifficulty minDifficulty = new StarDifficulty(orderedDifficulties.Length > 0 ? orderedDifficulties[0].StarRating : 0, 0);
StarDifficulty maxDifficulty = new StarDifficulty(orderedDifficulties.Length > 0 ? orderedDifficulties[^1].StarRating : 0, 0);
if (room.DifficultyRange != null)
{
minDifficulty = new StarDifficulty(room.DifficultyRange.Value.Min, 0);
maxDifficulty = new StarDifficulty(room.DifficultyRange.Value.Max, 0);
}
else
{
var orderedDifficulties = Playlist.Select(p => p.Beatmap).OrderBy(b => b.StarRating).ToArray();
minDifficulty = new StarDifficulty(orderedDifficulties.Length > 0 ? orderedDifficulties[0].StarRating : 0, 0);
maxDifficulty = new StarDifficulty(orderedDifficulties.Length > 0 ? orderedDifficulties[^1].StarRating : 0, 0);
}
minDisplay.Current.Value = minDifficulty;
maxDisplay.Current.Value = maxDifficulty;