sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into multi-queueing-modes

Browse Source
This commit is contained in:
smoogipoo
2021-11-08 19:19:50 +09:00
parent aee0f39c80 f79c9e7f7e
commit c716051530
288 changed files with 2214 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Rooms/MultiplayerScore.cs
View File

@ -9,10 +9,10 @@ using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
using osu.Game.Users;
namespace osu.Game.Online.Rooms
{
@ -22,7 +22,7 @@ namespace osu.Game.Online.Rooms
public long ID { get; set; }
[JsonProperty("user")]
public User User { get; set; }
public APIUser User { get; set; }
[JsonProperty("rank")]
[JsonConverter(typeof(StringEnumConverter))]

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

@ -8,8 +8,8 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.IO.Serialization.Converters;
using osu.Game.Online.Multiplayer.Queueing;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Rooms.RoomStatuses;
using osu.Game.Users;
using osu.Game.Utils;
namespace osu.Game.Online.Rooms
@ -26,7 +26,7 @@ namespace osu.Game.Online.Rooms
[Cached]
[JsonProperty("host")]
public readonly Bindable<User> Host = new Bindable<User>();
public readonly Bindable<APIUser> Host = new Bindable<APIUser>();
[Cached]
[JsonProperty("playlist")]
@ -99,7 +99,7 @@ namespace osu.Game.Online.Rooms
[Cached]
[JsonProperty("recent_participants")]
public readonly BindableList<User> RecentParticipants = new BindableList<User>();
public readonly BindableList<APIUser> RecentParticipants = new BindableList<APIUser>();
[Cached]
[JsonProperty("participant_count")]