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

Move all logic to TopLocalRank and remove CarouselBeatmapRank

Browse Source
This commit is contained in:
Santeri Nogelainen 2020-04-04 22:28:36 +03:00
parent 6bde102207
commit 1e8badb14a
3 changed files with 32 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
osu.Game/Online/Leaderboards/TopLocalRank.cs
View File

@ -1,12 +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;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Online.API;
using osu.Game.Rulesets;
@ -14,43 +11,44 @@ using osu.Game.Scoring;
namespace osu.Game.Online.Leaderboards
{
public class TopLocalRank : Container
public class TopLocalRank : UpdateableRank
{
private readonly BeatmapInfo beatmap;
private readonly UpdateableRank rank;
private ScoreManager scores;
private IBindable<RulesetInfo> ruleset;
private IAPIProvider api;
/// <summary>
/// Raised when the top score is loaded
/// </summary>
public Action<ScoreInfo> ScoreLoaded;
protected override double LoadDelay => 250;
public TopLocalRank(BeatmapInfo beatmap)
public TopLocalRank(BeatmapInfo beatmap) : base(null)
{
this.beatmap = beatmap;
RelativeSizeAxes = Axes.Both;
InternalChild = rank = new UpdateableRank(null)
{
RelativeSizeAxes = Axes.Both
};
}
[BackgroundDependencyLoader]
private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset, IAPIProvider api)
{
scores.ItemAdded += scoreChanged;
scores.ItemRemoved += scoreChanged;
ruleset.ValueChanged += _ => fetchAndLoadTopScore();
this.ruleset = ruleset.GetBoundCopy();
this.scores = scores;
this.ruleset = ruleset;
this.api = api;
FetchAndLoadTopScore();
fetchAndLoadTopScore();
}
public void FetchAndLoadTopScore()
private void scoreChanged(ScoreInfo score)
{
if (score.BeatmapInfoID == beatmap.ID)
{
fetchAndLoadTopScore();
}
}
private void fetchAndLoadTopScore()
{
var score = fetchTopScore();
@ -59,9 +57,16 @@ namespace osu.Game.Online.Leaderboards
private void loadTopScore(ScoreInfo score)
{
Schedule(() => rank.Rank = score?.Rank);
var rank = score?.Rank;
ScoreLoaded?.Invoke(score);
// toggle the display of this drawable
// we do not want empty space if there is no rank to be displayed
if (rank.HasValue)
Show();
else
Hide();
Schedule(() => Rank = rank);
}
private ScoreInfo fetchTopScore()
@ -69,8 +74,7 @@ namespace osu.Game.Online.Leaderboards
if (scores == null || beatmap == null || ruleset?.Value == null || api?.LocalUser.Value == null)
return null;
return scores.GetAllUsableScores()
.Where(s => s.UserID == api.LocalUser.Value.Id && s.BeatmapInfoID == beatmap.ID && s.RulesetID == ruleset.Value.ID)
return scores.QueryScores(s => s.UserID == api.LocalUser.Value.Id && s.BeatmapInfoID == beatmap.ID && s.RulesetID == ruleset.Value.ID && !s.DeletePending)
.OrderByDescending(s => s.TotalScore)
.FirstOrDefault();
}

68
osu.Game/Screens/Select/Carousel/CarouselBeatmapRank.cs
View File

@ -1,68 +0,0 @@
// 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 osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Online.Leaderboards;
using osu.Game.Rulesets;
using osu.Game.Scoring;
namespace osu.Game.Screens.Select.Carousel
{
public class CarouselBeatmapRank : Container
{
private const int rank_size = 20;
private readonly BeatmapInfo beatmap;
private TopLocalRank rank;
public CarouselBeatmapRank(BeatmapInfo beatmap)
{
this.beatmap = beatmap;
Height = rank_size;
}
[BackgroundDependencyLoader]
private void load(ScoreManager scores, IBindable<RulesetInfo> ruleset)
{
scores.ItemAdded += scoreChanged;
scores.ItemRemoved += scoreChanged;
ruleset.ValueChanged += _ => rulesetChanged();
rank = new TopLocalRank(beatmap)
{
ScoreLoaded = scaleDisplay
};
InternalChild = new DelayedLoadWrapper(rank)
{
RelativeSizeAxes = Axes.Both
};
}
private void rulesetChanged()
{
rank.FetchAndLoadTopScore();
}
private void scoreChanged(ScoreInfo score)
{
if (score.BeatmapInfoID == beatmap.ID)
{
rank.FetchAndLoadTopScore();
}
}
private void scaleDisplay(ScoreInfo score)
{
if (score != null)
Width = rank_size * 2;
else
Width = 0;
}
}
}

6
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -19,6 +19,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Leaderboards;
using osu.Game.Overlays;
using osuTK;
using osuTK.Graphics;
@ -129,9 +130,10 @@ namespace osu.Game.Screens.Select.Carousel
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
new CarouselBeatmapRank(beatmap)
new TopLocalRank(beatmap)
{
Scale = new Vector2(0.8f)
Scale = new Vector2(0.8f),
Size = new Vector2(40, 20)
},
starCounter = new StarCounter
{