h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-23 19:00:09 +08:00
Code Issues Releases Wiki Activity

Resolve candidateItem in RollAndDisplayFinalBeatmap instead of PresentRolledBeatmap

Browse Source
This commit is contained in:
marvin
2025-11-19 13:15:53 +01:00
Unverified
parent 277f4268db
commit 02090bf6c4
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Matchmaking/TestSceneBeatmapSelectGrid.cs
+3 -3
View File
@@ -160,7 +160,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
grid.PlayRollAnimation(finalItem, duration: 0);
Scheduler.AddDelayed(() => grid.PresentRolledBeatmap(finalItem, MatchmakingCandidateType.UserSelection), 500);
Scheduler.AddDelayed(() => grid.PresentRolledBeatmap(finalItem, finalItem, MatchmakingCandidateType.UserSelection), 500);
});
}
@@ -175,7 +175,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
grid.ArrangeItemsForRollAnimation(duration: 0, stagger: 0);
grid.PlayRollAnimation(finalItem, duration: 0);
Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(finalItem, MatchmakingCandidateType.UserSelection), 500);
Scheduler.AddDelayed(() => grid.PresentUnanimouslyChosenBeatmap(finalItem, finalItem, MatchmakingCandidateType.UserSelection), 500);
});
}
@@ -192,7 +192,7 @@ namespace osu.Game.Tests.Visual.Matchmaking
Scheduler.AddDelayed(() =>
{
grid.PresentRolledBeatmap(finalItem, MatchmakingCandidateType.Random);
grid.PresentRolledBeatmap(-1, finalItem, MatchmakingCandidateType.Random);
}, 500);
});
}
osu.Game/Screens/OnlinePlay/Matchmaking/Match/BeatmapSelect/BeatmapSelectGrid.cs
+16 -15
View File
@@ -143,8 +143,15 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
public void RollAndDisplayFinalBeatmap(long[] candidateItemIds, long finalItemId, MatchmakingCandidateType candidateType) => whenPanelsLoaded(() =>
{
long candidateItemId = candidateType switch
{
MatchmakingCandidateType.UserSelection => finalItemId,
MatchmakingCandidateType.Random => -1,
_ => throw new ArgumentOutOfRangeException(nameof(candidateType), candidateType, null)
};
Debug.Assert(candidateItemIds.Length >= 1);
Debug.Assert(candidateItemIds.Contains(finalItemId));
Debug.Assert(candidateItemIds.Contains(candidateItemId));
Debug.Assert(panelLookup.ContainsKey(finalItemId));
Debug.Assert(candidateItemIds.All(id => panelLookup.ContainsKey(id)));
@@ -157,7 +164,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
this.Delay(ARRANGE_DELAY)
.Schedule(() => ArrangeItemsForRollAnimation())
.Delay(arrange_duration + present_beatmap_delay)
.Schedule(() => PresentUnanimouslyChosenBeatmap(finalItemId, candidateType));
.Schedule(() => PresentUnanimouslyChosenBeatmap(candidateItemId, finalItemId, candidateType));
}
else
{
@@ -166,7 +173,7 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
.Delay(arrange_duration)
.Schedule(() => PlayRollAnimation(finalItemId, roll_duration))
.Delay(roll_duration + present_beatmap_delay)
.Schedule(() => PresentRolledBeatmap(finalItemId, candidateType));
.Schedule(() => PresentRolledBeatmap(candidateItemId, finalItemId, candidateType));
}
});
@@ -313,20 +320,14 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
}
}
internal void PresentRolledBeatmap(long finalItem, MatchmakingCandidateType candidateType)
internal void PresentRolledBeatmap(long candidateItem, long finalItem, MatchmakingCandidateType candidateType)
{
long itemToReveal = candidateType switch
{
MatchmakingCandidateType.UserSelection => finalItem,
MatchmakingCandidateType.Random => -1,
_ => throw new ArgumentOutOfRangeException(nameof(candidateType), candidateType, null)
};
Debug.Assert(rollContainer.Children.Any(it => it.Item.ID == finalItem));
Debug.Assert(rollContainer.Children.Any(it => it.Item.ID == candidateItem));
Debug.Assert(playlistItems.ContainsKey(finalItem));
foreach (var panel in rollContainer.Children)
{
if (panel.Item.ID != itemToReveal)
if (panel.Item.ID != candidateItem)
{
panel.FadeOut(200);
panel.PopOutAndExpire(easing: Easing.InQuad);
@@ -345,11 +346,11 @@ namespace osu.Game.Screens.OnlinePlay.Matchmaking.Match.BeatmapSelect
}
}
internal void PresentUnanimouslyChosenBeatmap(long finalItem, MatchmakingCandidateType candidateType)
internal void PresentUnanimouslyChosenBeatmap(long candidateItem, long finalItem, MatchmakingCandidateType candidateType)
{
// TODO: display special animation in this case
PresentRolledBeatmap(finalItem, candidateType);
PresentRolledBeatmap(candidateItem, finalItem, candidateType);
}
private readonly TaskCompletionSource panelsLoaded = new TaskCompletionSource();