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

Start playing daily challenge track as part of intro sequence

Browse Source
This commit is contained in:
Dean Herbert 2024-08-08 14:41:22 +09:00
parent 278d887ee5
commit f91a3e9a35
No known key found for this signature in database
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallenge.cs
View File

@ -389,7 +389,7 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
base.LoadComplete(); base.LoadComplete();
beatmapAvailabilityTracker.SelectedItem.Value = playlistItem; beatmapAvailabilityTracker.SelectedItem.Value = playlistItem;
beatmapAvailabilityTracker.Availability.BindValueChanged(_ => trySetDailyChallengeBeatmap(), true); beatmapAvailabilityTracker.Availability.BindValueChanged(_ => TrySetDailyChallengeBeatmap(this, beatmapManager, rulesets, musicController, playlistItem), true);
userModsSelectOverlayRegistration = overlayManager?.RegisterBlockingOverlay(userModsSelectOverlay); userModsSelectOverlayRegistration = overlayManager?.RegisterBlockingOverlay(userModsSelectOverlay);
userModsSelectOverlay.SelectedItem.Value = playlistItem; userModsSelectOverlay.SelectedItem.Value = playlistItem;
@ -401,15 +401,6 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
dailyChallengeInfo.BindValueChanged(dailyChallengeChanged); dailyChallengeInfo.BindValueChanged(dailyChallengeChanged);
} }
private void trySetDailyChallengeBeatmap()
{
var beatmap = beatmapManager.QueryBeatmap(b => b.OnlineID == playlistItem.Beatmap.OnlineID);
Beatmap.Value = beatmapManager.GetWorkingBeatmap(beatmap); // this will gracefully fall back to dummy beatmap if missing locally.
Ruleset.Value = rulesets.GetRuleset(playlistItem.RulesetID);
applyLoopingToTrack();
}
private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() => private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
{ {
if (state.NewValue != APIState.Online) if (state.NewValue != APIState.Online)
@ -443,7 +434,7 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
waves.Show(); waves.Show();
roomManager.JoinRoom(room); roomManager.JoinRoom(room);
applyLoopingToTrack(); startLoopingTrack(this, musicController);
metadataClient.BeginWatchingMultiplayerRoom(room.RoomID.Value!.Value).ContinueWith(t => metadataClient.BeginWatchingMultiplayerRoom(room.RoomID.Value!.Value).ContinueWith(t =>
{ {
@ -465,14 +456,14 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
}); });
beatmapAvailabilityTracker.SelectedItem.Value = playlistItem; beatmapAvailabilityTracker.SelectedItem.Value = playlistItem;
beatmapAvailabilityTracker.Availability.BindValueChanged(_ => trySetDailyChallengeBeatmap(), true); beatmapAvailabilityTracker.Availability.BindValueChanged(_ => TrySetDailyChallengeBeatmap(this, beatmapManager, rulesets, musicController, playlistItem), true);
userModsSelectOverlay.SelectedItem.Value = playlistItem; userModsSelectOverlay.SelectedItem.Value = playlistItem;
} }
public override void OnResuming(ScreenTransitionEvent e) public override void OnResuming(ScreenTransitionEvent e)
{ {
base.OnResuming(e); base.OnResuming(e);
applyLoopingToTrack(); startLoopingTrack(this, musicController);
// re-apply mods as they may have been changed by a child screen // re-apply mods as they may have been changed by a child screen
// (one known instance of this is showing a replay). // (one known instance of this is showing a replay).
updateMods(); updateMods();
@ -501,17 +492,27 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
return base.OnExiting(e); return base.OnExiting(e);
} }
private void applyLoopingToTrack() public static void TrySetDailyChallengeBeatmap(OsuScreen screen, BeatmapManager beatmaps, RulesetStore rulesets, MusicController music, PlaylistItem item)
{ {
if (!this.IsCurrentScreen()) var beatmap = beatmaps.QueryBeatmap(b => b.OnlineID == item.Beatmap.OnlineID);
screen.Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap); // this will gracefully fall back to dummy beatmap if missing locally.
screen.Ruleset.Value = rulesets.GetRuleset(item.RulesetID);
startLoopingTrack(screen, music);
}
private static void startLoopingTrack(OsuScreen screen, MusicController music)
{
if (!screen.IsCurrentScreen())
return; return;
var track = Beatmap.Value?.Track; var track = screen.Beatmap.Value?.Track;
if (track != null) if (track != null)
{ {
Beatmap.Value?.PrepareTrackForPreview(true); screen.Beatmap.Value?.PrepareTrackForPreview(true);
musicController.EnsurePlayingSomething(); music.EnsurePlayingSomething();
} }
} }

21
osu.Game/Screens/OnlinePlay/DailyChallenge/DailyChallengeIntro.cs
View File

@ -26,6 +26,10 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
{ {
public partial class DailyChallengeIntro : OsuScreen public partial class DailyChallengeIntro : OsuScreen
{ {
public override bool DisallowExternalBeatmapRulesetChanges => true;
public override bool? ApplyModTrackAdjustments => true;
private readonly Room room; private readonly Room room;
private readonly PlaylistItem item; private readonly PlaylistItem item;
@ -48,6 +52,15 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
[Cached] [Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum); private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Plum);
[Resolved]
private BeatmapManager beatmapManager { get; set; } = null!;
[Resolved]
private RulesetStore rulesets { get; set; } = null!;
[Resolved]
private MusicController musicController { get; set; } = null!;
public DailyChallengeIntro(Room room) public DailyChallengeIntro(Room room)
{ {
this.room = room; this.room = room;
@ -365,7 +378,13 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
beatmapContent.FadeInFromZero(280, Easing.InQuad); beatmapContent.FadeInFromZero(280, Easing.InQuad);
using (BeginDelayedSequence(300)) using (BeginDelayedSequence(300))
Schedule(() => ApplyToBackground(bs => ((RoomBackgroundScreen)bs).SelectedItem.Value = item)); {
Schedule(() =>
{
DailyChallenge.TrySetDailyChallengeBeatmap(this, beatmapManager, rulesets, musicController, item);
ApplyToBackground(bs => ((RoomBackgroundScreen)bs).SelectedItem.Value = item);
});
}
using (BeginDelayedSequence(400)) using (BeginDelayedSequence(400))
flash.FadeOutFromOne(5000, Easing.OutQuint); flash.FadeOutFromOne(5000, Easing.OutQuint);