diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 703f831..efd87aa 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 baab8c6..9f9072f 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 703f831..efd87aa 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 baab8c6..9f9072f 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 703f831..efd87aa 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 baab8c6..9f9072f 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/Bugs/NamedParameters.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/NamedParameters.unity index 36b96d2..5b0cca3 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/Bugs/NamedParameters.unity and b/UnityTests.Unity5/Assets/_Tests/Bugs/NamedParameters.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.cs b/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.cs index d5bc29c..368faa3 100644 --- a/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.cs +++ b/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.cs @@ -1,29 +1,28 @@ using UnityEngine; using System.Collections; using DG.Tweening; +using DG.Tweening.Core; public class NestedSequencesCallbacks : BrainBase { - public Transform target; - int count; + public float[] durations = new[] { + 0.2f, 0.2f, 5.16f, 3f, 0.4f + }; void Start() { - int loops = 10; - DOTween.Sequence() - // .Append(DOTween.Sequence() - // .InsertCallback(0.0000001f, ()=> Debug.Log("Nested Sequence callback")) - // // .AppendInterval(0.5f) - // .SetLoops(10) - // ) - .Append( - target.DOMoveX(3, 0.0000001f) - .SetLoops(loops) - .OnStepComplete(()=> { - count++; - Debug.Log("Nested Tween callback " + count + "/" + loops); - }) - ) - .OnComplete(()=> Debug.Log("Sequence complete")); + Sequence timeline = DOTween.Sequence().OnComplete(()=> Debug.Log("timeline complete")); + DOGetter emptyGetter = () => 0; + DOSetter emptySetter = value => {}; + + int count = durations.Length; + for (int i = 0; i < count; ++i) { + int id = i; + float duration = durations[i]; + timeline.Append( + DOTween.To(emptyGetter, emptySetter, 0, duration) + .OnComplete(()=> Debug.Log(string.Format("step {0}/{1} ({2})", id, (count - 1), duration))) + ); + } } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.unity b/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.unity index e9848db..eb35c07 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.unity and b/UnityTests.Unity5/Assets/_Tests/Bugs/NestedSequencesCallbacks.unity differ diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 80630b2..0eee64c 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.630"; + public static readonly string Version = "1.0.635"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Sequence.cs b/_DOTween.Assembly/DOTween/Sequence.cs index 4a1230c..e2530cb 100644 --- a/_DOTween.Assembly/DOTween/Sequence.cs +++ b/_DOTween.Assembly/DOTween/Sequence.cs @@ -249,7 +249,8 @@ namespace DG.Tweening } } else { // Nested Tweener/Sequence - float gotoPos = toPos - sequentiable.sequencedPosition; +// float gotoPos = toPos - sequentiable.sequencedPosition; + float gotoPos = (float)((decimal)toPos - (decimal)sequentiable.sequencedPosition); if (gotoPos < 0) gotoPos = 0; Tween t = (Tween)sequentiable; if (!t.startupDone) continue; // since we're going backwards and this tween never started just ignore it @@ -285,7 +286,8 @@ namespace DG.Tweening } } else { // Nested Tweener/Sequence - float gotoPos = toPos - sequentiable.sequencedPosition; +// float gotoPos = toPos - sequentiable.sequencedPosition; + float gotoPos = (float)((decimal)toPos - (decimal)sequentiable.sequencedPosition); if (gotoPos < 0) gotoPos = 0; Tween t = (Tween)sequentiable; t.isBackwards = false; diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 703f831..efd87aa 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 baab8c6..9f9072f 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ