diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 8f85c3d..3f14a85 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb index 4ef8d9e..ae2f0ab 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 8f85c3d..3f14a85 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb index 4ef8d9e..ae2f0ab 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 8f85c3d..3f14a85 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 4ef8d9e..ae2f0ab 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/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity index 5aae27c..3a8b96d 100644 Binary files a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity and b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs index 5eb7e7c..3e1bc4b 100644 --- a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.cs @@ -1,34 +1,20 @@ using DG.Tweening; -using DG.Tweening.Core; using UnityEngine; using UnityEngine.UI; using System.Collections; public class Temp : BrainBase { - public Transform target; - Vector3 orPos; + public Transform target, follow; void Start() { - orPos = target.position; - } - - void OnGUI() - { - if (GUILayout.Button("Default")) CreateTween(); - if (GUILayout.Button("0")) CreateTween(0); - if (GUILayout.Button("1")) CreateTween(1); - if (GUILayout.Button("2")) CreateTween(2); - if (GUILayout.Button("3")) CreateTween(3); - } - - void CreateTween(float amplitude = -1) - { - DOTween.KillAll(); - - target.position = orPos; - if (amplitude > 0) target.DOMoveX(3, 2).SetEase(Ease.OutElastic, amplitude); - else target.DOMoveX(3, 2).SetEase(Ease.OutElastic); + Tweener tween = target.DOMove(follow.position, 2f) + .SetEase(Ease.OutExpo); + + tween.OnUpdate(() => + { + tween.ChangeEndValue(follow.position, true); + }); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity index b07c140..8ccc218 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity and b/UnityTests.Unity5/Assets/_Tests/Bugs/Temp.unity differ diff --git a/_DOTween.Assembly/DOTween/Core/Enums/UpdateMode.cs b/_DOTween.Assembly/DOTween/Core/Enums/UpdateMode.cs index 9891295..8514a73 100644 --- a/_DOTween.Assembly/DOTween/Core/Enums/UpdateMode.cs +++ b/_DOTween.Assembly/DOTween/Core/Enums/UpdateMode.cs @@ -9,6 +9,7 @@ namespace DG.Tweening.Core.Enums internal enum UpdateMode { Update, - Goto // Treats update as a full goto, thus not calling eventual onStepComplete callbacks + Goto, // Treats update as a full goto, thus not calling eventual onStepComplete callbacks + IgnoreOnUpdate // Ignores OnUpdate callback (used when applying some ChangeValue during an OnUpdate call) } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 08de2a7..bf1a282 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -32,7 +32,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.0.660"; + public static readonly string Version = "1.0.665"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Tween.cs b/_DOTween.Assembly/DOTween/Tween.cs index bdd4f77..ec82e7e 100644 --- a/_DOTween.Assembly/DOTween/Tween.cs +++ b/_DOTween.Assembly/DOTween/Tween.cs @@ -234,7 +234,7 @@ namespace DG.Tweening if (t.ApplyTween(prevPosition, prevCompletedLoops, newCompletedSteps, useInversePosition, updateMode)) return true; // Additional callbacks - if (t.onUpdate != null) { + if (t.onUpdate != null && updateMode != UpdateMode.IgnoreOnUpdate) { OnTweenCallback(t.onUpdate); } if (t.position <= 0 && t.completedLoops <= 0 && !wasRewinded && t.onRewind != null) { diff --git a/_DOTween.Assembly/DOTween/Tweener.cs b/_DOTween.Assembly/DOTween/Tweener.cs index 0926904..d6aef42 100644 --- a/_DOTween.Assembly/DOTween/Tweener.cs +++ b/_DOTween.Assembly/DOTween/Tweener.cs @@ -170,7 +170,7 @@ namespace DG.Tweening } // Force rewind - DoGoto(t, 0, 0, UpdateMode.Goto); + DoGoto(t, 0, 0, UpdateMode.IgnoreOnUpdate); return t; } @@ -208,7 +208,7 @@ namespace DG.Tweening } // Force rewind - DoGoto(t, 0, 0, UpdateMode.Goto); + DoGoto(t, 0, 0, UpdateMode.IgnoreOnUpdate); return t; } @@ -235,7 +235,7 @@ namespace DG.Tweening } // Force rewind - DoGoto(t, 0, 0, UpdateMode.Goto); + DoGoto(t, 0, 0, UpdateMode.IgnoreOnUpdate); return t; } diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 8f85c3d..3f14a85 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 4ef8d9e..ae2f0ab 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ