h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 15:43:22 +08:00
Code Issues Releases Wiki Activity

Only apply custom editor overrides if hit animations is disabled

Browse Source
This commit is contained in:
Dean Herbert 2021-04-21 19:44:17 +09:00
parent f2824a222a
commit 0f70469d1c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
osu.Game.Rulesets.Osu/Edit/DrawableOsuEditRuleset.cs
View File

@ -3,8 +3,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.Osu.Objects.Drawables; using osu.Game.Rulesets.Osu.Objects.Drawables;
@ -27,8 +30,16 @@ namespace osu.Game.Rulesets.Osu.Edit
private class OsuEditPlayfield : OsuPlayfield private class OsuEditPlayfield : OsuPlayfield
{ {
private Bindable<bool> hitAnimations;
protected override GameplayCursorContainer CreateCursor() => null; protected override GameplayCursorContainer CreateCursor() => null;
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
hitAnimations = config.GetBindable<bool>(OsuSetting.EditorHitAnimations);
}
protected override void OnNewDrawableHitObject(DrawableHitObject d) protected override void OnNewDrawableHitObject(DrawableHitObject d)
{ {
d.ApplyCustomUpdateState += updateState; d.ApplyCustomUpdateState += updateState;
@ -42,7 +53,7 @@ namespace osu.Game.Rulesets.Osu.Edit
private void updateState(DrawableHitObject hitObject, ArmedState state) private void updateState(DrawableHitObject hitObject, ArmedState state)
{ {
if (state == ArmedState.Idle) if (state == ArmedState.Idle || hitAnimations.Value)
return; return;
// adjust the visuals of certain object types to make them stay on screen for longer than usual. // adjust the visuals of certain object types to make them stay on screen for longer than usual.
@ -60,6 +71,15 @@ namespace osu.Game.Rulesets.Osu.Edit
circle.ApproachCircle circle.ApproachCircle
.FadeOutFromOne(editor_hit_object_fade_out_extension * 4) .FadeOutFromOne(editor_hit_object_fade_out_extension * 4)
.Expire(); .Expire();
circle.ApproachCircle.ScaleTo(1.1f, 300, Easing.OutQuint);
var circlePieceDrawable = circle.CirclePiece.Drawable;
// clear any explode animation logic.
circlePieceDrawable.ApplyTransformsAt(circle.HitStateUpdateTime, true);
circlePieceDrawable.ClearTransformsAfter(circle.HitStateUpdateTime, true);
break; break;
} }