From 8e26b3c4051762e9a4c9f4624b0b5babe14145e2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 10 Oct 2023 15:09:33 +0900 Subject: [PATCH 1/3] Fix argon health bar not completing flash animation correctly --- osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs index aa3b6c1f41..4c63479d3d 100644 --- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs +++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs @@ -221,6 +221,9 @@ namespace osu.Game.Screens.Play.HUD private void finishMissDisplay() { + if (resetMissBarDelegate == null) + return; + if (Current.Value > 0) { glowBar.TransformTo(nameof(BarPath.BarColour), main_bar_colour, 300, Easing.In); From aeb579eb54b0371682b5fd2ec5146ed56c2e5ee2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 10 Oct 2023 15:10:27 +0900 Subject: [PATCH 2/3] Syncrhonise initial colour of `glowBar` for sanity --- osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs index 4c63479d3d..2a42023f83 100644 --- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs +++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs @@ -15,7 +15,6 @@ using osu.Framework.Layout; using osu.Framework.Threading; using osu.Framework.Utils; using osu.Game.Configuration; -using osu.Game.Graphics; using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects.Types; @@ -114,7 +113,7 @@ namespace osu.Game.Screens.Play.HUD glowBar = new BarPath { BarColour = Color4.White, - GlowColour = OsuColour.Gray(0.5f), + GlowColour = main_bar_glow_colour, Blending = BlendingParameters.Additive, Colour = ColourInfo.GradientHorizontal(Color4.White.Opacity(0.8f), Color4.White), PathRadius = 40f, From 6ee958743e29bf5ad59f355a20f512fe116e6319 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 10 Oct 2023 15:10:42 +0900 Subject: [PATCH 3/3] Adjust glow animation specifics slightly --- osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs index 2a42023f83..a3a35999fa 100644 --- a/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs +++ b/osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs @@ -181,12 +181,13 @@ namespace osu.Game.Screens.Play.HUD if (resetMissBarDelegate == null) { - glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 100, Easing.OutQuint) + glowBar.TransformTo(nameof(BarPath.BarColour), Colour4.White, 30, Easing.OutQuint) .Then() - .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 800, Easing.OutQuint); + .TransformTo(nameof(BarPath.BarColour), main_bar_colour, 1000, Easing.OutQuint); - glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White) - .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 800, Easing.OutQuint); + glowBar.TransformTo(nameof(BarPath.GlowColour), Colour4.White, 30, Easing.OutQuint) + .Then() + .TransformTo(nameof(BarPath.GlowColour), main_bar_glow_colour, 300, Easing.OutQuint); } }