From 761c50abac83f27ae4311e7d34d35881ea86ffc9 Mon Sep 17 00:00:00 2001 From: AndreevWezom Date: Mon, 13 Mar 2023 13:16:52 +0200 Subject: [PATCH] Refactor change particle system --- Scripts/UIParticleAttractor.cs | 43 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/Scripts/UIParticleAttractor.cs b/Scripts/UIParticleAttractor.cs index d961a07..f5a999d 100644 --- a/Scripts/UIParticleAttractor.cs +++ b/Scripts/UIParticleAttractor.cs @@ -81,19 +81,8 @@ namespace Coffee.UIExtensions set { m_ParticleSystem = value; - if (m_ParticleSystem == null) - { - Debug.LogError("No particle system attached to particle attractor script", this); - enabled = false; - return; - } - + if (!ApplyParticleSystem()) return; enabled = true; - _uiParticle = m_ParticleSystem.GetComponentInParent(); - if (_uiParticle && !_uiParticle.particles.Contains(m_ParticleSystem)) - { - _uiParticle = null; - } } } @@ -101,18 +90,7 @@ namespace Coffee.UIExtensions private void OnEnable() { - if (m_ParticleSystem == null) - { - Debug.LogError("No particle system attached to particle attractor script", this); - enabled = false; - return; - } - - _uiParticle = m_ParticleSystem.GetComponentInParent(); - if (_uiParticle && !_uiParticle.particles.Contains(m_ParticleSystem)) - { - _uiParticle = null; - } + if (!ApplyParticleSystem()) return; UIParticleUpdater.Register(this); } @@ -225,5 +203,22 @@ namespace Coffee.UIExtensions return Vector3.MoveTowards(current, target, speed); } + private bool ApplyParticleSystem() + { + if (m_ParticleSystem == null) + { + Debug.LogError("No particle system attached to particle attractor script", this); + enabled = false; + return false; + } + + _uiParticle = m_ParticleSystem.GetComponentInParent(); + if (_uiParticle && !_uiParticle.particles.Contains(m_ParticleSystem)) + { + _uiParticle = null; + } + + return true; + } } } \ No newline at end of file