h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:42:55 +08:00
Code Issues Releases Wiki Activity

Remove hit explosion on revert result

Browse Source
This commit is contained in:
ekrctb 2020-12-08 15:43:17 +09:00
parent 1a66d8f2bc
commit 02571ec7ae
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/UI/Catcher.cs
View File

@ -258,6 +258,7 @@ namespace osu.Game.Rulesets.Catch.UI
caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject); caughtFruitContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
droppedObjectTarget.RemoveAll(d => (d as DrawableCatchHitObject)?.HitObject == drawableObject.HitObject); droppedObjectTarget.RemoveAll(d => (d as DrawableCatchHitObject)?.HitObject == drawableObject.HitObject);
hitExplosionContainer.RemoveAll(d => d.HitObject == drawableObject.HitObject);
} }
/// <summary> /// <summary>
@ -489,6 +490,7 @@ namespace osu.Game.Rulesets.Catch.UI
if (!hitLighting.Value) return; if (!hitLighting.Value) return;
HitExplosion hitExplosion = hitExplosionPool.Get(); HitExplosion hitExplosion = hitExplosionPool.Get();
hitExplosion.HitObject = caughtObject.HitObject;
hitExplosion.X = caughtObject.X; hitExplosion.X = caughtObject.X;
hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale); hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale);
hitExplosion.ObjectColour = caughtObject.AccentColour.Value; hitExplosion.ObjectColour = caughtObject.AccentColour.Value;

2
osu.Game.Rulesets.Catch/UI/HitExplosion.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects; using osu.Framework.Graphics.Effects;
using osu.Framework.Graphics.Pooling; using osu.Framework.Graphics.Pooling;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Rulesets.Catch.Objects;
using osuTK; using osuTK;
using osuTK.Graphics; using osuTK.Graphics;
@ -15,6 +16,7 @@ namespace osu.Game.Rulesets.Catch.UI
public class HitExplosion : PoolableDrawable public class HitExplosion : PoolableDrawable
{ {
private Color4 objectColour; private Color4 objectColour;
public CatchHitObject HitObject;
public Color4 ObjectColour public Color4 ObjectColour
{ {