From 2954c1934519990f296d30130ac9ad185a1188ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?= Date: Sun, 9 Oct 2016 15:19:35 -0500 Subject: [PATCH] Misc. fixes --- osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs | 2 +- osu.Game/Graphics/UserInterface/RollingCounter.cs | 2 +- osu.Game/Graphics/UserInterface/StandardComboCounter.cs | 2 +- osu.Game/Graphics/UserInterface/StarCounter.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs b/osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs index 4a343737f1..8c5510eca4 100644 --- a/osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs +++ b/osu.Game/Graphics/UserInterface/AlternativeComboCounter.cs @@ -62,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface protected virtual void transformAnimate() { - countSpriteText.Colour = TintColour; + countSpriteText.FadeColour(TintColour, 0); countSpriteText.ScaleTo(new Vector2(1, ScaleFactor)); countSpriteText.FadeColour(OriginalColour, TintDuration, TintEasing); countSpriteText.ScaleTo(new Vector2(1, 1), TintDuration, TintEasing); diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index 6b6c82b76b..b0f757a378 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface IsRollingProportional ? getProportionalDuration(VisibleCount, value) : RollingDuration; - transformCount(IsRollingContinuous ? VisibleCount : count, value); + transformCount(IsRollingContinuous ? VisibleCount : prevCount, value); } } } diff --git a/osu.Game/Graphics/UserInterface/StandardComboCounter.cs b/osu.Game/Graphics/UserInterface/StandardComboCounter.cs index 7b8587ac94..b3af78b78e 100644 --- a/osu.Game/Graphics/UserInterface/StandardComboCounter.cs +++ b/osu.Game/Graphics/UserInterface/StandardComboCounter.cs @@ -23,7 +23,7 @@ namespace osu.Game.Graphics.UserInterface public float PopOutSmallScale = 1.2f; public EasingTypes PopOutEasing = EasingTypes.None; public bool CanPopOutWhenBackwards = false; - public float PopOutInitialAlpha = 1.0f; + public float PopOutInitialAlpha = 0.75f; public StandardComboCounter() : base() { diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index 67f2a2ae0c..3ee67a38d6 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -110,7 +110,7 @@ namespace osu.Game.Graphics.UserInterface transform.StartValue = stars[i].Scale; transform.EndValue = new Vector2( Interpolation.ValueAt( - (isIncrement ? Math.Min(i + 1, Count) : Math.Max(i, Count)), + Math.Min(Math.Max(i, Count), i + 1), MinStarSize, 1.0f, i,