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

Merge pull request #27205 from Joehuu/fix-star-counter-animation-above-10

Browse Source 
Fix star counter decrease animation being delayed when current is over displayed star count
This commit is contained in:
Dean Herbert 2024-02-17 18:16:48 +08:00 committed by GitHub
commit 2adc8b15e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
osu.Game.Tests/Visual/Gameplay/TestSceneStarCounter.cs
View File

@ -3,6 +3,7 @@
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -14,39 +15,47 @@ namespace osu.Game.Tests.Visual.Gameplay
public partial class TestSceneStarCounter : OsuTestScene public partial class TestSceneStarCounter : OsuTestScene
{ {
private readonly StarCounter starCounter; private readonly StarCounter starCounter;
private readonly StarCounter twentyStarCounter;
private readonly OsuSpriteText starsLabel; private readonly OsuSpriteText starsLabel;
public TestSceneStarCounter() public TestSceneStarCounter()
{ {
starCounter = new StarCounter Add(new FillFlowContainer
{ {
Origin = Anchor.Centre, AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
}; Origin = Anchor.Centre,
Direction = FillDirection.Vertical,
Add(starCounter); Spacing = new Vector2(20),
Children = new Drawable[]
{
starCounter = new StarCounter(),
twentyStarCounter = new StarCounter(20),
starsLabel = new OsuSpriteText starsLabel = new OsuSpriteText
{ {
Origin = Anchor.Centre, Anchor = Anchor.TopCentre,
Anchor = Anchor.Centre, Origin = Anchor.TopCentre,
Scale = new Vector2(2), Scale = new Vector2(2),
Y = 50, },
}; }
});
Add(starsLabel);
setStars(5); setStars(5);
AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (starCounter.StarCount + 1)), 10); AddRepeatStep("random value", () => setStars(RNG.NextSingle() * (twentyStarCounter.StarCount + 1)), 10);
AddSliderStep("exact value", 0f, 10f, 5f, setStars); AddSliderStep("exact value", 0f, 20f, 5f, setStars);
AddStep("stop animation", () => starCounter.StopAnimation()); AddStep("stop animation", () =>
{
starCounter.StopAnimation();
twentyStarCounter.StopAnimation();
});
AddStep("reset", () => setStars(0)); AddStep("reset", () => setStars(0));
} }
private void setStars(float stars) private void setStars(float stars)
{ {
starCounter.Current = stars; starCounter.Current = stars;
twentyStarCounter.Current = stars;
starsLabel.Text = starCounter.Current.ToString("0.00"); starsLabel.Text = starCounter.Current.ToString("0.00");
} }
} }

2
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -115,7 +115,7 @@ namespace osu.Game.Graphics.UserInterface
star.ClearTransforms(true); star.ClearTransforms(true);
double delay = (current <= newValue ? Math.Max(i - current, 0) : Math.Max(current - 1 - i, 0)) * AnimationDelay; double delay = Math.Max(current <= newValue ? i - current : Math.Min(current, StarCount) - 1 - i, 0) * AnimationDelay;
using (star.BeginDelayedSequence(delay)) using (star.BeginDelayedSequence(delay))
star.DisplayAt(getStarScale(i, newValue)); star.DisplayAt(getStarScale(i, newValue));