diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll b/UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll
index 23b9641..dab33a0 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 8bc3510..a1a13c7 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 58493c0..a7e710c 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 bb351f5..13458ef 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/readme.txt b/UnityTests.Unity5/Assets/Demigiant/DOTween/readme.txt
index aa60e6f..1c462e7 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DOTween/readme.txt
+++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/readme.txt
@@ -2,6 +2,7 @@ DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
// IMPORTANT!!! /////////////////////////////////////////////
// Upgrading DOTween from versions older than 1.2.000 ///////
+// (or DOTween Pro older than 1.0.000) //////////////////////
-------------------------------------------------------------
If you're upgrading your project from a version of DOTween older than 1.2.000 (or DOTween Pro older than 1.0.000) please follow these instructions carefully.
1) Import the new version in the same folder as the previous one, overwriting old files. A lot of errors will appear but don't worry
diff --git a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta
index f71098b..5f0b9d2 100644
--- a/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta
+++ b/UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/whiteSquare.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d3e15b806a8368742ba6f10e794d7b76
-timeCreated: 1533115990
+timeCreated: 1533146162
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
diff --git a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity
index 2286f7f..7abf9d4 100644
Binary files a/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity and b/UnityTests.Unity5/Assets/_Tests PRO/TempPro.unity differ
diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs
index 4800ce4..21986fe 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.010"; // Last version before modules: 1.1.755
+ public static readonly string Version = "1.2.015"; // Last version before modules: 1.1.755
///////////////////////////////////////////////
// Options ////////////////////////////////////
diff --git a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs
index 7b7d854..c174a23 100644
--- a/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs
+++ b/_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs
@@ -34,7 +34,8 @@ namespace DG.DOTweenEditor.UI
string[] _settingsLocation = new[] {"Assets > Resources", "DOTween > Resources", "Demigiant > Resources"};
// If force is FALSE opens the window only if DOTween's version has changed
- // (set to FALSE by OnPostprocessAllAssets)
+ // (set to FALSE by OnPostprocessAllAssets).
+ // NOTE: this is also called via Reflection by UpgradeWindow
public static void Open()
{
EditorWindow window = EditorWindow.GetWindow(true, _Title, true);
diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs b/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs
index 48df884..c7cf429 100644
--- a/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs
+++ b/_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs
@@ -18,32 +18,19 @@ namespace DG.DOTweenUpgradeManager
[InitializeOnLoad]
static class Autorun
{
- static readonly string _Id = "DOTweenUpgradeManager";
-
static Autorun()
{
- _Id = Application.dataPath + _Id;
+ EditorApplication.update += OnUpdate;
+ }
- bool refresh;
- DateTime now = DateTime.UtcNow;
- DateTime lastTime;
- if (!EditorPrefs.HasKey(_Id) || !DateTime.TryParse(EditorPrefs.GetString(_Id), out lastTime)) {
- refresh = true;
- } else {
- refresh = (now - lastTime).TotalSeconds > 60;
- }
- if (refresh) {
- EditorPrefs.SetString(_Id, now.ToString());
- EditorUtility.DisplayDialog("DOTween",
- "DOTWEEN SETUP REQUIRED: new version imported." +
- "\n\nSelect \"Setup DOTween...\" in DOTween's Utility Panel to set it up and add/remove Modules." +
- "\n\n::::: IMPORTANT :::::" +
- "\nIf you're upgrading from a DOTween version older than 1.2.000 you will see lots of errors." +
- "\n1) Close and reopen the project (if you haven't already done so)" +
- "\n2) Open DOTween's Utility Panel and run the Setup to activate required Modules",
- "Ok"
- );
- }
+ public static void OnUpdate()
+ {
+ if (!UpgradeWindowIsOpen()) UpgradeWindow.Open();
+ }
+
+ static bool UpgradeWindowIsOpen()
+ {
+ return Resources.FindObjectsOfTypeAll().Length > 0;
}
}
}
\ No newline at end of file
diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj b/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj
index 0a2ee14..ab6466e 100644
--- a/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj
+++ b/_DOTween.Assembly/DOTweenUpgradeManager/DOTweenUpgradeManager.csproj
@@ -52,6 +52,7 @@
+
diff --git a/_DOTween.Assembly/DOTweenUpgradeManager/UpgradeWindow.cs b/_DOTween.Assembly/DOTweenUpgradeManager/UpgradeWindow.cs
new file mode 100644
index 0000000..ba2424b
--- /dev/null
+++ b/_DOTween.Assembly/DOTweenUpgradeManager/UpgradeWindow.cs
@@ -0,0 +1,109 @@
+// Author: Daniele Giardini - http://www.demigiant.com
+// Created: 2018/08/02 12:29
+// License Copyright (c) Daniele Giardini
+// This work is subject to the terms at http://dotween.demigiant.com/license.php
+
+using System;
+using System.Reflection;
+using UnityEditor;
+using UnityEngine;
+
+namespace DG.DOTweenUpgradeManager
+{
+ class UpgradeWindow : EditorWindow
+ {
+ const string _Title = "New Version of DOTween Imported";
+ static readonly Vector2 _WinSize = new Vector2(400,280);
+
+ const string _DescrTitle0 = "DOTWEEN SETUP REQUIRED";
+ const string _DescrContent0 = "Select \"Setup DOTween...\" in DOTween's Utility Panel to set it up and add/remove Modules.";
+ const string _DescrTitle1 = "IMPORTANT IN CASE OF UPGRADE";
+ const string _DescrContent1 = "If you're upgrading from a DOTween version older than 1.2.000 or Pro older than 1.0.000" +
+ " (before the introduction of DOTween Modules)" +
+ " you will see lots of errors. Follow these instructions to fix them:";
+ const string _DescrContent2 = "\n1) Close and reopen the project" +
+ " (if you haven't already done so)" +
+ "\n2) Open DOTween's Utility Panel" +
+ " and run the Setup to activate required Modules";
+
+ #region Unity and GUI Methods
+
+ public static void Open()
+ {
+ EditorWindow window = EditorWindow.GetWindow(true, _Title, true);
+ window.minSize = _WinSize;
+ window.maxSize = _WinSize;
+ window.ShowUtility();
+ }
+
+ void OnGUI()
+ {
+ Styles.Init();
+
+ Rect area = new Rect(0, 0, position.width, position.height);
+
+ // Background
+ GUI.color = new Color(0.18f, 0.18f, 0.18f);
+ GUI.DrawTexture(area, Texture2D.whiteTexture);
+ GUI.color = Color.white;
+
+ GUILayout.Space(4);
+ GUILayout.Label(_DescrTitle0, Styles.descrTitle);
+ GUILayout.Label(_DescrContent0, Styles.descrLabel);
+ GUILayout.Space(12);
+ GUILayout.Label(_DescrTitle1, Styles.descrTitle);
+ GUILayout.Label(_DescrContent1, Styles.descrLabel);
+ GUILayout.Space(-15);
+ GUILayout.Label(_DescrContent2, Styles.descrLabel);
+
+ // Buttons
+ GUILayout.Space(12);
+ GUILayout.BeginHorizontal();
+ GUILayout.FlexibleSpace();
+ if (GUILayout.Button("Open DOTween Utility Panel", GUILayout.Height(30))) {
+ Type doeditorT = Type.GetType("DG.DOTweenEditor.UI.DOTweenUtilityWindow, DOTweenEditor");
+ MethodInfo miOpen = doeditorT.GetMethod("Open", BindingFlags.Static | BindingFlags.Public);
+ miOpen.Invoke(null, null);
+ EditorApplication.update -= Autorun.OnUpdate;
+ this.Close();
+ }
+ GUILayout.FlexibleSpace();
+ GUILayout.EndHorizontal();
+ }
+
+ #endregion
+
+ // █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
+ // ███ INTERNAL CLASSES ████████████████████████████████████████████████████████████████████████████████████████████████
+ // █████████████████████████████████████████████████████████████████████████████████████████████████████████████████████
+
+ static class Styles
+ {
+ static bool _initialized;
+ public static GUIStyle descrTitle, descrLabel;
+
+ public static void Init()
+ {
+ if (_initialized) return;
+
+ _initialized = true;
+
+ descrTitle = new GUIStyle(GUI.skin.label);
+ descrTitle.richText = true;
+ descrTitle.fontSize = 18;
+ SetTextColor(descrTitle, new Color(0.58f, 0.87f, 0.35f));
+
+ descrLabel = new GUIStyle(GUI.skin.label);
+ descrLabel.fontSize = 12;
+ descrLabel.wordWrap = descrLabel.richText = true;
+ SetTextColor(descrLabel, new Color(0.93f, 0.93f, 0.93f));
+ }
+
+ static void SetTextColor(GUIStyle style, Color color)
+ {
+ style.normal.textColor = style.active.textColor = style.focused.textColor = style.hover.textColor
+ = style.onNormal.textColor = style.onActive.textColor = style.onFocused.textColor = style.onHover.textColor = color;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll
index 23b9641..dab33a0 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 8bc3510..a1a13c7 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 58493c0..a7e710c 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 bb351f5..13458ef 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 34fea75..af4bbbb 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 a0cedcc..62188fd 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/readme.txt b/_DOTween.Assembly/bin/readme.txt
index aa60e6f..1c462e7 100644
--- a/_DOTween.Assembly/bin/readme.txt
+++ b/_DOTween.Assembly/bin/readme.txt
@@ -2,6 +2,7 @@ DOTween and DOTween Pro are copyright (c) 2014 Daniele Giardini - Demigiant
// IMPORTANT!!! /////////////////////////////////////////////
// Upgrading DOTween from versions older than 1.2.000 ///////
+// (or DOTween Pro older than 1.0.000) //////////////////////
-------------------------------------------------------------
If you're upgrading your project from a version of DOTween older than 1.2.000 (or DOTween Pro older than 1.0.000) please follow these instructions carefully.
1) Import the new version in the same folder as the previous one, overwriting old files. A lot of errors will appear but don't worry