diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML index b4e8e77..e4412c6 100644 --- a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.XML @@ -2039,7 +2039,11 @@ Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual overshoot to use with Back ease (default is 1.70158) + + Eventual overshoot to use with Back ease (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will end the tween on the starting value, while an odd one will end on the end value. + Sets the ease of the tween. diff --git a/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll b/UnityCompatibilityTests.Unity35/Assets/Demigiant/DOTween/DOTween.dll index d047a69..77607d0 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 8941a89..44ced81 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 b7a70a4..61ae52b 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 25f0341..e9feb5d 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 d39b0b6..cbbf5e3 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 4ca95f9..79747ec 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 a5e5f00..9179775 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 1316e2e..fc94a46 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 9340207..b775192 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 1ac0792..731e179 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/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML index b4e8e77..e4412c6 100644 --- a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.XML @@ -2039,7 +2039,11 @@ Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual overshoot to use with Back ease (default is 1.70158) + + Eventual overshoot to use with Back ease (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will end the tween on the starting value, while an odd one will end on the end value. + Sets the ease of the tween. diff --git a/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity4/Assets/Demigiant/DOTween/DOTween.dll index d047a69..77607d0 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 8941a89..44ced81 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 b7a70a4..61ae52b 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 25f0341..e9feb5d 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 d39b0b6..cbbf5e3 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 4ca95f9..79747ec 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 a5e5f00..9179775 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 1316e2e..fc94a46 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 9340207..b775192 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 1ac0792..731e179 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 b4e8e77..e4412c6 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.XML @@ -2039,7 +2039,11 @@ Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual overshoot to use with Back ease (default is 1.70158) + + Eventual overshoot to use with Back ease (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will end the tween on the starting value, while an odd one will end on the end value. + Sets the ease of the tween. diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index d047a69..77607d0 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 8941a89..44ced81 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 b7a70a4..61ae52b 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 25f0341..e9feb5d 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 d39b0b6..cbbf5e3 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 4ca95f9..79747ec 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 a5e5f00..9179775 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 1316e2e..fc94a46 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 9340207..b775192 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 1ac0792..731e179 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/_Tests/EaseCurves.cs b/UnityTests.Unity5/Assets/_Tests/EaseCurves.cs index 5a989f6..4b29043 100644 --- a/UnityTests.Unity5/Assets/_Tests/EaseCurves.cs +++ b/UnityTests.Unity5/Assets/_Tests/EaseCurves.cs @@ -74,7 +74,12 @@ public class EaseCurves : BrainBase } else { img.GetComponentInChildren().text = easeType.ToString(); if (easeType == Ease.INTERNAL_Custom) tween.SetEase(easeCurve); - else tween.SetEase(easeType); + else{ + float overshootOrAmplitude = easeType.ToString().IndexOf("Flash") == -1 + ? DOTween.defaultEaseOvershootOrAmplitude + : 16; + tween.SetEase(easeType, overshootOrAmplitude); + } } } // Disable original image diff --git a/UnityTests.Unity5/Assets/_Tests/EaseCurves.unity b/UnityTests.Unity5/Assets/_Tests/EaseCurves.unity index 1078ddf..12f70e5 100644 Binary files a/UnityTests.Unity5/Assets/_Tests/EaseCurves.unity and b/UnityTests.Unity5/Assets/_Tests/EaseCurves.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/EaseX.cs b/UnityTests.Unity5/Assets/_Tests/EaseX.cs new file mode 100644 index 0000000..b14e4e0 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/EaseX.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; +using DG.Tweening; + +public class EaseX : MonoBehaviour +{ + public Image imgFlash, imgSmoothFlash; + public Color flashColor; + [Header("Tween Settings")] + public float duration = 2; + public Ease ease; + public float overshootOrAmplitude = 10; + + public void Play() + { + DOTween.RewindAll(); + DOTween.KillAll(); + + imgFlash.DOColor(flashColor, duration).SetEase(ease, overshootOrAmplitude); + imgSmoothFlash.DOColor(flashColor, duration).SetEase(ease, overshootOrAmplitude); + } +} \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/EaseX.cs.meta b/UnityTests.Unity5/Assets/_Tests/EaseX.cs.meta new file mode 100644 index 0000000..3f7ac2b --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/EaseX.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0bb9dc09d685d8d4098a093a5c9844a2 +timeCreated: 1446226102 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/EaseX.unity b/UnityTests.Unity5/Assets/_Tests/EaseX.unity new file mode 100644 index 0000000..3744cc7 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/EaseX.unity differ diff --git a/UnityTests.Unity5/Assets/_Tests/EaseX.unity.meta b/UnityTests.Unity5/Assets/_Tests/EaseX.unity.meta new file mode 100644 index 0000000..2cbaec0 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/EaseX.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa19e668bdb591b43ac79271427d506f +timeCreated: 1446226089 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/CircleOutline.png.meta b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/CircleOutline.png.meta index 056f5a3..92573a7 100644 --- a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/CircleOutline.png.meta +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/CircleOutline.png.meta @@ -20,6 +20,9 @@ TextureImporter: isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 maxTextureSize: 128 @@ -30,7 +33,9 @@ TextureImporter: wrapMode: 1 nPOTScale: 0 lightmap: 0 + rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 @@ -45,3 +50,5 @@ TextureImporter: sprites: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png new file mode 100644 index 0000000..5348213 Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png differ diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png.meta b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png.meta new file mode 100644 index 0000000..70b9b33 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/DOTween_Logo_white.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: f0fbf5b9286dfec4ebb8c58cbf73369e +timeCreated: 1446234642 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 256 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png new file mode 100644 index 0000000..bf379fb Binary files /dev/null and b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png differ diff --git a/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png.meta b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png.meta new file mode 100644 index 0000000..e536e17 --- /dev/null +++ b/UnityTests.Unity5/Assets/_Tests/_Shared Sprites/EaseFlash_curves.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 159f24a8249bb244a91671b58f1d7441 +timeCreated: 1446234463 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/_DOTween.Assembly/DOTween/Core/Easing/EaseManager.cs b/_DOTween.Assembly/DOTween/Core/Easing/EaseManager.cs index e6ce439..2a489e2 100644 --- a/_DOTween.Assembly/DOTween/Core/Easing/EaseManager.cs +++ b/_DOTween.Assembly/DOTween/Core/Easing/EaseManager.cs @@ -5,8 +5,10 @@ // This work is subject to the terms at http://dotween.demigiant.com/license.php // // ============================================================= -// Contains Daniele Giardini's C# port of the easing equations created -// by Robert Penner - http://robertpenner.com/easing, see license below: +// Contains Daniele Giardini's C# port of the easing equations created by Robert Penner +// (all easing equations except for Flash, InFlash, OutFlash, InOutFlash, +// which use some parts of Robert Penner's equations but were created by Daniele Giardini) +// http://robertpenner.com/easing, see license below: // ============================================================= // // TERMS OF USE - EASING EQUATIONS @@ -59,6 +61,9 @@ namespace DG.Tweening.Core.Easing /// public static float Evaluate(Ease easeType, EaseFunction customEase, float time, float duration, float overshootOrAmplitude, float period) { + float durationStep; + int dir; + switch (easeType) { case Ease.Linear: return time / duration; @@ -162,6 +167,50 @@ namespace DG.Tweening.Core.Easing case Ease.INTERNAL_Zero: // 0 duration tween return 1; + + // Extra custom eases //////////////////////////////////////////////////// + case Ease.Flash: + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + return (time * dir) / durationStep; + case Ease.InFlash: + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + return (time /= durationStep) * time; + case Ease.OutFlash: + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + return -(time /= durationStep) * (time - 2); + case Ease.InOutFlash: + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + if ((time /= durationStep * 0.5f) < 1) return 0.5f * time * time; + return -0.5f * ((--time) * (time - 2) - 1); + + // Default default: // OutQuad return -(time /= duration) * (time - 2); @@ -170,6 +219,9 @@ namespace DG.Tweening.Core.Easing public static EaseFunction ToEaseFunction(Ease ease) { + float durationStep; + int dir; + switch (ease) { case Ease.Linear: return (float time, float duration, float overshootOrAmplitude, float period) => @@ -310,6 +362,58 @@ namespace DG.Tweening.Core.Easing case Ease.InOutBounce: return (float time, float duration, float overshootOrAmplitude, float period) => Bounce.EaseInOut(time, duration, overshootOrAmplitude, period); + + // Extra custom eases //////////////////////////////////////////////////// + case Ease.Flash: + return (float time, float duration, float overshootOrAmplitude, float period) => { + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + return (time * dir) / durationStep; + }; + case Ease.InFlash: + return (float time, float duration, float overshootOrAmplitude, float period) => { + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + return (time /= durationStep) * time; + }; + case Ease.OutFlash: + return (float time, float duration, float overshootOrAmplitude, float period) => { + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + return -(time /= durationStep) * (time - 2); + }; + case Ease.InOutFlash: + return (float time, float duration, float overshootOrAmplitude, float period) => { + durationStep = duration / overshootOrAmplitude; + dir = 1; + while (time > durationStep) { + time -= durationStep; + dir = -dir; + } + if (dir < 0) time -= durationStep; + time = time * dir; + if ((time /= durationStep * 0.5f) < 1) return 0.5f * time * time; + return -0.5f * ((--time) * (time - 2) - 1); + }; + + // Default default: // OutQuad return (float time, float duration, float overshootOrAmplitude, float period) => -(time /= duration) * (time - 2); diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 4271191..afb75fc 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.030"; + public static readonly string Version = "1.1.050"; /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTween/Ease.cs b/_DOTween.Assembly/DOTween/Ease.cs index 210b476..bef8989 100644 --- a/_DOTween.Assembly/DOTween/Ease.cs +++ b/_DOTween.Assembly/DOTween/Ease.cs @@ -40,6 +40,8 @@ namespace DG.Tweening InBounce, OutBounce, InOutBounce, + // Extra custom eases + Flash, InFlash, OutFlash, InOutFlash, /// /// Don't assign this! It's assigned automatically when creating 0 duration tweens /// diff --git a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs index 1c1e9cb..538cbb0 100644 --- a/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs +++ b/_DOTween.Assembly/DOTween/TweenSettingsExtensions.cs @@ -126,7 +126,11 @@ namespace DG.Tweening } /// Sets the ease of the tween. /// If applied to Sequences eases the whole sequence animation - /// Eventual overshoot to use with Back ease (default is 1.70158) + /// + /// Eventual overshoot to use with Back ease (default is 1.70158). + /// In case of Flash ease it sets the total number of flashes that will happen. + /// Using an even number will end the tween on the starting value, while an odd one will end on the end value. + /// public static T SetEase(this T t, Ease ease, float overshoot) where T : Tween { if (t == null || !t.active) return t; diff --git a/_DOTween.Assembly/bin/DOTween.XML b/_DOTween.Assembly/bin/DOTween.XML index b4e8e77..e4412c6 100644 --- a/_DOTween.Assembly/bin/DOTween.XML +++ b/_DOTween.Assembly/bin/DOTween.XML @@ -2039,7 +2039,11 @@ Sets the ease of the tween. If applied to Sequences eases the whole sequence animation - Eventual overshoot to use with Back ease (default is 1.70158) + + Eventual overshoot to use with Back ease (default is 1.70158). + In case of Flash ease it sets the total number of flashes that will happen. + Using an even number will end the tween on the starting value, while an odd one will end on the end value. + Sets the ease of the tween. diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index d047a69..77607d0 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 8941a89..44ced81 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 b7a70a4..61ae52b 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 25f0341..e9feb5d 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 d39b0b6..cbbf5e3 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 4ca95f9..79747ec 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 a5e5f00..9179775 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 1316e2e..fc94a46 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 9340207..b775192 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 1ac0792..731e179 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb differ