diff --git a/osu-framework b/osu-framework index 4c8683bcfc..cbcf8a77af 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4c8683bcfc024d7c341f3e7bb20661d241f50d0c +Subproject commit cbcf8a77afb8fb0fa759c5ee2a798bface6b80b4 diff --git a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs index 037cd92fb6..380e527de4 100644 --- a/osu.Game/Beatmaps/Objects/DrawableHitObject.cs +++ b/osu.Game/Beatmaps/Objects/DrawableHitObject.cs @@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps.Objects if (AllowHit?.Invoke(this) == false) return false; - HitTime = Time; + HitTime = Time.Current; State = ArmedState.Armed; return true; diff --git a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs index 890b576d83..cf150e7e04 100644 --- a/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs +++ b/osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs @@ -96,7 +96,7 @@ namespace osu.Game.Beatmaps.Objects.Osu.Drawable approachCircle.Transforms.Add(new TransformScale { StartTime = t - 1000, EndTime = t, StartValue = new Vector2(2f), EndValue = new Vector2(0.6f) }); //set transform delay to t==hitTime - Delay(t - Time, true); + Delay(t - Time.Current, true); approachCircle.FadeOut(); glow.FadeOut(400); diff --git a/osu.Game/GameModes/Play/ComboCounter.cs b/osu.Game/GameModes/Play/ComboCounter.cs index a9db04347d..ec0d1b45d5 100644 --- a/osu.Game/GameModes/Play/ComboCounter.cs +++ b/osu.Game/GameModes/Play/ComboCounter.cs @@ -205,8 +205,13 @@ namespace osu.Game.GameModes.Play private void updateCount(ulong value, bool rolling = false) { - ulong prevCount = count; count = value; + + if (!IsLoaded) + return; + + ulong prevCount = count; + if (!rolling) { Flush(false, typeof(TransformComboRoll)); diff --git a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs index 8d1c6d5b57..0a087225fc 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaComboCounter.cs @@ -31,9 +31,9 @@ namespace osu.Game.GameModes.Play.Mania protected override float PopOutInitialAlpha => 1.0f; protected override double PopOutDuration => 300; - protected override void Load(BaseGame game) + protected override void LoadComplete() { - base.Load(game); + base.LoadComplete(); PopOutSpriteText.Anchor = Anchor.BottomCentre; PopOutSpriteText.Origin = Anchor.Centre; diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs index af77093b34..87403c232a 100644 --- a/osu.Game/Graphics/UserInterface/RollingCounter.cs +++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs @@ -123,8 +123,6 @@ namespace osu.Game.Graphics.UserInterface { base.Load(game); - Flush(false, TransformType); - DisplayedCount = Count; DisplayedCountSpriteText.Text = FormatCount(count); @@ -132,6 +130,13 @@ namespace osu.Game.Graphics.UserInterface DisplayedCountSpriteText.Origin = this.Origin; } + protected override void LoadComplete() + { + base.LoadComplete(); + + Flush(false, TransformType); + } + /// /// Sets count value, bypassing rollover animation. /// diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs index e56e699be9..47385861ab 100644 --- a/osu.Game/Graphics/UserInterface/StarCounter.cs +++ b/osu.Game/Graphics/UserInterface/StarCounter.cs @@ -70,14 +70,16 @@ namespace osu.Game.Graphics.UserInterface { return count; } + set { - prevCount = VisibleValue; - count = value; if (IsLoaded) { - transformCount(prevCount, count); + prevCount = VisibleValue; + transformCount(prevCount, value); } + + count = value; } } diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs index c72ddeede3..bcd1d9f8db 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs @@ -57,9 +57,9 @@ namespace osu.Game.Graphics.UserInterface.Volume }; } - protected override void Load(BaseGame game) + protected override void LoadComplete() { - base.Load(game); + base.LoadComplete(); updateFill(); }