Commit 9ed34a8

committed

added TextColorTween. also added new delay feature to tweeners

1 parent 9f71904 commit 9ed34a8Copy full SHA for 9ed34a8

File tree

+40

-4

lines changed

+40

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public abstract class ColorTween : MonoBehaviour`
`13`	`13`
`14`	`14`	`public Keyframe<Color>[] keys;`
`15`	`15`	`public float duration;`
	`16`	`+ public float delay;`
`16`	`17`	`public bool wrap;`
`17`	`18`	`public bool runOnEnable=true;`
`18`	`19`
`@@ -41,7 +42,7 @@ public void StopTween() {`
`41`	`42`
`42`	`43`	`#region Override Functions`
`43`	`44`	`protected virtual void Init() {`
`44`		`- m_Tween = new Tweener<Color>(keys, duration, wrap);`
	`45`	`+ m_Tween = new Tweener<Color>(keys, duration, delay,wrap);`
`45`	`46`	`if (m_Tween.Loop != null) {`
`46`	`47`	`m_Tween.OnSetValue += OnSetValue;`
`47`	`48`	`m_Tween.OnMoveValue += OnMoveValue;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public abstract class FloatTween : MonoBehaviour`
`13`	`13`
`14`	`14`	`public Keyframe<float>[] keys;`
`15`	`15`	`public float duration;`
	`16`	`+ public float delay;`
`16`	`17`	`public bool wrap;`
`17`	`18`
`18`	`19`	`protected Tweener<float> m_Tween;`
`@@ -29,7 +30,7 @@ private void OnDisable() {`
`29`	`30`
`30`	`31`	`#region Override Functions`
`31`	`32`	`protected virtual void Init() {`
`32`		`- m_Tween = new Tweener<float>(keys, duration, wrap);`
	`33`	`+ m_Tween = new Tweener<float>(keys, duration, delay,wrap);`
`33`	`34`	`if (m_Tween.Loop != null) {`
`34`	`35`	`m_Tween.OnSetValue += OnSetValue;`
`35`	`36`	`m_Tween.OnMoveValue += OnMoveValue;`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+`
	`2`	`+using UnityEngine;`
	`3`	`+using UnityEngine.UI;`
	`4`	`+`
	`5`	`+namespace Tween {`
	`6`	`+`
	`7`	`+ [RequireComponent(typeof(Text))]`
	`8`	`+ public class TextColorTween : ColorTween`
	`9`	`+ {`
	`10`	`+ private Text m_Text;`
	`11`	`+`
	`12`	`+#region Override Functions`
	`13`	`+ protected override void Init() {`
	`14`	`+ m_Text = GetComponent<Text>();`
	`15`	`+ base.Init();`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ protected override void OnSetValue(Color _val) {`
	`19`	`+ m_Text.color = _val;`
	`20`	`+ }`
	`21`	`+`
	`22`	`+ protected override void OnMoveValue(Color _curr, Color _target, float _nTime) {`
	`23`	`+ m_Text.color = Color.Lerp(_curr, _target, _nTime);`
	`24`	`+ }`
	`25`	`+#endregion`
	`26`	`+`
	`27`	`+ }`
	`28`	`+`
	`29`	`+}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public class Tweener<T>`
`14`	`14`
`15`	`15`	`private Keyframe<T>[] m_Keys;`
`16`	`16`	`private float m_Duration;`
	`17`	`+ private float m_Delay;`
`17`	`18`	`private IEnumerator m_Loop;`
`18`	`19`	`private int m_Index = -1;`
`19`	`20`	`private bool m_Wrap;`
`@@ -25,9 +26,10 @@ public IEnumerator Loop {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`#region Constructors`
`28`		`- public Tweener(Keyframe<T>[] _keys, float _duration, bool _wrap) {`
	`29`	`+ public Tweener(Keyframe<T>[] _keys, float _duration, float_delay,bool _wrap) {`
`29`	`30`	`m_Keys = _keys;`
`30`	`31`	`m_Duration = _duration;`
	`32`	`+ m_Delay = _delay;`
`31`	`33`	`m_Wrap = _wrap;`
`32`	`34`
`33`	`35`	`if (m_Keys.Length > 0) {`
`@@ -38,6 +40,8 @@ public Tweener(Keyframe<T>[] _keys, float _duration, bool _wrap) {`
`38`	`40`
`39`	`41`	`#region Private Functions`
`40`	`42`	`private IEnumerator RunTween() {`
	`43`	`+ yield return new WaitForSeconds(m_Delay);`
	`44`	`+`
`41`	`45`	`var _key = GetNextKey();`
`42`	`46`	`var _nextKey = GetNextKey();`
`43`	`47`	`float _timer = 0;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public abstract class Vector3Tween : MonoBehaviour`
`13`	`13`
`14`	`14`	`public Keyframe<Vector3>[] keys;`
`15`	`15`	`public float duration;`
	`16`	`+ public float delay;`
`16`	`17`	`public bool wrap;`
`17`	`18`
`18`	`19`	`protected Tweener<Vector3> m_Tween;`
`@@ -29,7 +30,7 @@ private void OnDisable() {`
`29`	`30`
`30`	`31`	`#region Override Functions`
`31`	`32`	`protected virtual void Init() {`
`32`		`- m_Tween = new Tweener<Vector3>(keys, duration, wrap);`
	`33`	`+ m_Tween = new Tweener<Vector3>(keys, duration, delay,wrap);`
`33`	`34`	`if (m_Tween.Loop != null) {`
`34`	`35`	`m_Tween.OnSetValue += OnSetValue;`
`35`	`36`	`m_Tween.OnMoveValue += OnMoveValue;`

Comments

(0)