SetLink: added CompleteOnDisable, CompleteAndKillOnDisable, RewindOnDisable, RewindAndKillOnDisable

UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML

@@ -1004,6 +1004,18 @@
         <member name="F:DG.Tweening.LinkBehaviour.KillOnDestroy">
             <summary>Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen</summary>
         </member>
+        <member name="F:DG.Tweening.LinkBehaviour.CompleteOnDisable">
+            <summary>Completes the tween when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.CompleteAndKillOnDisable">
+            <summary>Completes and kills the tween when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.RewindOnDisable">
+            <summary>Rewinds the tween (delay excluded) when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.RewindAndKillOnDisable">
+            <summary>Rewinds and kills the tween when the link target is disabled</summary>
+        </member>
         <member name="T:DG.Tweening.PathMode">
             <summary>
             Path mode (used to determine correct LookAt orientation)

UnityTests.Unity5/Assets/_Tests/TempTests.cs

@@ -11,14 +11,17 @@ using UnityEngine.UI;
 
 public class TempTests : BrainBase
 {
-    public Transform target;
+    Tween _tScale, _tMove;
-    Tween t;
 
-    IEnumerator Start()
+    void Start()
     {
-        target.DOBlendablePunchRotation(new Vector3(120, 120, 120), 1);
+        _tScale = transform.DOScale(0.5f, 1).SetLoops(999);
-        yield return new WaitForSeconds(0.3f);
+        _tMove = transform.DOMoveX(2, 1).SetLoops(999);
-        Debug.Log(target.eulerAngles);
+    }
-        target.DOBlendablePunchRotation(new Vector3(200, 200, 200), 1);
+
+    void OnDisable()
+    {
+        _tScale.Complete();
+        _tMove.Complete();
     }
 }

_DOTween.Assembly/DOTween/Core/TweenManager.cs

@@ -944,7 +944,7 @@ namespace DG.Tweening.Core
             if (!_TweenLinks.TryGetValue(t, out tLink)) return;
 
             if (tLink.target == null) {
-                t.active = false;
+                t.active = false; // Will be killed by rest of Update loop
             } else {
                 bool goActive = tLink.target.activeInHierarchy;
                 bool justEnabled = !tLink.lastSeenActive && goActive;
@@ -954,6 +954,22 @@ namespace DG.Tweening.Core
                 case LinkBehaviour.KillOnDisable:
                     if (!goActive) t.active = false; // Will be killed by rest of Update loop
                     break;
+                case LinkBehaviour.CompleteAndKillOnDisable:
+                    if (goActive) break;
+                    if (!t.isComplete) t.Complete();
+                    t.active = false; // Will be killed by rest of Update loop
+                    break;
+                case LinkBehaviour.RewindAndKillOnDisable:
+                    if (goActive) break;
+                    t.Rewind(false);
+                    t.active = false; // Will be killed by rest of Update loop
+                    break;
+                case LinkBehaviour.CompleteOnDisable:
+                    if (justDisabled && !t.isComplete) t.Complete();
+                    break;
+                case LinkBehaviour.RewindOnDisable:
+                    if (justDisabled) t.Rewind(false);
+                    break;
                 case LinkBehaviour.PauseOnDisable:
                     if (justDisabled && t.isPlaying) Pause(t);
                     break;

_DOTween.Assembly/DOTween/DOTween.cs

@@ -34,7 +34,7 @@ namespace DG.Tweening
     public class DOTween
     {
         /// <summary>DOTween's version</summary>
-        public static readonly string Version = "1.2.283"; // Last version before modules: 1.1.755
+        public static readonly string Version = "1.2.290"; // Last version before modules: 1.1.755
 
         ///////////////////////////////////////////////
         // Options ////////////////////////////////////

_DOTween.Assembly/DOTween/LinkBehaviour.cs

@@ -24,5 +24,13 @@ namespace DG.Tweening
         KillOnDisable,
         /// <summary>Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen</summary>
         KillOnDestroy,
+        /// <summary>Completes the tween when the link target is disabled</summary>
+        CompleteOnDisable,
+        /// <summary>Completes and kills the tween when the link target is disabled</summary>
+        CompleteAndKillOnDisable,
+        /// <summary>Rewinds the tween (delay excluded) when the link target is disabled</summary>
+        RewindOnDisable,
+        /// <summary>Rewinds and kills the tween when the link target is disabled</summary>
+        RewindAndKillOnDisable,
     }
 }

_DOTween.Assembly/bin/DOTween.XML

@@ -1004,6 +1004,18 @@
         <member name="F:DG.Tweening.LinkBehaviour.KillOnDestroy">
             <summary>Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen</summary>
         </member>
+        <member name="F:DG.Tweening.LinkBehaviour.CompleteOnDisable">
+            <summary>Completes the tween when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.CompleteAndKillOnDisable">
+            <summary>Completes and kills the tween when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.RewindOnDisable">
+            <summary>Rewinds the tween (delay excluded) when the link target is disabled</summary>
+        </member>
+        <member name="F:DG.Tweening.LinkBehaviour.RewindAndKillOnDisable">
+            <summary>Rewinds and kills the tween when the link target is disabled</summary>
+        </member>
         <member name="T:DG.Tweening.PathMode">
             <summary>
             Path mode (used to determine correct LookAt orientation)