mirror of
https://github.com/ppy/osu.git
synced 2024-12-16 17:02:55 +08:00
422260797b
It turns out this polling was necessary to get extra data that isn't included in the main listing request. It was removed deemed useless, and in order to fix the order of rooms changing when selecting a room. Weirdly, I can't reproduce this happening any more, and on close inspection of the code can't see how it could happen in the first place. For now, let's revert this change and iterate from there, if/when the same issue arises again. I've discussed avoiding this second poll by potentially including more data (just `user_id`s?) in the main listing request, but not 100% sure on this - even if the returned data is minimal it's an extra join server-side, which could cause performance issues for large numbers of rooms.
74 lines
2.7 KiB
C#
74 lines
2.7 KiB
C#
// 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 osu.Framework.Allocation;
|
|
using osu.Framework.Logging;
|
|
using osu.Framework.Screens;
|
|
using osu.Game.Extensions;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Online.Multiplayer;
|
|
using osu.Game.Online.Rooms;
|
|
using osu.Game.Screens.OnlinePlay.Components;
|
|
using osu.Game.Screens.OnlinePlay.Lounge;
|
|
|
|
namespace osu.Game.Screens.OnlinePlay.Multiplayer
|
|
{
|
|
public class Multiplayer : OnlinePlayScreen
|
|
{
|
|
[Resolved]
|
|
private StatefulMultiplayerClient client { get; set; }
|
|
|
|
public override void OnResuming(IScreen last)
|
|
{
|
|
base.OnResuming(last);
|
|
|
|
if (client.Room != null)
|
|
client.ChangeState(MultiplayerUserState.Idle).CatchUnobservedExceptions(true);
|
|
}
|
|
|
|
protected override void UpdatePollingRate(bool isIdle)
|
|
{
|
|
var multiplayerRoomManager = (MultiplayerRoomManager)RoomManager;
|
|
|
|
if (!this.IsCurrentScreen())
|
|
{
|
|
multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
|
|
multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
|
|
}
|
|
else
|
|
{
|
|
switch (CurrentSubScreen)
|
|
{
|
|
case LoungeSubScreen _:
|
|
multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
|
|
multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
|
|
break;
|
|
|
|
// Don't poll inside the match or anywhere else.
|
|
default:
|
|
multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
|
|
multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
|
|
}
|
|
|
|
protected override Room CreateNewRoom()
|
|
{
|
|
var room = new Room { Name = { Value = $"{API.LocalUser}'s awesome room" } };
|
|
room.Category.Value = RoomCategory.Realtime;
|
|
return room;
|
|
}
|
|
|
|
protected override string ScreenTitle => "Multiplayer";
|
|
|
|
protected override RoomManager CreateRoomManager() => new MultiplayerRoomManager();
|
|
|
|
protected override LoungeSubScreen CreateLounge() => new MultiplayerLoungeSubScreen();
|
|
|
|
protected override OsuButton CreateNewMultiplayerGameButton() => new CreateMultiplayerMatchButton();
|
|
}
|
|
}
|