added TextColorTween. also added new delay feature to tweeners

coderDarren · coderDarren · commit 9ed34a828123 · 2020-02-29T10:45:51.000-05:00
diff --git a/Tween/ColorTween.cs b/Tween/ColorTween.cs
@@ -13,6 +13,7 @@ public abstract class ColorTween : MonoBehaviour
 
         public Keyframe<Color>[] keys;
         public float duration;
+        public float delay;
         public bool wrap;
         public bool runOnEnable=true;
 
@@ -41,7 +42,7 @@ public void StopTween() {
 
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<Color>(keys, duration, wrap);
+            m_Tween = new Tweener<Color>(keys, duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
diff --git a/Tween/FloatTween.cs b/Tween/FloatTween.cs
@@ -13,6 +13,7 @@ public abstract class FloatTween : MonoBehaviour
 
         public Keyframe<float>[] keys;
         public float duration;
+        public float delay;
         public bool wrap;
 
         protected Tweener<float> m_Tween;
@@ -29,7 +30,7 @@ private void OnDisable() {
 
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<float>(keys, duration, wrap);
+            m_Tween = new Tweener<float>(keys, duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
diff --git a/Tween/TextColorTween.cs b/Tween/TextColorTween.cs
@@ -0,0 +1,29 @@
+﻿
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Tween {
+
+    [RequireComponent(typeof(Text))]
+    public class TextColorTween : ColorTween
+    {
+        private Text m_Text;
+
+#region Override Functions
+        protected override void Init() {
+            m_Text = GetComponent<Text>();
+            base.Init();
+        }
+
+        protected override void OnSetValue(Color _val) {
+            m_Text.color = _val;
+        }
+
+        protected override void OnMoveValue(Color _curr, Color _target, float _nTime) {
+            m_Text.color = Color.Lerp(_curr, _target, _nTime);
+        }
+#endregion
+
+    }
+
+}
diff --git a/Tween/Tweener.cs b/Tween/Tweener.cs
@@ -14,6 +14,7 @@ public class Tweener<T>
         
         private Keyframe<T>[] m_Keys;
         private float m_Duration;
+        private float m_Delay;
         private IEnumerator m_Loop;
         private int m_Index = -1;
         private bool m_Wrap;
@@ -25,9 +26,10 @@ public IEnumerator Loop {
         }
 
 #region Constructors
-        public Tweener(Keyframe<T>[] _keys, float _duration, bool _wrap) {
+        public Tweener(Keyframe<T>[] _keys, float _duration, float _delay, bool _wrap) {
             m_Keys = _keys;
             m_Duration = _duration;
+            m_Delay = _delay;
             m_Wrap = _wrap;
 
             if (m_Keys.Length > 0) {
@@ -38,6 +40,8 @@ public Tweener(Keyframe<T>[] _keys, float _duration, bool _wrap) {
 
 #region Private Functions
         private IEnumerator RunTween() {
+            yield return new WaitForSeconds(m_Delay);
+            
             var _key = GetNextKey();
             var _nextKey = GetNextKey();
             float _timer = 0;
diff --git a/Tween/Vector3Tween.cs b/Tween/Vector3Tween.cs
@@ -13,6 +13,7 @@ public abstract class Vector3Tween : MonoBehaviour
 
         public Keyframe<Vector3>[] keys;
         public float duration;
+        public float delay;
         public bool wrap;
 
         protected Tweener<Vector3> m_Tween;
@@ -29,7 +30,7 @@ private void OnDisable() {
 
 #region Override Functions
         protected virtual void Init() {
-            m_Tween = new Tweener<Vector3>(keys, duration, wrap);
+            m_Tween = new Tweener<Vector3>(keys, duration, delay, wrap);
             if (m_Tween.Loop != null) {
                 m_Tween.OnSetValue += OnSetValue;
                 m_Tween.OnMoveValue += OnMoveValue;
