h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 11:30:49 +08:00
Code Issues Releases Wiki Activity

Merge pull request #33266 from bdach/score-correct-processing-status

Browse Source 
Fix profile score display logic not matching website
This commit is contained in:
Dean Herbert
2025-05-27 13:47:52 +09:00
committed by GitHub
Unverified
parent bf22160098 bedac98e06
commit 900cef8f20
4 changed files with 91 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Online/TestSceneUserProfileScores.cs
+45 -4
View File
@@ -31,7 +31,8 @@ namespace osu.Game.Tests.Visual.Online
Title = "JUSTadICE (TV Size)",
Artist = "Oomori Seiko",
},
DifficultyName = "Extreme"
DifficultyName = "Extreme",
Status = BeatmapOnlineStatus.Ranked,
},
EndedAt = DateTimeOffset.Now,
Mods = new[]
@@ -42,6 +43,8 @@ namespace osu.Game.Tests.Visual.Online
},
Accuracy = 0.9813,
Ranked = true,
Preserve = true,
Processed = true,
};
var secondScore = new SoloScoreInfo
@@ -55,7 +58,8 @@ namespace osu.Game.Tests.Visual.Online
Title = "Triumph & Regret",
Artist = "typeMARS",
},
DifficultyName = "[4K] Regret"
DifficultyName = "[4K] Regret",
Status = BeatmapOnlineStatus.Ranked,
},
EndedAt = DateTimeOffset.Now,
Mods = new[]
@@ -65,6 +69,8 @@ namespace osu.Game.Tests.Visual.Online
},
Accuracy = 0.998546,
Ranked = true,
Preserve = true,
Processed = true,
};
var thirdScore = new SoloScoreInfo
@@ -78,11 +84,14 @@ namespace osu.Game.Tests.Visual.Online
Title = "Idolize",
Artist = "Creo",
},
DifficultyName = "Insane"
DifficultyName = "Insane",
Status = BeatmapOnlineStatus.Ranked,
},
EndedAt = DateTimeOffset.Now,
Accuracy = 0.9726,
Ranked = true,
Preserve = true,
Processed = true,
};
var noPPScore = new SoloScoreInfo
@@ -95,11 +104,14 @@ namespace osu.Game.Tests.Visual.Online
Title = "C18H27NO3(extend)",
Artist = "Team Grimoire",
},
DifficultyName = "[4K] Cataclysmic Hypernova"
DifficultyName = "[4K] Cataclysmic Hypernova",
Status = BeatmapOnlineStatus.Ranked,
},
EndedAt = DateTimeOffset.Now,
Accuracy = 0.55879,
Ranked = true,
Preserve = true,
Processed = true,
};
var lovedScore = new SoloScoreInfo
@@ -118,6 +130,8 @@ namespace osu.Game.Tests.Visual.Online
EndedAt = DateTimeOffset.Now,
Accuracy = 0.55879,
Ranked = true,
Preserve = true,
Processed = true,
};
var unprocessedPPScore = new SoloScoreInfo
@@ -136,6 +150,8 @@ namespace osu.Game.Tests.Visual.Online
EndedAt = DateTimeOffset.Now,
Accuracy = 0.55879,
Ranked = true,
Preserve = true,
Processed = false,
};
var unrankedPPScore = new SoloScoreInfo
@@ -153,7 +169,31 @@ namespace osu.Game.Tests.Visual.Online
},
EndedAt = DateTimeOffset.Now,
Accuracy = 0.55879,
PP = 96.83,
Ranked = false,
Preserve = true,
Processed = true,
};
var notPreservedPPScore = new SoloScoreInfo
{
Rank = ScoreRank.B,
Beatmap = new APIBeatmap
{
BeatmapSet = new APIBeatmapSet
{
Title = "C18H27NO3(extend)",
Artist = "Team Grimoire",
},
DifficultyName = "[4K] Cataclysmic Hypernova",
Status = BeatmapOnlineStatus.Ranked,
},
EndedAt = DateTimeOffset.Now,
Accuracy = 0.55879,
PP = 96.83,
Ranked = true,
Preserve = false,
Processed = true,
};
Add(new FillFlowContainer
@@ -172,6 +212,7 @@ namespace osu.Game.Tests.Visual.Online
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(lovedScore)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(unprocessedPPScore)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(unrankedPPScore)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileScore(notPreservedPPScore)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(firstScore, 0.97)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(secondScore, 0.85)),
new ColourProvidedContainer(OverlayColourScheme.Pink, new DrawableProfileWeightedScore(thirdScore, 0.66)),
osu.Game/Online/API/Requests/Responses/SoloScoreInfo.cs
+8
View File
@@ -121,6 +121,12 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty("ranked")]
public bool Ranked { get; set; }
[JsonProperty("preserve")]
public bool Preserve { get; set; }
[JsonProperty("processed")]
public bool Processed { get; set; }
// These properties are calculated or not relevant to any external usage.
public bool ShouldSerializeID() => false;
public bool ShouldSerializeUser() => false;
@@ -129,6 +135,8 @@ namespace osu.Game.Online.API.Requests.Responses
public bool ShouldSerializePP() => false;
public bool ShouldSerializeOnlineID() => false;
public bool ShouldSerializeHasReplay() => false;
public bool ShouldSerializePreserve() => false;
public bool ShouldSerializeProcessed() => false;
// These fields only need to be serialised if they hold values.
// Generally this is required because this model may be used by server-side components, but
osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+2
View File
@@ -200,6 +200,8 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
content.Add(new StatisticText(count, maxCount, @"N0") { Colour = count == 0 ? Color4.Gray : Color4.White });
}
// TODO: all this should be using the same sort of logic as `DrawableProfileScore` is, but that's not easily done
// unless the ENTIRE overlay can be weaned off of `ScoreInfo` and use `SoloScoreInfo` instead
if (showPerformancePoints)
{
if (!score.Ranked)
osu.Game/Overlays/Profile/Sections/Ranks/DrawableProfileScore.cs
+36 -34
View File
@@ -216,34 +216,7 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
{
var font = OsuFont.GetFont(weight: FontWeight.Bold);
if (Score.PP.HasValue)
{
return new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new[]
{
new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = font,
Text = $"{Score.PP:0}",
Colour = colourProvider.Highlight1
},
new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = font.With(size: 12),
Text = "pp",
Colour = colourProvider.Light3
}
}
};
}
// cross-reference: https://github.com/ppy/osu-web/blob/a6afee076f4f68bb56dea0cb8f18db63651763a7/resources/js/profile-page/play-detail.tsx#L118-L133
if (Score.Beatmap?.Status.GrantsPerformancePoints() != true)
{
if (Score.Beatmap?.Status == BeatmapOnlineStatus.Loved)
@@ -266,7 +239,8 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
};
}
if (!Score.Ranked)
// cross-reference: https://github.com/ppy/osu-web/blob/a6afee076f4f68bb56dea0cb8f18db63651763a7/resources/js/scores/pp-value.tsx#L19-L39
if (!Score.Ranked || !Score.Preserve || (Score.PP == null && Score.Processed))
{
return new SpriteTextWithTooltip
{
@@ -277,12 +251,40 @@ namespace osu.Game.Overlays.Profile.Sections.Ranks
};
}
return new SpriteIconWithTooltip
if (Score.PP == null)
{
Icon = FontAwesome.Solid.Sync,
Size = new Vector2(font.Size),
TooltipText = ScoresStrings.StatusProcessing,
Colour = colourProvider.Highlight1
return new SpriteIconWithTooltip
{
Icon = FontAwesome.Solid.Sync,
Size = new Vector2(font.Size),
TooltipText = ScoresStrings.StatusProcessing,
Colour = colourProvider.Highlight1
};
}
return new FillFlowContainer
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Children = new[]
{
new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = font,
Text = $"{Score.PP:0}",
Colour = colourProvider.Highlight1
},
new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = font.With(size: 12),
Text = "pp",
Colour = colourProvider.Light3
}
}
};
}