diff --git a/.gitignore b/.gitignore index 033680a..92feaa7 100644 --- a/.gitignore +++ b/.gitignore @@ -40,4 +40,5 @@ UnityTests.Unity5BETA UnityTests.Unity5 - LastVersionBeforeModules ModulesTest.Unity2018 biz +screenshots zzTemp \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 75b5fe5..b773ec7 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 2d0e2fb..3eca0db 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 7dba487..0a9c2b0 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 133a585..657bd3a 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/Modules/DOTweenModuleUtils.cs b/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUtils.cs index 315f416..acc9124 100644 --- a/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUtils.cs +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUtils.cs @@ -46,7 +46,11 @@ namespace DG.Tweening #if UNITY_EDITOR // Fires OnApplicationPause in DOTweenComponent even when Editor is paused (otherwise it's only fired at runtime) +#if UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 static void PlaymodeStateChanged() + #else + static void PlaymodeStateChanged(UnityEditor.PlayModeStateChange state) +#endif { if (DOTween.instance == null) return; DOTween.instance.OnApplicationPause(UnityEditor.EditorApplication.isPaused); diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 7d0017d..926d4cc 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -11,11 +11,14 @@ using UnityEngine.UI; public class TempTests : BrainBase { - float initNum = 0; + public Transform target0, target1; IEnumerator Start() { - yield return new WaitForSeconds(1); - DOTween.To(()=>initNum,(x)=>initNum=x,400000000,3f).OnUpdate( ()=> Debug.Log(initNum)); + while (true) { + yield return null; + target0.DOMoveX(1, 0.1f); +// target1.DOMoveX(1, 0.1f); + } } } \ No newline at end of file diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.unity b/UnityTests.Unity5/Assets/_Tests/TempTests.unity index 1a839f9..28805c7 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/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index f5243b9..0cfa600 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.130"; // Last version before modules: 1.1.755 + public static readonly string Version = "1.2.135"; // Last version before modules: 1.1.755 /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 75b5fe5..b773ec7 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 2d0e2fb..3eca0db 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 7dba487..0a9c2b0 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 133a585..657bd3a 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 2e05bd5..11c3ec6 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 ba775ad..cd61a07 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ diff --git a/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs b/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs index 315f416..acc9124 100644 --- a/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs +++ b/_DOTween.Assembly/bin/Modules/DOTweenModuleUtils.cs @@ -46,7 +46,11 @@ namespace DG.Tweening #if UNITY_EDITOR // Fires OnApplicationPause in DOTweenComponent even when Editor is paused (otherwise it's only fired at runtime) +#if UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5 static void PlaymodeStateChanged() + #else + static void PlaymodeStateChanged(UnityEditor.PlayModeStateChange state) +#endif { if (DOTween.instance == null) return; DOTween.instance.OnApplicationPause(UnityEditor.EditorApplication.isPaused); diff --git a/screenshots/assetStore/dotweenPro_assetStore_01.png b/screenshots/assetStore/dotweenPro_assetStore_01.png deleted file mode 100644 index 64c3e0b..0000000 Binary files a/screenshots/assetStore/dotweenPro_assetStore_01.png and /dev/null differ diff --git a/screenshots/pro_manager.png b/screenshots/pro_manager.png deleted file mode 100644 index 3a8e280..0000000 Binary files a/screenshots/pro_manager.png and /dev/null differ diff --git a/screenshots/splash_dotween.png b/screenshots/splash_dotween.png deleted file mode 100644 index ae43db2..0000000 Binary files a/screenshots/splash_dotween.png and /dev/null differ diff --git a/screenshots/splash_lambda.png b/screenshots/splash_lambda.png deleted file mode 100644 index ea89348..0000000 Binary files a/screenshots/splash_lambda.png and /dev/null differ diff --git a/screenshots/splash_shortcuts.png b/screenshots/splash_shortcuts.png deleted file mode 100644 index 1001145..0000000 Binary files a/screenshots/splash_shortcuts.png and /dev/null differ