fix(Events): improve enable/disable component event with time, no lon…

…ger with just behaviours
jcs090218 · Aug 26, 2022 · 0314b03 · 0314b03
1 parent dcf3008
commit 0314b03
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 16 deletions.
diff --git a/Assets/JCSUnity/Scripts/Events/Enable/JCS_DisableWithTimeEvent.cs b/Assets/JCSUnity/Scripts/Events/Enable/JCS_DisableWithTimeEvent.cs
@@ -12,7 +12,7 @@
 namespace JCSUnity
 {
     /// <summary>
-    /// Disable behaviours after a certain time.
+    /// Disable components after a certain time.
     /// </summary>
     public class JCS_DisableWithTimeEvent : MonoBehaviour
     {
@@ -22,9 +22,9 @@ public class JCS_DisableWithTimeEvent : MonoBehaviour
 
         [Header("** Runtime Variables (JCS_DisableWithTimeEvent) **")]
 
-        [Tooltip("Behaviours that take effect.")]
+        [Tooltip("Components that take effect.")]
         [SerializeField]
-        private List<Behaviour> mBehaviours = null;
+        private List<Component> mComponents = null;
 
         [Tooltip("Time before disable.")]
         [SerializeField]
@@ -33,7 +33,7 @@ public class JCS_DisableWithTimeEvent : MonoBehaviour
 
         /* Setter & Getter */
 
-        public List<Behaviour> Behaviours { get { return this.mBehaviours; } set { this.mBehaviours = value; } }
+        public List<Component> Components { get { return this.mComponents; } set { this.mComponents = value; } }
         public float time { get { return this.mTime; } set { this.mTime = value; } }
         public float timer { get { return this.mTimer; } set { this.mTimer = value; } }
 
@@ -49,8 +49,8 @@ private void Update()
                 mTimer = 0.0f;
 
                 // disable all components
-                foreach (var comp in mBehaviours)
-                    comp.enabled = false;
+                foreach (var comp in mComponents)
+                    JCS_Util.EnableComponent(comp, false);
             }
         }
     }

diff --git a/Assets/JCSUnity/Scripts/Events/Enable/JCS_EnableWithTimeEvent.cs b/Assets/JCSUnity/Scripts/Events/Enable/JCS_EnableWithTimeEvent.cs
@@ -12,7 +12,7 @@
 namespace JCSUnity
 {
     /// <summary>
-    /// Enable behaviours after a certain time.
+    /// Enable components after a certain time.
     /// </summary>
     public class JCS_EnableWithTimeEvent : MonoBehaviour
     {
@@ -22,9 +22,9 @@ public class JCS_EnableWithTimeEvent : MonoBehaviour
 
         [Header("** Runtime Variables (JCS_EnableWithTimeEvent) **")]
 
-        [Tooltip("Behaviours that take effect.")]
+        [Tooltip("Components that take effect.")]
         [SerializeField]
-        private List<Behaviour> mBehaviours = null;
+        private List<Component> mComponents = null;
 
         [Tooltip("Time before enable.")]
         [SerializeField]
@@ -33,7 +33,7 @@ public class JCS_EnableWithTimeEvent : MonoBehaviour
 
         /* Setter & Getter */
 
-        public List<Behaviour> Behaviours { get { return this.mBehaviours; } set { this.mBehaviours = value; } }
+        public List<Component> Components { get { return this.mComponents; } set { this.mComponents = value; } }
         public float time { get { return this.mTime; } set { this.mTime = value; } }
         public float timer { get { return this.mTimer; } set { this.mTimer = value; } }
 
@@ -49,8 +49,8 @@ private void Update()
                 mTimer = 0.0f;
 
                 // enable all components
-                foreach (var comp in mBehaviours)
-                    comp.enabled = true;
+                foreach (var comp in mComponents)
+                    JCS_Util.EnableComponent(comp, true);
             }
         }
     }

diff --git a/Assets/JCSUnity/Scripts/Util/JCS_Util.cs b/Assets/JCSUnity/Scripts/Util/JCS_Util.cs
@@ -39,6 +39,34 @@ namespace JCSUnity
     /// </summary>
     public static class JCS_Util
     {
+        /// <summary>
+        /// Do enable/distance component.
+        /// </summary>
+        /// <param name="comp"> Component reference you want to act. </param>
+        /// <param name="act"> Boolean to assign to enabled variable. </param>
+        public static void EnableComponent(Component comp, bool act)
+        {
+            /* Behaviour */
+            {
+                var behaviour = comp as Behaviour;
+                if (behaviour != null)
+                {
+                    behaviour.enabled = act;
+                    return;
+                }
+            }
+
+            /* Collider */
+            {
+                var collider = comp as Collider;
+                if (collider != null)
+                {
+                    collider.enabled = act;
+                    return;
+                }
+            }
+        }
+
         /// <summary>
         /// Spawn a gmae object.
         /// </summary>

diff --git a/docs/ScriptReference/Events/Enable/JCS_DisableWithTimeEvent.md b/docs/ScriptReference/Events/Enable/JCS_DisableWithTimeEvent.md
@@ -1,10 +1,10 @@
 # JCS_DisableWithTimeEvent
 
-Disable behaviours after a certain time.
+Disable components after a certain time.
 
 ## Variables
 
 | Name       | Description                          |
 |:-----------|:-------------------------------------|
-| Behaviours | Behaviours that take effect.         |
+| Components | Components that take effect.         |
 | time       | Time before inactive the gameobject. |
diff --git a/docs/ScriptReference/Events/Enable/JCS_EnableWithTimeEvent.md b/docs/ScriptReference/Events/Enable/JCS_EnableWithTimeEvent.md
@@ -1,10 +1,10 @@
 # JCS_EnableWithTimeEvent
 
-Enable behaviours after a certain time.
+Enable components after a certain time.
 
 ## Variables
 
 | Name       | Description                          |
 |:-----------|:-------------------------------------|
-| Behaviours | Behaviours that take effect.         |
+| Components | Components that take effect.         |
 | time       | Time before inactive the gameobject. |
diff --git a/docs/ScriptReference/Util/JCS_Util.md b/docs/ScriptReference/Util/JCS_Util.md
@@ -6,6 +6,7 @@ All code utility is stored here.
 
 | Name                                 | Description                                                                                       |
 |:-------------------------------------|:--------------------------------------------------------------------------------------------------|
+| EnableComponent                      | Do enable/distance component.                                                                     |
 | SpawnGameObject                      | Spawn a game object.                                                                              |
 | WithInRange                          | Check if the value is within the range.                                                           |
 | WithInArrayRange                     | Check if the index valid within the array length.&nbsp&nbsp(0 ~ (length - 1))                     |