mirror of
https://github.com/ppy/osu.git
synced 2024-12-24 10:43:06 +08:00
812a4b412a
Previously, some judgement results were not reverted when the source DHO is not alive (e.g. frames skipped in editor). Now, all results are reverted in the exact reverse order.
81 lines
2.5 KiB
C#
81 lines
2.5 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Graphics;
|
|
using osu.Game.Rulesets.Catch.Objects.Drawables;
|
|
using osu.Game.Rulesets.Judgements;
|
|
using osu.Game.Rulesets.Scoring;
|
|
using osu.Game.Screens.Play;
|
|
using osu.Game.Skinning;
|
|
using osuTK.Graphics;
|
|
|
|
namespace osu.Game.Rulesets.Catch.UI
|
|
{
|
|
/// <summary>
|
|
/// Represents a component that displays a skinned <see cref="ICatchComboCounter"/> and handles combo judgement results for updating it accordingly.
|
|
/// </summary>
|
|
public partial class CatchComboDisplay : SkinnableDrawable
|
|
{
|
|
private int currentCombo;
|
|
|
|
public ICatchComboCounter? ComboCounter => Drawable as ICatchComboCounter;
|
|
|
|
private readonly IBindable<bool> showCombo = new BindableBool(true);
|
|
|
|
public CatchComboDisplay()
|
|
: base(new CatchSkinComponentLookup(CatchSkinComponents.CatchComboCounter), _ => Empty())
|
|
{
|
|
}
|
|
|
|
[Resolved]
|
|
private Player? player { get; set; }
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
|
|
if (player != null)
|
|
{
|
|
showCombo.BindTo(player.ShowingOverlayComponents);
|
|
showCombo.BindValueChanged(s => this.FadeTo(s.NewValue ? 1 : 0, HUDOverlay.FADE_DURATION, HUDOverlay.FADE_EASING), true);
|
|
}
|
|
}
|
|
|
|
protected override void SkinChanged(ISkinSource skin)
|
|
{
|
|
base.SkinChanged(skin);
|
|
ComboCounter?.UpdateCombo(currentCombo);
|
|
}
|
|
|
|
public void OnNewResult(DrawableCatchHitObject judgedObject, JudgementResult result)
|
|
{
|
|
if (!result.Type.AffectsCombo() || !result.HasResult)
|
|
return;
|
|
|
|
if (!result.IsHit)
|
|
{
|
|
updateCombo(0, null);
|
|
return;
|
|
}
|
|
|
|
updateCombo(result.ComboAtJudgement + 1, judgedObject.AccentColour.Value);
|
|
}
|
|
|
|
public void OnRevertResult(JudgementResult result)
|
|
{
|
|
if (!result.Type.AffectsCombo() || !result.HasResult)
|
|
return;
|
|
|
|
updateCombo(result.ComboAtJudgement, null);
|
|
}
|
|
|
|
private void updateCombo(int newCombo, Color4? hitObjectColour)
|
|
{
|
|
currentCombo = newCombo;
|
|
ComboCounter?.UpdateCombo(newCombo, hitObjectColour);
|
|
}
|
|
}
|
|
}
|