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

Remove gameplay_order, use existing playlist_order

Browse Source
This commit is contained in:
Dan Balasescu
2021-12-03 15:45:13 +09:00
parent b75a5b778e
commit 0a1304b92a
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -742,7 +742,7 @@ namespace osu.Game.Online.Multiplayer
Beatmap = { Value = apiBeatmap },
Ruleset = { Value = ruleset },
Expired = item.Expired,
GameplayOrder = item.GameplayOrder
PlaylistOrder = item.PlaylistOrder
};
playlistItem.RequiredMods.AddRange(item.RequiredMods.Select(m => m.ToMod(rulesetInstance)));

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

@ -43,7 +43,7 @@ namespace osu.Game.Online.Rooms
/// The order in which this <see cref="MultiplayerPlaylistItem"/> will be played, starting from 0 and increasing for items which will be played later.
/// </summary>
[Key(8)]
public int GameplayOrder { get; set; }
public ushort PlaylistOrder { get; set; }
/// <summary>
/// The date when this <see cref="MultiplayerPlaylistItem"/> was last updated.
@ -65,7 +65,7 @@ namespace osu.Game.Online.Rooms
RequiredMods = item.RequiredMods.Select(m => new APIMod(m)).ToArray();
AllowedMods = item.AllowedMods.Select(m => new APIMod(m)).ToArray();
Expired = item.Expired;
GameplayOrder = item.GameplayOrder;
PlaylistOrder = item.PlaylistOrder ?? 0;
}
}
}

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

@ -33,8 +33,8 @@ namespace osu.Game.Online.Rooms
[JsonProperty("expired")]
public bool Expired { get; set; }
[JsonProperty("gameplay_order")]
public int GameplayOrder { get; set; }
[JsonProperty("playlist_order")]
public ushort? PlaylistOrder { get; set; }
[JsonIgnore]
public IBindable<bool> Valid => valid;