Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix results screen not handling F ranks properly #26733

Merged
merged 10 commits into from Feb 5, 2024
Merged

Fix results screen not handling F ranks properly #26733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ccd0e3
Add visual and failing test cases
frenzibyte Jan 26, 2024
47f0b86
Fix results screen showing other rank badges on F rank
frenzibyte Jan 26, 2024
d252629
Force results screen to play default D rank applause sound on fail (r…
frenzibyte Jan 26, 2024
35c3f5e
Merge branch 'master' into fix-results-f-rank
frenzibyte Feb 1, 2024
5bbaeb6
Play legacy applause sound only when rank is B or higher
frenzibyte Feb 1, 2024
6ab8960
Add step for toggling skins in results screen test scene
frenzibyte Feb 1, 2024
4dbcb41
Remove unused parameter
frenzibyte Feb 1, 2024
44a594b
Simplify playback logic
frenzibyte Feb 4, 2024
989e46c
Use better test step name
bdach Feb 5, 2024
ad69259
Merge branch 'master' into fix-results-f-rank
bdach Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 54 additions & 0 deletions osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
View file
Open in desktop
Expand Up @@ -26,8 +26,10 @@
using osu.Game.Screens;
using osu.Game.Screens.Play;
using osu.Game.Screens.Ranking;
using osu.Game.Screens.Ranking.Expanded.Accuracy;
using osu.Game.Screens.Ranking.Expanded.Statistics;
using osu.Game.Screens.Ranking.Statistics;
using osu.Game.Skinning;
using osu.Game.Tests.Resources;
using osuTK;
using osuTK.Input;
Expand All @@ -44,6 +46,9 @@ public partial class TestSceneResultsScreen : OsuManualInputManagerTestScene
[Resolved]
private RealmAccess realm { get; set; }

[Resolved]
private SkinManager skins { get; set; }

protected override void LoadComplete()
{
base.LoadComplete();
Expand All @@ -57,8 +62,17 @@ protected override void LoadComplete()
if (beatmapInfo != null)
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
});

AddToggleStep("toggle legacy classic skin", v =>
{
if (skins != null)
skins.CurrentSkinInfo.Value = v ? skins.DefaultClassicSkin.SkinInfo : skins.CurrentSkinInfo.Default;
});
}

[SetUp]
public void SetUp() => Schedule(() => skins.CurrentSkinInfo.SetDefault());

[Test]
public void TestScaling()
{
Expand Down Expand Up @@ -132,6 +146,46 @@ public void TestResultsForUnranked()
AddAssert("retry overlay present", () => screen.RetryOverlay != null);
}

[Test]
public void TestResultsWithFailingRank()
{
TestResultsScreen screen = null;

loadResultsScreen(() =>
{
var score = TestResources.CreateTestScoreInfo();

score.OnlineID = onlineScoreID++;
score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
score.Rank = ScoreRank.F;
return screen = createResultsScreen(score);
});
AddUntilStep("wait for loaded", () => screen.IsLoaded);
AddAssert("retry overlay present", () => screen.RetryOverlay != null);
AddAssert("no badges displayed", () => this.ChildrenOfType<RankBadge>().All(b => !b.IsPresent));
}

[Test]
public void TestResultsWithFailingRankOnLegacySkin()
{
TestResultsScreen screen = null;

AddStep("set legacy skin", () => skins.CurrentSkinInfo.Value = skins.DefaultClassicSkin.SkinInfo);

loadResultsScreen(() =>
{
var score = TestResources.CreateTestScoreInfo();

score.OnlineID = onlineScoreID++;
score.HitEvents = TestSceneStatisticsPanel.CreatePositionDistributedHitEvents();
score.Rank = ScoreRank.F;
return screen = createResultsScreen(score);
});
AddUntilStep("wait for loaded", () => screen.IsLoaded);
AddAssert("retry overlay present", () => screen.RetryOverlay != null);
AddAssert("no badges displayed", () => this.ChildrenOfType<RankBadge>().All(b => !b.IsPresent));
}

[Test]
public void TestShowHideStatisticsViaOutsideClick()
{
Expand Down
36 changes: 23 additions & 13 deletions osu.Game/Screens/Ranking/Expanded/Accuracy/AccuracyCircle.cs
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
#nullable disable

using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Audio;
Expand Down Expand Up @@ -259,10 +260,15 @@ private void load()
if (isFailedSDueToMisses)
AddInternal(failedSRankText = new RankText(ScoreRank.S));

var applauseSamples = new List<string> { applauseSampleName };
if (score.Rank >= ScoreRank.B)
// when rank is B or higher, play legacy applause sample on legacy skins.
applauseSamples.Insert(0, @"applause");

AddRangeInternal(new Drawable[]
{
rankImpactSound = new PoolableSkinnableSample(new SampleInfo(impactSampleName)),
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(@"applause", applauseSampleName)),
rankApplauseSound = new PoolableSkinnableSample(new SampleInfo(applauseSamples.ToArray())),
scoreTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/score-tick")),
badgeTickSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink")),
badgeMaxSound = new PoolableSkinnableSample(new SampleInfo(@"Results/badge-dink-max")),
Expand Down Expand Up @@ -351,24 +357,28 @@ protected override void LoadComplete()

int badgeNum = 0;

foreach (var badge in badges)
if (score.Rank != ScoreRank.F)
{
if (badge.Accuracy > score.Accuracy)
continue;

using (BeginDelayedSequence(inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracyX - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
foreach (var badge in badges)
{
badge.Appear();
if (badge.Accuracy > score.Accuracy)
continue;

if (withFlair)
using (BeginDelayedSequence(
inverseEasing(ACCURACY_TRANSFORM_EASING, Math.Min(accuracyX - virtual_ss_percentage, badge.Accuracy) / targetAccuracy) * ACCURACY_TRANSFORM_DURATION))
{
Schedule(() =>
badge.Appear();

if (withFlair)
{
var dink = badgeNum < badges.Count - 1 ? badgeTickSound : badgeMaxSound;
Schedule(() =>
{
var dink = badgeNum < badges.Count - 1 ? badgeTickSound : badgeMaxSound;

dink.FrequencyTo(1 + badgeNum++ * 0.05);
dink.Play();
});
dink.FrequencyTo(1 + badgeNum++ * 0.05);
dink.Play();
});
}
}
}
}
Expand Down