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

Fix post-merge errors

Browse Source
This commit is contained in:
Salman Alshamrani 2024-10-25 02:25:32 -04:00
parent 701fb565b1
commit 2fd495228c
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Online/TestSceneUserStatisticsWatcher.cs
View File

@ -25,6 +25,7 @@ namespace osu.Game.Tests.Visual.Online
{
protected override bool UseOnlineAPI => false;
private LocalUserStatisticsProvider statisticsProvider = null!;
private UserStatisticsWatcher watcher = null!;
[Resolved]
@ -109,7 +110,7 @@ namespace osu.Game.Tests.Visual.Online
{
Clear();
Add(statisticsProvider = new LocalUserStatisticsProvider());
Add(watcher = new SoloStatisticsWatcher(statisticsProvider));
Add(watcher = new UserStatisticsWatcher(statisticsProvider));
});
}

5
osu.Game/Online/API/IAPIProvider.cs
View File

@ -124,6 +124,11 @@ namespace osu.Game.Online.API
/// </summary>
void Logout();
/// <summary>
/// Schedule a callback to run on the update thread.
/// </summary>
internal void Schedule(Action action);
/// <summary>
/// Constructs a new <see cref="IHubClientConnector"/>. May be null if not supported.
/// </summary>

4
osu.Game/Online/UserStatisticsWatcher.cs
View File

@ -36,7 +36,7 @@ namespace osu.Game.Online
private Dictionary<string, UserStatistics>? latestStatistics;
public SoloStatisticsWatcher(LocalUserStatisticsProvider? statisticsProvider = null)
public UserStatisticsWatcher(LocalUserStatisticsProvider? statisticsProvider = null)
{
this.statisticsProvider = statisticsProvider;
}
@ -118,7 +118,7 @@ namespace osu.Game.Online
{
string rulesetName = scoreInfo.Ruleset.ShortName;
statisticsProvider?.UpdateStatistics(updatedStatistics, callback.Score.Ruleset);
statisticsProvider?.UpdateStatistics(updatedStatistics, scoreInfo.Ruleset);
if (latestStatistics == null)
return;

2
osu.Game/OsuGame.cs
View File

@ -1069,7 +1069,7 @@ namespace osu.Game
ScreenStack.Push(CreateLoader().With(l => l.RelativeSizeAxes = Axes.Both));
});
loadComponentSingleFile(new UserStatisticsWatcher(), Add, true);
loadComponentSingleFile(new UserStatisticsWatcher(LocalUserStatisticsProvider), Add, true);
loadComponentSingleFile(Toolbar = new Toolbar
{
OnHome = delegate

11
osu.Game/OsuGameBase.cs
View File

@ -212,8 +212,8 @@ namespace osu.Game
protected MultiplayerClient MultiplayerClient { get; private set; }
private MetadataClient metadataClient;
private SoloStatisticsWatcher soloStatisticsWatcher;
private LocalUserStatisticsProvider localUserStatisticsProvider;
protected LocalUserStatisticsProvider LocalUserStatisticsProvider { get; private set; }
private RealmAccess realm;
@ -330,9 +330,7 @@ namespace osu.Game
dependencies.CacheAs(SpectatorClient = new OnlineSpectatorClient(endpoints));
dependencies.CacheAs(MultiplayerClient = new OnlineMultiplayerClient(endpoints));
dependencies.CacheAs(metadataClient = new OnlineMetadataClient(endpoints));
dependencies.CacheAs(localUserStatisticsProvider = new LocalUserStatisticsProvider());
dependencies.CacheAs(soloStatisticsWatcher = new SoloStatisticsWatcher(localUserStatisticsProvider));
dependencies.CacheAs(LocalUserStatisticsProvider = new LocalUserStatisticsProvider());
base.Content.Add(new BeatmapOnlineChangeIngest(beatmapUpdater, realm, metadataClient));
@ -375,8 +373,7 @@ namespace osu.Game
base.Content.Add(SpectatorClient);
base.Content.Add(MultiplayerClient);
base.Content.Add(metadataClient);
base.Content.Add(localUserStatisticsProvider);
base.Content.Add(soloStatisticsWatcher);
base.Content.Add(LocalUserStatisticsProvider);
base.Content.Add(rulesetConfigCache);