diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index 9a9e868..9d179a7 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -1004,6 +1004,18 @@ Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen + + Completes the tween when the link target is disabled + + + Completes and kills the tween when the link target is disabled + + + Rewinds the tween (delay excluded) when the link target is disabled + + + Rewinds and kills the tween when the link target is disabled + Path mode (used to determine correct LookAt orientation) diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 06b4d42..6484221 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index 06f85be..46593ad 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index fbef1bb..b78b86d 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index 63d5dd7..5ab8116 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll index 6f1288a..b177fc3 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb index 5569b4d..584b30f 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index dd0d3a4..ba6e5f1 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -11,14 +11,17 @@ using UnityEngine.UI; public class TempTests : BrainBase { - public Transform target; - Tween t; + Tween _tScale, _tMove; - IEnumerator Start() + void Start() { - target.DOBlendablePunchRotation(new Vector3(120, 120, 120), 1); - yield return new WaitForSeconds(0.3f); - Debug.Log(target.eulerAngles); - target.DOBlendablePunchRotation(new Vector3(200, 200, 200), 1); + _tScale = transform.DOScale(0.5f, 1).SetLoops(999); + _tMove = transform.DOMoveX(2, 1).SetLoops(999); + } + + void OnDisable() + { + _tScale.Complete(); + _tMove.Complete(); } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Core/TweenManager.cs b/_DOTween.Assembly/DOTween/Core/TweenManager.cs index 50b5e69..332a684 100644 --- a/_DOTween.Assembly/DOTween/Core/TweenManager.cs +++ b/_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; diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 4341cd1..79a4be4 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -34,7 +34,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - 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 //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/LinkBehaviour.cs b/_DOTween.Assembly/DOTween/LinkBehaviour.cs index 1efb0ff..b31afbc 100644 --- a/_DOTween.Assembly/DOTween/LinkBehaviour.cs +++ b/_DOTween.Assembly/DOTween/LinkBehaviour.cs @@ -24,5 +24,13 @@ namespace DG.Tweening KillOnDisable, /// Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen KillOnDestroy, + /// Completes the tween when the link target is disabled + CompleteOnDisable, + /// Completes and kills the tween when the link target is disabled + CompleteAndKillOnDisable, + /// Rewinds the tween (delay excluded) when the link target is disabled + RewindOnDisable, + /// Rewinds and kills the tween when the link target is disabled + RewindAndKillOnDisable, } } \ No newline at end of file diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index 9a9e868..9d179a7 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -1004,6 +1004,18 @@ Kills the tween when the link target is destroyed (becomes NULL). This is always active even if another behaviour is chosen + + Completes the tween when the link target is disabled + + + Completes and kills the tween when the link target is disabled + + + Rewinds the tween (delay excluded) when the link target is disabled + + + Rewinds and kills the tween when the link target is disabled + Path mode (used to determine correct LookAt orientation) diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 06b4d42..6484221 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll and b/_DOTween.Assembly/bin/DOTween.dll differ diff --git a/_DOTween.Assembly/bin/DOTween.dll.mdb b/_DOTween.Assembly/bin/DOTween.dll.mdb index 06f85be..46593ad 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index fbef1bb..b78b86d 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb index 63d5dd7..5ab8116 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll index 6f1288a..b177fc3 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb index 5569b4d..584b30f 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ