diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index b11b8fa..90f9662 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 3cd59ca..2e063a6 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 957ead2..ca32acf 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 7c126ab..17dae9e 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 4a45bf8..1414b22 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 3010ca3..9ab61ed 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 9fd9862..0a0d0b3 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -12,23 +12,13 @@ using UnityEngine.UI; public class TempTests : BrainBase { public Transform target; - Tween myTween; - void Start() + public Transform rotTarget; + public Ease easeType = Ease.Linear; + + IEnumerator Start() { - myTween = target.DOMove(new Vector3(5, 5, 5), 25).SetAutoKill(false).SetUpdate(true); - } + yield return new WaitForSeconds(1); - void Update() - { - if (Input.GetKey(KeyCode.J)) - { - DOTween.timeScale -= 0.1f; - } - if (Input.GetKey(KeyCode.K)) - { - DOTween.timeScale += 0.1f; - } - - Debug.Log(DOTween.timeScale); + target.DORotateQuaternion(rotTarget.rotation, 2).SetEase(easeType); } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index c8e0219..0e29633 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/CustomPlugins/PureQuaternionPlugin.cs b/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs index 815774f..6f170e4 100644 --- a/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs +++ b/_DOTween.Assembly/DOTween/CustomPlugins/PureQuaternionPlugin.cs @@ -66,10 +66,11 @@ namespace DG.Tweening.CustomPlugins /// INTERNAL: do not use public override void SetChangeValue(TweenerCore t) { - t.changeValue.x = t.endValue.x - t.startValue.x; - t.changeValue.y = t.endValue.y - t.startValue.y; - t.changeValue.z = t.endValue.z - t.startValue.z; - t.changeValue.w = t.endValue.w - t.startValue.w; +// t.changeValue.x = t.endValue.x - t.startValue.x; +// t.changeValue.y = t.endValue.y - t.startValue.y; +// t.changeValue.z = t.endValue.z - t.startValue.z; +// t.changeValue.w = t.endValue.w - t.startValue.w; + t.changeValue = t.endValue; // Special case where changeValue is equal to endValue so it can be applied better } /// INTERNAL: do not use @@ -87,11 +88,12 @@ namespace DG.Tweening.CustomPlugins // * (t.sequenceParent.isComplete ? t.sequenceParent.completedLoops - 1 : t.sequenceParent.completedLoops); // } float easeVal = EaseManager.Evaluate(t.easeType, t.customEase, elapsed, duration, t.easeOvershootOrAmplitude, t.easePeriod); - startValue.x += changeValue.x * easeVal; - startValue.y += changeValue.y * easeVal; - startValue.z += changeValue.z * easeVal; - startValue.w += changeValue.w * easeVal; - setter(startValue); + setter(Quaternion.Slerp(startValue, changeValue, easeVal)); +// startValue.x += changeValue.x * easeVal; +// startValue.y += changeValue.y * easeVal; +// startValue.z += changeValue.z * easeVal; +// startValue.w += changeValue.w * easeVal; +// setter(startValue); } } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 3f11b5a..2c6fd63 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.2.226"; // Last version before modules: 1.1.755 + public static readonly string Version = "1.2.230"; // Last version before modules: 1.1.755 /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs index 6bbc575..441ba92 100644 --- a/_DOTween.Assembly/DOTween/ShortcutExtensions.cs +++ b/_DOTween.Assembly/DOTween/ShortcutExtensions.cs @@ -576,9 +576,9 @@ namespace DG.Tweening /// (neither for itself nor if placed inside a LoopType.Incremental Sequence) /// /// The end value to reachThe duration of the tween - public static TweenerCore DORotateQuaternion(this Transform target, Quaternion endValue, float duration) + public static TweenerCore DORotateQuaternion(this Transform target, Quaternion endValue, float duration) { - TweenerCore t = DOTween.To(PureQuaternionPlugin.Plug(), () => target.rotation, x => target.rotation = x, endValue, duration); + TweenerCore t = DOTween.To(PureQuaternionPlugin.Plug(), () => target.rotation, x => target.rotation = x, endValue, duration); t.SetTarget(target); return t; } diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index b11b8fa..90f9662 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 3cd59ca..2e063a6 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 957ead2..ca32acf 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 7c126ab..17dae9e 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 4a45bf8..1414b22 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 3010ca3..9ab61ed 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ