Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add daily challenge animation to daily challenge notification #29770

Merged
merged 4 commits into from
Sep 8, 2024
Merged

Add daily challenge animation to daily challenge notification #29770

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
958bfde
added DailyChallengeIntro to notification
Ianlucht Sep 7, 2024
170737b
added DailyChallengeIntro to notification
Ianlucht Sep 7, 2024
e6f81ab
cleaned up whitespace
Ianlucht Sep 7, 2024
cd94d6e
fixed if statement format
Ianlucht Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions osu.Game/Screens/OnlinePlay/DailyChallenge/NewDailyChallengeNotification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using osu.Framework.Allocation;
using osu.Framework.Screens;
using osu.Game.Beatmaps.Drawables.Cards;
using osu.Game.Configuration;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Rooms;
using osu.Game.Overlays.Notifications;
Expand All @@ -25,13 +26,17 @@ public NewDailyChallengeNotification(Room room)
}

[BackgroundDependencyLoader]
private void load(OsuGame? game)
private void load(OsuGame? game, SessionStatics statics)
{
Text = DailyChallengeStrings.ChallengeLiveNotification;
Content.Add(card = new BeatmapCardNano((APIBeatmapSet)room.Playlist.Single().Beatmap.BeatmapSet!));
Activated = () =>
{
game?.PerformFromScreen(s => s.Push(new DailyChallenge(room)), [typeof(MainMenu)]);
if (statics.Get<bool>(Static.DailyChallengeIntroPlayed))
game?.PerformFromScreen(s => s.Push(new DailyChallenge(room)), [typeof(MainMenu)]);
else
game?.PerformFromScreen(s => s.Push(new DailyChallengeIntro(room)), [typeof(MainMenu)]);

return true;
};
}
Expand Down
Loading