h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 19:27:24 +08:00
Code Issues Releases Wiki Activity

Perserve miss animation when followed by a hit at same frame

Browse Source
This commit is contained in:
Salman Ahmed 2023-12-05 21:57:53 +03:00
parent 986f4fa407
commit 20fd458fac
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Tests/Visual/Gameplay/TestSceneArgonHealthDisplay.cs
View File

@ -134,6 +134,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
AddUntilStep("wait for health", () => healthDisplay.Current.Value == 1);
AddStep("set half health", () => healthProcessor.Health.Value = 0.5f);
AddStep("apply miss and hit", () =>
{
applyMiss();
@ -141,7 +142,9 @@ namespace osu.Game.Tests.Visual.Gameplay
applyPerfectHit();
applyPerfectHit();
});
AddWaitStep("wait", 3);
AddStep("apply miss and cancel with hit", () =>
{
applyMiss();

21
osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
View File

@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play.HUD
};
}
private JudgementResult? pendingJudgementResult;
private bool pendingMissAnimation;
protected override void LoadComplete()
{
@ -171,7 +171,7 @@ namespace osu.Game.Screens.Play.HUD
BarHeight.BindValueChanged(_ => updatePath(), true);
}
private void onNewJudgement(JudgementResult result) => pendingJudgementResult = result;
private void onNewJudgement(JudgementResult result) => pendingMissAnimation |= !result.IsHit;
private void onCurrentChanged(ValueChangedEvent<double> valueChangedEvent)
// schedule display updates one frame later to ensure we know the judgement result causing this change (if there is one).
@ -179,22 +179,23 @@ namespace osu.Game.Screens.Play.HUD
private void updateDisplay()
{
var result = pendingJudgementResult;
double newHealth = Current.Value;
if (Current.Value >= GlowBarValue)
if (newHealth >= GlowBarValue)
finishMissDisplay();
double time = Current.Value > GlowBarValue ? 500 : 250;
double time = newHealth > GlowBarValue ? 500 : 250;
// TODO: this should probably use interpolation in update.
this.TransformTo(nameof(HealthBarValue), Current.Value, time, Easing.OutQuint);
this.TransformTo(nameof(HealthBarValue), newHealth, time, Easing.OutQuint);
if (result != null && !result.IsHit)
if (pendingMissAnimation && newHealth < GlowBarValue)
triggerMissDisplay();
else if (!displayingMiss)
this.TransformTo(nameof(GlowBarValue), Current.Value, time, Easing.OutQuint);
pendingJudgementResult = null;
pendingMissAnimation = false;
if (!displayingMiss)
this.TransformTo(nameof(GlowBarValue), newHealth, time, Easing.OutQuint);
}
protected override void Update()