diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index ae70c82..61c197b 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 2f877db..f62a353 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 ae70c82..61c197b 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 2f877db..f62a353 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 ae70c82..61c197b 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 2f877db..f62a353 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/Jump.cs b/UnityTests.Unity5/Assets/_Tests/Jump.cs index f159c22..e85e9de 100644 --- a/UnityTests.Unity5/Assets/_Tests/Jump.cs +++ b/UnityTests.Unity5/Assets/_Tests/Jump.cs @@ -16,6 +16,6 @@ public class Jump : BrainBase { yield return new WaitForSeconds(1); - target.DOJump(jump, jumpHeight, numJumps, duration).SetEase(ease).SetLoops(loops, LoopType.Yoyo); + target.DOJump(jump, jumpHeight, numJumps, duration).SetEase(ease).SetLoops(loops, LoopType.Yoyo).SetRelative(); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/Jump.unity b/UnityTests.Unity5/Assets/_Tests/Jump.unity index 5f1dd1e..2950112 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/Jump.unity and b/UnityTests.Unity5/Assets/_Tests/Jump.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 15a171a..7682932 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -7,15 +7,17 @@ using DG.Tweening.Core; using UnityEngine; using UnityEngine.UI; -public class TempTests : MonoBehaviour +public class TempTests : BrainBase { - public bool straightFixedUpdate; + public Transform trans; + public Renderer rend; IEnumerator Start() { yield return new WaitForSeconds(1); - Tween t = transform.DORotate(new Vector3(0, 180, 0), 2).OnComplete(()=> Debug.Log("Complete")); - if (straightFixedUpdate) t.SetUpdate(UpdateType.Fixed); + DOTween.Sequence() + .Append(rend.material.DOFade(0, 0.5f)) + .Append(rend.material.DOFade(1, 1f)); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 4bd4421..5d29633 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/TempTests.unity and b/UnityTests.Unity5/Assets/_Tests/TempTests.unity differ diff --git a/_DOTween.Assembly/DOTween/Sequence.cs b/_DOTween.Assembly/DOTween/Sequence.cs index 6a55400..de03ac4 100644 --- a/_DOTween.Assembly/DOTween/Sequence.cs +++ b/_DOTween.Assembly/DOTween/Sequence.cs @@ -163,6 +163,12 @@ namespace DG.Tweening s.fullDuration = s.loops > -1 ? s.duration * s.loops : Mathf.Infinity; // Order sequencedObjs by start position s._sequencedObjs.Sort(SortSequencedObjs); + // Set relative nested tweens + if (s.isRelative) { + for (int len = s.sequencedTweens.Count, i = 0; i < len; ++i) { + s.sequencedTweens[i].isRelative = true; + } + } return true; } diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index ae70c82..61c197b 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 2f877db..f62a353 100644 Binary files a/_DOTween.Assembly/bin/DOTween.dll.mdb and b/_DOTween.Assembly/bin/DOTween.dll.mdb differ