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

Add DailyChallengeIntroPlayed session static

Browse Source
This commit is contained in:
Salman Ahmed 2024-08-21 03:35:26 +09:00
parent f4b8fc6165
commit 637c9aeef0
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Configuration/SessionStatics.cs
View File

@ -80,5 +80,11 @@ namespace osu.Game.Configuration
/// Stores the local user's last score (can be completed or aborted). /// Stores the local user's last score (can be completed or aborted).
/// </summary> /// </summary>
LastLocalUserScore, LastLocalUserScore,
/// <summary>
/// Whether the intro animation for the daily challenge screen has been played once.
/// This is reset when a new challenge is up.
/// </summary>
DailyChallengeIntroPlayed,
} }
} }

7
osu.Game/Screens/Menu/DailyChallengeButton.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Threading; using osu.Framework.Threading;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps.Drawables; using osu.Game.Beatmaps.Drawables;
using osu.Game.Configuration;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Localisation; using osu.Game.Localisation;
@ -46,6 +47,9 @@ namespace osu.Game.Screens.Menu
[Resolved] [Resolved]
private INotificationOverlay? notificationOverlay { get; set; } private INotificationOverlay? notificationOverlay { get; set; }
[Resolved]
private SessionStatics statics { get; set; } = null!;
public DailyChallengeButton(string sampleName, Color4 colour, Action<MainMenuButton>? clickAction = null, params Key[] triggerKeys) public DailyChallengeButton(string sampleName, Color4 colour, Action<MainMenuButton>? clickAction = null, params Key[] triggerKeys)
: base(ButtonSystemStrings.DailyChallenge, sampleName, OsuIcon.DailyChallenge, colour, clickAction, triggerKeys) : base(ButtonSystemStrings.DailyChallenge, sampleName, OsuIcon.DailyChallenge, colour, clickAction, triggerKeys)
{ {
@ -148,6 +152,9 @@ namespace osu.Game.Screens.Menu
roomRequest.Success += room => roomRequest.Success += room =>
{ {
// force showing intro on the first time when a new daily challenge is up.
statics.SetValue(Static.DailyChallengeIntroPlayed, false);
Room = room; Room = room;
cover.OnlineInfo = TooltipContent = room.Playlist.FirstOrDefault()?.Beatmap.BeatmapSet as APIBeatmapSet; cover.OnlineInfo = TooltipContent = room.Playlist.FirstOrDefault()?.Beatmap.BeatmapSet as APIBeatmapSet;

5
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -150,7 +150,10 @@ namespace osu.Game.Screens.Menu
OnPlaylists = () => this.Push(new Playlists()), OnPlaylists = () => this.Push(new Playlists()),
OnDailyChallenge = room => OnDailyChallenge = room =>
{ {
this.Push(new DailyChallengeIntro(room)); if (statics.Get<bool>(Static.DailyChallengeIntroPlayed))
this.Push(new DailyChallenge(room));
else
this.Push(new DailyChallengeIntro(room));
}, },
OnExit = () => OnExit = () =>
{ {

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

@ -70,6 +70,9 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
[Resolved] [Resolved]
private MusicController musicController { get; set; } = null!; private MusicController musicController { get; set; } = null!;
[Resolved]
private SessionStatics statics { get; set; } = null!;
private Sample? dateWindupSample; private Sample? dateWindupSample;
private Sample? dateImpactSample; private Sample? dateImpactSample;
private Sample? beatmapWindupSample; private Sample? beatmapWindupSample;
@ -461,6 +464,8 @@ namespace osu.Game.Screens.OnlinePlay.DailyChallenge
{ {
Schedule(() => Schedule(() =>
{ {
statics.SetValue(Static.DailyChallengeIntroPlayed, true);
if (this.IsCurrentScreen()) if (this.IsCurrentScreen())
this.Push(new DailyChallenge(room)); this.Push(new DailyChallenge(room));
}); });