h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 20:05:29 +08:00
Code Issues Releases Wiki Activity

Fix queue mode not passed from room to settings overlay

Browse Source
This commit is contained in:
smoogipoo 2021-11-01 18:52:57 +09:00
parent 65b920e4c1
commit 3db199292f
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Tests/Visual/Multiplayer/QueueingModes/TestSceneFreeForAllQueueMode.cs Normal file
View File

@ -0,0 +1,12 @@
// 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.Game.Online.Multiplayer.Queueing;
namespace osu.Game.Tests.Visual.Multiplayer.QueueingModes
{
public class TestSceneFreeForAllQueueMode : QueueModeTestScene
{
protected override QueueModes Mode => QueueModes.FreeForAll;
}
}

1
osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
View File

@ -336,6 +336,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
RoomID.BindValueChanged(roomId => playlistContainer.Alpha = roomId.NewValue == null ? 1 : 0, true);
Password.BindValueChanged(password => PasswordTextBox.Text = password.NewValue ?? string.Empty, true);
QueueMode.BindValueChanged(mode => QueueModeDropdown.Current.Value = mode.NewValue, true);
operationInProgress.BindTo(ongoingOperationTracker.InProgress);
operationInProgress.BindValueChanged(v =>

4
osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs
View File

@ -6,6 +6,7 @@ using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics.Containers;
using osu.Game.Online.Multiplayer.Queueing;
using osu.Game.Online.Rooms;
using osu.Game.Screens.OnlinePlay.Match;
using osu.Game.Users;
@ -65,6 +66,9 @@ namespace osu.Game.Screens.OnlinePlay
[Resolved(typeof(Room))]
protected Bindable<TimeSpan?> Duration { get; private set; }
[Resolved(typeof(Room), nameof(Room.QueueMode))]
protected Bindable<QueueModes> QueueMode { get; private set; }
[Resolved(CanBeNull = true)]
private IBindable<PlaylistItem> subScreenSelectedItem { get; set; }