diff --git a/osu.Game.Mode.Osu/UI/OsuComboCounter.cs b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs index dc90ee2779..8a6e9a30e2 100644 --- a/osu.Game.Mode.Osu/UI/OsuComboCounter.cs +++ b/osu.Game.Mode.Osu/UI/OsuComboCounter.cs @@ -17,7 +17,7 @@ namespace osu.Game.Modes.Osu.UI protected virtual float PopOutSmallScale => 1.1f; protected virtual bool CanPopOutWhileRolling => false; - public Vector2 PopOutScale = new Vector2(2.5f); + public Vector2 PopOutScale = new Vector2(1.6f); protected override void LoadComplete() { diff --git a/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs index 0c967999b3..36a1f1c100 100644 --- a/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs +++ b/osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs @@ -12,18 +12,20 @@ namespace osu.Game.Modes.Osu.UI { public class OsuScoreOverlay : ScoreOverlay { - protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter() - { - Anchor = Anchor.TopRight, - Origin = Anchor.TopRight, - Position = new Vector2(0, 45) - }; - protected override ScoreCounter CreateScoreCounter() => new ScoreCounter() { Anchor = Anchor.TopRight, Origin = Anchor.TopRight, - TextSize = 60 + TextSize = 60, + Margin = new MarginPadding { Right = 5 }, + }; + + protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter() + { + Anchor = Anchor.TopRight, + Origin = Anchor.TopRight, + Position = new Vector2(0, 55), + Margin = new MarginPadding { Right = 5 }, }; protected override ComboCounter CreateComboCounter() => new OsuComboCounter() diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs index b045089dcd..63c15553d5 100644 --- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs +++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs @@ -20,7 +20,7 @@ namespace osu.Game.Graphics.UserInterface { protected override Type TransformType => typeof(TransformAccuracy); - protected override double RollingDuration => 20; + protected override double RollingDuration => 150; protected override bool IsRollingProportional => true; private float epsilon => 1e-10f; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index fd60a8ca8e..6a21da9bce 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -42,7 +42,7 @@ namespace osu.Game.Graphics.UserInterface /// /// Easing for the counter rollover animation. /// - protected virtual EasingTypes RollingEasing => EasingTypes.None; + protected virtual EasingTypes RollingEasing => EasingTypes.Out; private T displayedCount;