sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move metrics to beatmap set

Browse Source
This commit is contained in:
smoogipoo
2019-06-13 16:52:49 +09:00
parent f240a157b2
commit 0a79b444d9
12 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -18,6 +18,7 @@ using osu.Game.Screens.Select.Details;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Online.API.Requests.Responses;
namespace osu.Game.Screens.Select
{
@ -181,9 +182,10 @@ namespace osu.Game.Screens.Select
tags.Text = Beatmap?.Metadata?.Tags;
// metrics may have been previously fetched
if (Beatmap?.Metrics != null)
// Todo:
if (Beatmap?.BeatmapSet?.Metrics != null)
{
updateMetrics(Beatmap.Metrics);
updateMetrics(new APIBeatmapMetrics { Ratings = Beatmap.BeatmapSet.Metrics.Ratings });
return;
}
@ -210,22 +212,19 @@ namespace osu.Game.Screens.Select
updateMetrics();
}
private void updateMetrics(BeatmapMetrics metrics = null)
private void updateMetrics(APIBeatmapMetrics metrics = null)
{
var hasRatings = metrics?.Ratings?.Any() ?? false;
var hasRetriesFails = (metrics?.Retries?.Any() ?? false) && (metrics.Fails?.Any() ?? false);
if (hasRatings)
{
ratings.Metrics = metrics;
ratings.Metrics = new BeatmapSetMetrics { Ratings = metrics.Ratings };
ratingsContainer.FadeIn(transition_duration);
}
else
{
ratings.Metrics = new BeatmapMetrics
{
Ratings = new int[10],
};
ratings.Metrics = new BeatmapSetMetrics { Ratings = new int[10] };
ratingsContainer.FadeTo(0.25f, transition_duration);
}

4
osu.Game/Screens/Select/Details/UserRatings.cs
View File

@ -20,9 +20,9 @@ namespace osu.Game.Screens.Select.Details
private readonly Container graphContainer;
private readonly BarGraph graph;
private BeatmapMetrics metrics;
private BeatmapSetMetrics metrics;
public BeatmapMetrics Metrics
public BeatmapSetMetrics Metrics
{
get => metrics;
set