1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 11:42:54 +08:00

Make SeasonalBackgroundLoader read from SessionStatics

This commit is contained in:
Max Hübner 2020-10-29 17:31:42 +01:00
parent 76c0a790b4
commit 907e1921c7
2 changed files with 18 additions and 8 deletions

View File

@ -1,6 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Configuration
{
/// <summary>
@ -12,12 +15,14 @@ namespace osu.Game.Configuration
{
Set(Static.LoginOverlayDisplayed, false);
Set(Static.MutedAudioNotificationShownOnce, false);
Set(Static.SeasonalBackgrounds, new List<APISeasonalBackground>());
}
}
public enum Static
{
LoginOverlayDisplayed,
MutedAudioNotificationShownOnce
MutedAudioNotificationShownOnce,
SeasonalBackgrounds
}
}

View File

@ -5,9 +5,11 @@ using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Textures;
using osu.Framework.Utils;
using osu.Game.Configuration;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
@ -17,17 +19,20 @@ namespace osu.Game.Graphics.Backgrounds
[LongRunningLoad]
public class SeasonalBackgroundLoader : Component
{
private List<APISeasonalBackground> backgrounds = new List<APISeasonalBackground>();
private Bindable<List<APISeasonalBackground>> backgrounds;
private int current;
[BackgroundDependencyLoader]
private void load(IAPIProvider api)
private void load(SessionStatics sessionStatics, IAPIProvider api)
{
backgrounds = sessionStatics.GetBindable<List<APISeasonalBackground>>(Static.SeasonalBackgrounds);
if (backgrounds.Value.Any()) return;
var request = new GetSeasonalBackgroundsRequest();
request.Success += response =>
{
backgrounds = response.Backgrounds ?? backgrounds;
current = RNG.Next(0, backgrounds.Count);
backgrounds.Value = response.Backgrounds ?? backgrounds.Value;
current = RNG.Next(0, backgrounds.Value.Count);
};
api.PerformAsync(request);
@ -37,10 +42,10 @@ namespace osu.Game.Graphics.Backgrounds
{
string url = null;
if (backgrounds.Any())
if (backgrounds.Value.Any())
{
current = (current + 1) % backgrounds.Count;
url = backgrounds[current].Url;
current = (current + 1) % backgrounds.Value.Count;
url = backgrounds.Value[current].Url;
}
return new SeasonalBackground(url, fallbackTextureName);