diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll index 8f5be40..a0f318e 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 2e29f42..30172e0 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 95d6160..ab8dd18 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 a8ba712..a592794 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 a6789c1..481059d 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.080"; // Last version before modules: 1.1.755 + public static readonly string Version = "1.2.100"; // Last version before modules: 1.1.755 /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs b/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs index 4aab5bc..f785c9b 100644 --- a/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs +++ b/_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs @@ -34,15 +34,17 @@ namespace DG.DOTweenEditor // Remove EditorPrefs EditorPrefs.DeleteKey(Application.dataPath + DOTweenUtilityWindow.Id); EditorPrefs.DeleteKey(Application.dataPath + DOTweenUtilityWindow.IdPro); - // Remove scripting define symbols - DOTweenDefines.RemoveAllDefines(); - // - EditorUtility.DisplayDialog("DOTween Deleted", - "DOTween was deleted and all of its scripting define symbols removed." + - "\n\nThis might show an error depending on your previous setup." + - " If this happens, please close and reopen Unity or reimport DOTween.", - "Ok" - ); + +// // The following is not necessary anymore since the Modules update +// // Remove scripting define symbols +// DOTweenDefines.RemoveAllDefines(); +// // +// EditorUtility.DisplayDialog("DOTween Deleted", +// "DOTween was deleted and all of its scripting define symbols removed." + +// "\n\nThis might show an error depending on your previous setup." + +// " If this happens, please close and reopen Unity or reimport DOTween.", +// "Ok" +// ); return AssetDeleteResult.DidNotDelete; } @@ -59,39 +61,31 @@ namespace DG.DOTweenEditor string[] dotweenEntries = System.Array.FindAll(importedAssets, name => name.Contains("DOTween") && !name.EndsWith(".meta") && !name.EndsWith(".jpg") && !name.EndsWith(".png")); bool dotweenImported = dotweenEntries.Length > 0; - if (dotweenImported) { - // Delete old DOTween files - EditorUtils.DeleteLegacyNoModulesDOTweenFiles(); - // Delete old DemiLib configuration - EditorUtils.DeleteOldDemiLibCore(); - // Remove old legacy defines - DOTweenDefines.RemoveAllLegacyDefines(); - // Reapply modules - DOTweenUtilityWindowModules.ApplyModulesSettings(); - // - bool differentCoreVersion = EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.Id) != Application.dataPath + DOTween.Version; - bool differentProVersion = EditorUtils.hasPro && EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.IdPro) != Application.dataPath + EditorUtils.proVersion; - bool setupRequired = differentCoreVersion || differentProVersion; - if (setupRequired) { - _setupDialogRequested = true; - EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.Id, Application.dataPath + DOTween.Version); - if (EditorUtils.hasPro) EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.IdPro, Application.dataPath + EditorUtils.proVersion); -// EditorUtility.DisplayDialog("DOTween", -// differentCoreVersion -// ? "New version of DOTween imported." + -// "\n\nSelect \"Setup DOTween...\" in DOTween's Utility Panel to add/remove Modules." -// : "New version of DOTween Pro imported." + -// " \n\nSelect \"Setup DOTween...\" in DOTween's Utility Panel to add/remove external Modules (TextMesh Pro/2DToolkit/etc).", -// "Ok" -// ); - DOTweenUtilityWindow.Open(); - // Opening window after a postProcess doesn't work on Unity 3 so check that -// string[] vs = Application.unityVersion.Split("."[0]); -// int majorVersion = System.Convert.ToInt32(vs[0]); -// if (majorVersion >= 4) EditorUtils.DelayedCall(0.5f, DOTweenUtilityWindow.Open); -// EditorUtils.DelayedCall(8, ()=> _setupDialogRequested = false); - } - } + if (!dotweenImported) return; + + // Reapply modules + DOTweenUtilityWindowModules.ApplyModulesSettings(); + +// // Delete old DOTween files +// EditorUtils.DeleteLegacyNoModulesDOTweenFiles(); +// // Delete old DemiLib configuration +// EditorUtils.DeleteOldDemiLibCore(); +// // Remove old legacy defines +// DOTweenDefines.RemoveAllLegacyDefines(); +// // Reapply modules +// DOTweenUtilityWindowModules.ApplyModulesSettings(); +// // +// bool differentCoreVersion = EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.Id) != Application.dataPath + DOTween.Version; +// bool differentProVersion = EditorUtils.hasPro && EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.IdPro) != Application.dataPath + EditorUtils.proVersion; +// bool setupRequired = differentCoreVersion || differentProVersion; +// if (!setupRequired) return; +// +// _setupDialogRequested = true; +// EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.Id, Application.dataPath + DOTween.Version); +// if (EditorUtils.hasPro) { +// EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.IdPro, Application.dataPath + EditorUtils.proVersion); +// } +// DOTweenUtilityWindow.Open(); } } } \ No newline at end of file diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 8f5be40..a0f318e 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 2e29f42..30172e0 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 95d6160..ab8dd18 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 a8ba712..a592794 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 bb6fc41..5b79611 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 316cc11..2909575 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ