feat(Effects): Improve fade object

Author: jcs090218

Assets/JCSUnity/Scripts/Effects/JCS_FadeObject.cs

@@ -19,13 +19,23 @@ public class JCS_FadeObject : JCS_UnityObject
     {
         /* Variables */
 
-        public Action onFadeOut = null;
-        public Action onFadeIn = null;
+        // Execution after its done fading.
+        public Action onAfterFade = null;
+        public Action onAfterFadeOut = null;
+        public Action onAfterFadeIn = null;
 
+        // Exectuion before start fading.
+        public Action onBeforeFade = null;
+        public Action onBeforeFadeIn = null;
+        public Action onBeforeFadeOut = null;
+
+        // Execution while fading.
         public Action<float> onFading = null;
 
+        // The current fade type.
         private JCS_FadeType mFadeType = JCS_FadeType.IN;  // defaul as visible
 
+        // Hold the alpha value.
         private float mAlpha = 1.0f;
 
 #if UNITY_EDITOR
@@ -144,15 +154,35 @@ public bool IsFadeOut()
             return (this.mAlpha <= mFadeOutAmount);
         }
 
-        public void FadeOut() { FadeOut(mFadeTime); }
-        public void FadeIn() { FadeIn(mFadeTime); }
-        public void FadeOut(float time) { FadeEffect(JCS_FadeType.OUT, time); }
-        public void FadeIn(float time) { this.FadeEffect(JCS_FadeType.IN, time); }
+        /// <summary>
+        /// Fade out.
+        /// </summary>
+        public void FadeOut()
+        {
+            FadeOut(mFadeTime);
+        }
+        public void FadeOut(float time)
+        {
+            FadeEffect(JCS_FadeType.OUT, time);
+        }
 
         /// <summary>
-        /// Default function to point to, 
-        /// prevent null reference exception.
-        /// to save check null pointer performance.
+        /// Fade in.
+        /// </summary>
+        public void FadeIn()
+        {
+            FadeIn(mFadeTime);
+        }
+        public void FadeIn(float time)
+        {
+            FadeEffect(JCS_FadeType.IN, time);
+        }
+
+        /// <summary>
+        /// Default function to point to, prevent null 
+        /// reference exception.
+        /// 
+        /// To save check null pointer performance.
         /// </summary>
         public static void DefaultFadeCallback()
         {
@@ -183,19 +213,25 @@ private void FadeEffect(JCS_FadeType type, float time)
                     {
                         mAlpha = mFadeInAmount;
                         this.mVisible = false;
+
+                        onBeforeFadeOut?.Invoke();
                     }
                     break;
                 case JCS_FadeType.IN:
                     {
                         mAlpha = mFadeOutAmount;
                         this.mVisible = true;
+
+                        onBeforeFadeIn?.Invoke();
                     }
                     break;
             }
 
             this.mFadeTime = time;
             this.mFadeType = type;
             this.mEffect = true;
+
+            onBeforeFade?.Invoke();
         }
 
         /// <summary>
@@ -221,8 +257,11 @@ private void DoFade()
 
                             mEffect = false;
 
-                            // do fade out callback
-                            onFadeOut?.Invoke();
+                            // do callback
+                            {
+                                onAfterFadeOut?.Invoke();
+                                onAfterFade?.Invoke();
+                            }
 
                             return;
                         }
@@ -238,8 +277,11 @@ private void DoFade()
                         {
                             mEffect = false;
 
-                            // do fade in callback
-                            onFadeIn?.Invoke();
+                            // do callback
+                            {
+                                onAfterFadeIn?.Invoke();
+                                onAfterFade?.Invoke();
+                            }
 
                             return;
                         }

Assets/JCSUnity/Scripts/UI/InGameLogSystem/JCS_LogText.cs

@@ -53,7 +53,7 @@ private void Awake()
             // set the fade out call back,  so we active from pool, and check
             // to see if the object is fade out complete. if is complete set
             // the active to false (return to pool).
-            mFadeObject.onFadeOut = OnFadeOut;
+            mFadeObject.onAfterFadeOut = OnFadeOut;
         }
 
         /// <summary>