From eeacd85073dbf75db620f31fa41dd60d245e793f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adonais=20Romero=20Gonz=C3=A1lez?= Date: Mon, 17 Oct 2016 21:40:50 -0500 Subject: [PATCH] Protect RollingCounter props --- osu.Game/GameModes/Play/ComboResultCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/PercentageCounter.cs | 4 ++-- osu.Game/Graphics/UserInterface/RollingCounter.cs | 6 +++--- osu.Game/Graphics/UserInterface/ScoreCounter.cs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/osu.Game/GameModes/Play/ComboResultCounter.cs b/osu.Game/GameModes/Play/ComboResultCounter.cs index 10f167465f..e86a845375 100644 --- a/osu.Game/GameModes/Play/ComboResultCounter.cs +++ b/osu.Game/GameModes/Play/ComboResultCounter.cs @@ -21,8 +21,8 @@ namespace osu.Game.GameModes.Play { protected override Type TransformType => typeof(TransformComboResult); - public override double RollingDuration => 500; - public override EasingTypes RollingEasing => EasingTypes.Out; + protected override double RollingDuration => 500; + protected override EasingTypes RollingEasing => EasingTypes.Out; protected override double GetProportionalDuration(ulong currentValue, ulong newValue) { diff --git a/osu.Game/Graphics/UserInterface/PercentageCounter.cs b/osu.Game/Graphics/UserInterface/PercentageCounter.cs index fe2a5024eb..d405a756c6 100644 --- a/osu.Game/Graphics/UserInterface/PercentageCounter.cs +++ b/osu.Game/Graphics/UserInterface/PercentageCounter.cs @@ -20,8 +20,8 @@ namespace osu.Game.Graphics.UserInterface { protected override Type TransformType => typeof(TransformAccuracy); - public override double RollingDuration => 500; - public override EasingTypes RollingEasing => EasingTypes.Out; + protected override double RollingDuration => 20; + 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 e04a3b92b3..8c887ba9ae 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -30,18 +30,18 @@ namespace osu.Game.Graphics.UserInterface /// /// If true, the roll-up duration will be proportional to change in value. /// - public bool IsRollingProportional = false; + protected virtual bool IsRollingProportional => false; /// /// If IsRollingProportional = false, duration in milliseconds for the counter roll-up animation for each /// element; else duration in milliseconds for the counter roll-up animation in total. /// - public virtual double RollingDuration => 0; + protected virtual double RollingDuration => 0; /// /// Easing for the counter rollover animation. /// - public virtual EasingTypes RollingEasing => EasingTypes.None; + protected virtual EasingTypes RollingEasing => EasingTypes.None; private T displayedCount; diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs index b565107f55..28e6b36fd1 100644 --- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs +++ b/osu.Game/Graphics/UserInterface/ScoreCounter.cs @@ -17,8 +17,8 @@ namespace osu.Game.Graphics.UserInterface { protected override Type TransformType => typeof(TransformScore); - public override double RollingDuration => 1000; - public override EasingTypes RollingEasing => EasingTypes.Out; + protected override double RollingDuration => 1000; + protected override EasingTypes RollingEasing => EasingTypes.Out; /// /// How many leading zeroes the counter has.