diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index cc2064b..7107d23 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -2083,7 +2083,7 @@ The tween to prepend - Inserts the given tween at the same time position of the last tween added to the Sequence. + Inserts the given tween at the same time position of the last tween or callback added to the Sequence. Has no effect if the Sequence has already started diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index 869bbdd..a545bb9 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 20d3998..887502e 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/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll index 687e2ef..33c26ff 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 6c7e725..a70497f 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll index ad38203..93c6a92 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 7b5d0f8..dcd9622 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll index 521959e..37d1db0 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 4aeb906..6ed0cc6 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f7b7215..1595ec4 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index b85c449..5f2a378 100644 Binary files a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example.meta b/UnityExamples.Unity5/Assets/CustomPlugin Example.meta new file mode 100644 index 0000000..d1d4179 --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e6381fa2e1011ab40925fba50a01926e +folderAsset: yes +timeCreated: 1444386041 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity new file mode 100644 index 0000000..551861f Binary files /dev/null and b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity differ diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity.meta b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity.meta new file mode 100644 index 0000000..86a3f2f --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExample.unity.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: fe402d14dcffa8347be8e541d667ef7b +DefaultImporter: + userData: diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs new file mode 100644 index 0000000..8fbe005 --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs @@ -0,0 +1,27 @@ +using DG.Tweening; +using DG.Tweening.Plugins; +using UnityEngine; +using UnityEngine.UI; + +public class CustomPluginExampleBrain : MonoBehaviour +{ + public Text txtCustomRange ; // Used to show the custom range tween results + + CustomRange customRange = new CustomRange(0, 10); + + // Store the plugin so you won't have to instantiate it every time you use it + // (you can pass the same plugin instance to each tween, since they just do calculations and don't store data) + static CustomRangePlugin customRangePlugin = new CustomRangePlugin(); + + void Start() + { + // The difference with the regular generic way is simply + // that you have to pass the plugin to use as an additional first parameter + DOTween.To(customRangePlugin, () => customRange, x => customRange = x, new CustomRange(20, 100), 4); + } + + void Update() + { + txtCustomRange.text = customRange.min + "\n" + customRange.max; + } +} \ No newline at end of file diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs.meta b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs.meta new file mode 100644 index 0000000..ffa3dd2 --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomPluginExampleBrain.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 550efdefde1a031469b9f78b16066882 +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs new file mode 100644 index 0000000..e1962be --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs @@ -0,0 +1,20 @@ +public struct CustomRange +{ + public float min, max; + + public CustomRange(float min, float max) + { + this.min = min; + this.max = max; + } + + public static CustomRange operator +(CustomRange c1, CustomRange c2) + { + return new CustomRange(c1.min + c2.min, c1.max + c2.max); + } + + public static CustomRange operator -(CustomRange c1, CustomRange c2) + { + return new CustomRange(c1.min - c2.min, c1.max - c2.max); + } +} \ No newline at end of file diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs.meta b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs.meta new file mode 100644 index 0000000..9ecc930 --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRange.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 8c33f7a63008fad4eac4198a5417ad8c +timeCreated: 1444381777 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs new file mode 100644 index 0000000..b03be7e --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs @@ -0,0 +1,65 @@ +using DG.Tweening; +using DG.Tweening.Core; +using DG.Tweening.Core.Easing; +using DG.Tweening.Core.Enums; +using DG.Tweening.Plugins.Core; +using DG.Tweening.Plugins.Options; +using System; +using UnityEngine; + +/// +/// Custom DOTween plugin example. +/// This one tweens a CustomRange value, but you can also create plugins just to do weird stuff, other than to tween custom objects +/// +public class CustomRangePlugin : ABSTweenPlugin +{ + // Leave this empty + public override void Reset(TweenerCore t) {} + + // Sets the values in case of a From tween + public override void SetFrom(TweenerCore t, bool isRelative) + { + CustomRange prevEndVal = t.endValue; + t.endValue = t.getter(); + t.startValue = isRelative ? t.endValue + prevEndVal : prevEndVal; + t.setter(t.startValue); + } + + // Used by special plugins, just let it return the given value + public override CustomRange ConvertToStartValue(TweenerCore t, CustomRange value) + { + return value; + } + + // Determines the correct endValue in case this is a relative tween + public override void SetRelativeEndValue(TweenerCore t) + { + t.endValue = t.startValue + t.changeValue; + } + + // Sets the overall change value of the tween + public override void SetChangeValue(TweenerCore t) + { + t.changeValue = t.endValue - t.startValue; + } + + // Converts a regular duration to a speed-based duration + public override float GetSpeedBasedDuration(NoOptions options, float unitsXSecond, CustomRange changeValue) + { + // Not implemented in this case (but you could implement your own logic to convert duration to units x second) + return unitsXSecond; + } + + // Calculates the value based on the given time and ease + public override void EvaluateAndApply(NoOptions options, Tween t, bool isRelative, DOGetter getter, DOSetter setter, float elapsed, CustomRange startValue, CustomRange changeValue, float duration, bool usingInversePosition, UpdateNotice updateNotice) + { + CustomRange res = getter(); + float easeVal = EaseManager.Evaluate(t, elapsed, duration, t.easeOvershootOrAmplitude, t.easePeriod); + + // Here I use startValue directly because CustomRange a struct, so it won't reference the original. + // If CustomRange was a class, I should create a new one to pass to the setter + startValue.min += changeValue.min * easeVal; + startValue.max += changeValue.max * easeVal; + setter(startValue); + } +} \ No newline at end of file diff --git a/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs.meta b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs.meta new file mode 100644 index 0000000..29bff30 --- /dev/null +++ b/UnityExamples.Unity5/Assets/CustomPlugin Example/CustomRangePlugin.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b3ffdccaa6b21544baad840b4b779d25 +timeCreated: 1444382093 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML index acf3900..cc2064b 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -331,6 +331,14 @@ Example usage with lambda:x=> myProperty = x The end value to reachThe tween's duration + + Tweens a property or field to the given value using default plugins + A getter for the field or property to tween. + Example usage with lambda:()=> myProperty + A setter for the field or property to tween + Example usage with lambda:x=> myProperty = x + The end value to reachThe tween's duration + Tweens a property or field to the given value using default plugins A getter for the field or property to tween. @@ -554,6 +562,11 @@ Kills all tweens and returns the number of actual tweens killed If TRUE completes the tweens before killing them + + Kills all tweens and returns the number of actual tweens killed + If TRUE completes the tweens before killing them + Eventual IDs or targets to exclude from the killing + Kills all tweens with the given ID or target and returns the number of actual tweens killed If TRUE completes the tweens before killing them @@ -907,6 +920,9 @@ Methods that extend Tween objects and allow to control or get data from them + + Completes the tween + Completes the tween For Sequences only: if TRUE also internal Sequence callbacks will be fired, diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll index b4318d5..869bbdd 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb index 0241891..20d3998 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index ae9ab23..687e2ef 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 6efd44f..6c7e725 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.xml b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.xml index 2d78cb8..f0efe2b 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.xml +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween43.xml @@ -10,6 +10,20 @@ These, as all DOTween43 methods, require Unity 4.3 or later. + + Tweens a Material's color using the given gradient + (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener). + Also stores the image as the tween's target so it can be used for filtered operations + The gradient to useThe duration of the tween + + + Tweens a Material's named color property using the given gradient + (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener). + Also stores the image as the tween's target so it can be used for filtered operations + The gradient to use + The name of the material property to tween (like _Tint or _SpecColor) + The duration of the tween + Tweens a SpriteRenderer's color to the given value. Also stores the spriteRenderer as the tween's target so it can be used for filtered operations @@ -20,6 +34,12 @@ Also stores the spriteRenderer as the tween's target so it can be used for filtered operations The end value to reachThe duration of the tween + + Tweens a SpriteRenderer's color using the given gradient + (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener). + Also stores the image as the tween's target so it can be used for filtered operations + The gradient to useThe duration of the tween + Tweens a Rigidbody2D's position to the given value. Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations @@ -46,7 +66,8 @@ Tweens a Rigidbody2D's position to the given value, while also applying a jump effect along the Y axis. Returns a Sequence instead of a Tweener. - Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations + Also stores the Rigidbody2D as the tween's target so it can be used for filtered operations. + IMPORTANT: a rigidbody2D can't be animated in a jump arc using MovePosition, so the tween will directly set the position The end value to reach Power of the jump (the max height of the jump is represented by this plus the final Y offset) Total number of jumps diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index 1ea0496..ad38203 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index a587bcd..7b5d0f8 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.xml b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.xml index 8ba34f3..35ff34d 100644 --- a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.xml +++ b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween46.xml @@ -51,6 +51,12 @@ Also stores the image as the tween's target so it can be used for filtered operations The end value to reach (0 to 1)The duration of the tween + + Tweens an Image's colors using the given gradient + (NOTE 1: only uses the colors of the gradient, not the alphas - NOTE 2: creates a Sequence, not a Tweener). + Also stores the image as the tween's target so it can be used for filtered operations + The gradient to useThe duration of the tween + Tweens an LayoutElement's flexibleWidth/Height to the given value. Also stores the LayoutElement as the tween's target so it can be used for filtered operations @@ -90,6 +96,18 @@ The end value to reachThe duration of the tween If TRUE the tween will smoothly snap all values to integers + + Tweens a RectTransform's anchoredPosition X to the given value. + Also stores the RectTransform as the tween's target so it can be used for filtered operations + The end value to reachThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + + + Tweens a RectTransform's anchoredPosition Y to the given value. + Also stores the RectTransform as the tween's target so it can be used for filtered operations + The end value to reachThe duration of the tween + If TRUE the tween will smoothly snap all values to integers + Tweens a RectTransform's anchoredPosition3D to the given value. Also stores the RectTransform as the tween's target so it can be used for filtered operations diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index 6ba8f97..521959e 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index a4e8d35..4aeb906 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index 62df5e3..f7b7215 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index 1d1927d..b85c449 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.pdb b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.pdb index 0e5397e..22c2cba 100644 Binary files a/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.pdb and b/UnityExamples.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.pdb differ diff --git a/UnityExamples.Unity5/Assets/UGUI.cs b/UnityExamples.Unity5/Assets/UGUI.cs index e6f19f7..a031186 100644 --- a/UnityExamples.Unity5/Assets/UGUI.cs +++ b/UnityExamples.Unity5/Assets/UGUI.cs @@ -33,7 +33,7 @@ public class UGUI : MonoBehaviour // Animate the second (relative) text... relativeText.DOText(" - This text will be added to the existing one", 2).SetRelative().SetEase(Ease.Linear).SetAutoKill(false).Pause(); // Animate the third (scrambled) text... - scrambledText.DOText("This text will appear from scrambled chars", 2, true).SetEase(Ease.Linear).SetAutoKill(false).Pause(); + scrambledText.DOText("This text will appear from scrambled chars", 2, true, ScrambleMode.All).SetEase(Ease.Linear).SetAutoKill(false).Pause(); // Animate the slider slider.DOValue(1, 1.5f).SetEase(Ease.InOutQuad).SetLoops(-1, LoopType.Yoyo).Pause(); diff --git a/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset b/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset index 44ac4c4..95df289 100644 Binary files a/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset and b/UnityExamples.Unity5/ProjectSettings/ProjectSettings.asset differ diff --git a/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt b/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt index 78b2941..8a062e6 100644 --- a/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt +++ b/UnityExamples.Unity5/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.1.1f1 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0 diff --git a/UnityExamples.Unity5/ProjectSettings/UnityAdsSettings.asset b/UnityExamples.Unity5/ProjectSettings/UnityAdsSettings.asset new file mode 100644 index 0000000..2d1d81b Binary files /dev/null and b/UnityExamples.Unity5/ProjectSettings/UnityAdsSettings.asset differ diff --git a/UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset b/UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset new file mode 100644 index 0000000..e52c94d Binary files /dev/null and b/UnityExamples.Unity5/ProjectSettings/UnityAnalyticsManager.asset differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index cc2064b..7107d23 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -2083,7 +2083,7 @@ The tween to prepend - Inserts the given tween at the same time position of the last tween added to the Sequence. + Inserts the given tween at the same time position of the last tween or callback added to the Sequence. Has no effect if the Sequence has already started diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index 869bbdd..a545bb9 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 20d3998..887502e 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.Unity4/Assets/Demigiant/DOTween/DOTween43.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll index 687e2ef..33c26ff 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 6c7e725..a70497f 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll index ad38203..93c6a92 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 7b5d0f8..dcd9622 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll index 521959e..37d1db0 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 4aeb906..6ed0cc6 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f7b7215..1595ec4 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll differ diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb index b85c449..5f2a378 100644 Binary files a/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb and b/UnityTests.Unity4/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML index cc2064b..7107d23 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -2083,7 +2083,7 @@ The tween to prepend - Inserts the given tween at the same time position of the last tween added to the Sequence. + Inserts the given tween at the same time position of the last tween or callback added to the Sequence. Has no effect if the Sequence has already started diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 869bbdd..a545bb9 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 20d3998..887502e 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/DOTween43.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll index 687e2ef..33c26ff 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb index 6c7e725..a70497f 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween43.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll index ad38203..93c6a92 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb index 7b5d0f8..dcd9622 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween46.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll index 521959e..37d1db0 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb index 4aeb906..6ed0cc6 100644 Binary files a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb and b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween50.dll.mdb differ diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll index f7b7215..1595ec4 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 b85c449..5f2a378 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/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index bef4edc..e3a073d 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.1.000"; + public static readonly string Version = "1.1.005"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Sequence.cs b/_DOTween.Assembly/DOTween/Sequence.cs index dd7d999..c0cb61d 100644 --- a/_DOTween.Assembly/DOTween/Sequence.cs +++ b/_DOTween.Assembly/DOTween/Sequence.cs @@ -99,6 +99,7 @@ namespace DG.Tweening internal static Sequence DoInsertCallback(Sequence inSequence, TweenCallback callback, float atPosition) { + inSequence.lastTweenInsertTime = atPosition; SequenceCallback c = new SequenceCallback(atPosition, callback); c.sequencedPosition = c.sequencedEndPosition = atPosition; inSequence._sequencedObjs.Add(c); diff --git a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs index c3c510b..f97eb0f 100644 --- a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs +++ b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs @@ -427,7 +427,7 @@ namespace DG.Tweening Sequence.DoPrepend(s, t); return s; } - /// Inserts the given tween at the same time position of the last tween added to the Sequence. + /// Inserts the given tween at the same time position of the last tween or callback added to the Sequence. /// Has no effect if the Sequence has already started public static Sequence Join(this Sequence s, Tween t) { diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index cc2064b..7107d23 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -2083,7 +2083,7 @@ The tween to prepend - Inserts the given tween at the same time position of the last tween added to the Sequence. + Inserts the given tween at the same time position of the last tween or callback added to the Sequence. Has no effect if the Sequence has already started diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 869bbdd..a545bb9 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 20d3998..887502e 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/DOTween43.dll b/_DOTween.Assembly/bin/DOTween43.dll index 687e2ef..33c26ff 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll and b/_DOTween.Assembly/bin/DOTween43.dll differ diff --git a/_DOTween.Assembly/bin/DOTween43.dll.mdb b/_DOTween.Assembly/bin/DOTween43.dll.mdb index 6c7e725..a70497f 100644 Binary files a/_DOTween.Assembly/bin/DOTween43.dll.mdb and b/_DOTween.Assembly/bin/DOTween43.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll b/_DOTween.Assembly/bin/DOTween46.dll index ad38203..93c6a92 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll and b/_DOTween.Assembly/bin/DOTween46.dll differ diff --git a/_DOTween.Assembly/bin/DOTween46.dll.mdb b/_DOTween.Assembly/bin/DOTween46.dll.mdb index 7b5d0f8..dcd9622 100644 Binary files a/_DOTween.Assembly/bin/DOTween46.dll.mdb and b/_DOTween.Assembly/bin/DOTween46.dll.mdb differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll b/_DOTween.Assembly/bin/DOTween50.dll index 521959e..37d1db0 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll and b/_DOTween.Assembly/bin/DOTween50.dll differ diff --git a/_DOTween.Assembly/bin/DOTween50.dll.mdb b/_DOTween.Assembly/bin/DOTween50.dll.mdb index 4aeb906..6ed0cc6 100644 Binary files a/_DOTween.Assembly/bin/DOTween50.dll.mdb and b/_DOTween.Assembly/bin/DOTween50.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll index f7b7215..1595ec4 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 b85c449..5f2a378 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ