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

Combine more methods to simplify flow futher

Browse Source
This commit is contained in:
Dean Herbert 2025-01-29 19:56:36 +09:00
parent 07bff22200
commit e8d0d2a1d9
No known key found for this signature in database
2 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
View File

@ -259,8 +259,8 @@ namespace osu.Game.Screens.OnlinePlay.Match
{ {
base.LoadComplete(); base.LoadComplete();
SelectedItem.BindValueChanged(_ => Scheduler.AddOnce(OnSelectedItemChanged)); SelectedItem.BindValueChanged(_ => updateSpecifics());
UserMods.BindValueChanged(_ => Scheduler.AddOnce(OnSelectedItemChanged)); UserMods.BindValueChanged(_ => updateSpecifics());
beatmapAvailabilityTracker.SelectedItem.BindTo(SelectedItem); beatmapAvailabilityTracker.SelectedItem.BindTo(SelectedItem);
beatmapAvailabilityTracker.Availability.BindValueChanged(_ => updateSpecifics()); beatmapAvailabilityTracker.Availability.BindValueChanged(_ => updateSpecifics());
@ -426,35 +426,7 @@ namespace osu.Game.Screens.OnlinePlay.Match
/// <returns>The screen to enter.</returns> /// <returns>The screen to enter.</returns>
protected abstract Screen CreateGameplayScreen(PlaylistItem selectedItem); protected abstract Screen CreateGameplayScreen(PlaylistItem selectedItem);
protected void OnSelectedItemChanged() private void updateSpecifics() => Scheduler.AddOnce(() =>
{
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item)
return;
updateSpecifics();
if (!item.AllowedMods.Any())
{
UserModsSection?.Hide();
UserModsSelectOverlay.Hide();
UserModsSelectOverlay.IsValidMod = _ => false;
}
else
{
UserModsSection?.Show();
var rulesetInstance = GetGameplayRuleset().CreateInstance();
var allowedMods = item.AllowedMods.Select(m => m.ToMod(rulesetInstance));
UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
}
if (item.FreeStyle)
UserStyleSection?.Show();
else
UserStyleSection?.Hide();
}
private void updateSpecifics()
{ {
if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item) if (!this.IsCurrentScreen() || SelectedItem.Value is not PlaylistItem item)
return; return;
@ -476,22 +448,41 @@ namespace osu.Game.Screens.OnlinePlay.Match
Mods.Value = GetGameplayMods().Select(m => m.ToMod(rulesetInstance)).ToArray(); Mods.Value = GetGameplayMods().Select(m => m.ToMod(rulesetInstance)).ToArray();
Ruleset.Value = GetGameplayRuleset(); Ruleset.Value = GetGameplayRuleset();
if (UserStyleDisplayContainer != null) if (!item.AllowedMods.Any())
{ {
PlaylistItem gameplayItem = SelectedItem.Value.With(ruleset: GetGameplayRuleset().OnlineID, beatmap: new Optional<IBeatmapInfo>(GetGameplayBeatmap())); UserModsSection?.Hide();
PlaylistItem? currentItem = UserStyleDisplayContainer.SingleOrDefault()?.Item; UserModsSelectOverlay.Hide();
UserModsSelectOverlay.IsValidMod = _ => false;
if (gameplayItem.Equals(currentItem))
return;
UserStyleDisplayContainer.Child = new DrawableRoomPlaylistItem(gameplayItem, true)
{
AllowReordering = false,
AllowEditing = true,
RequestEdit = _ => OpenStyleSelection()
};
} }
} else
{
UserModsSection?.Show();
UserModsSelectOverlay.IsValidMod = m => allowedMods.Any(a => a.GetType() == m.GetType());
}
if (item.FreeStyle)
{
UserStyleSection?.Show();
if (UserStyleDisplayContainer != null)
{
PlaylistItem gameplayItem = SelectedItem.Value.With(ruleset: GetGameplayRuleset().OnlineID, beatmap: new Optional<IBeatmapInfo>(GetGameplayBeatmap()));
PlaylistItem? currentItem = UserStyleDisplayContainer.SingleOrDefault()?.Item;
if (gameplayItem.Equals(currentItem))
return;
UserStyleDisplayContainer.Child = new DrawableRoomPlaylistItem(gameplayItem, true)
{
AllowReordering = false,
AllowEditing = item.FreeStyle,
RequestEdit = _ => OpenStyleSelection()
};
}
}
else
UserStyleSection?.Hide();
});
protected virtual APIMod[] GetGameplayMods() => UserMods.Value.Select(m => new APIMod(m)).Concat(SelectedItem.Value!.RequiredMods).ToArray(); protected virtual APIMod[] GetGameplayMods() => UserMods.Value.Select(m => new APIMod(m)).Concat(SelectedItem.Value!.RequiredMods).ToArray();

3
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
View File

@ -392,9 +392,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
addItemButton.Alpha = localUserCanAddItem ? 1 : 0; addItemButton.Alpha = localUserCanAddItem ? 1 : 0;
// Forcefully update the selected item so that the user state is applied.
Scheduler.AddOnce(OnSelectedItemChanged);
Activity.Value = new UserActivity.InLobby(Room); Activity.Value = new UserActivity.InLobby(Room);
} }