diff --git a/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.pdb.meta b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.pdb.meta new file mode 100644 index 0000000..ae43325 --- /dev/null +++ b/UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenUpgradeManager.pdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7af705b727a21a440bee9c5f40033da9 +timeCreated: 1564740547 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: 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 f0048b5..72d706c 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: 1557580623 +timeCreated: 1565912005 licenseType: Pro TextureImporter: fileIDToRecycleName: {} diff --git a/UnityTests.Unity5/Assets/_Tests/TempTests.cs b/UnityTests.Unity5/Assets/_Tests/TempTests.cs index 34600da..9e83937 100644 --- a/UnityTests.Unity5/Assets/_Tests/TempTests.cs +++ b/UnityTests.Unity5/Assets/_Tests/TempTests.cs @@ -12,18 +12,13 @@ using UnityEngine.UI; public class TempTests : BrainBase { public Transform target; + public float y = 1; + public AnimationCurve ease; IEnumerator Start() { yield return new WaitForSeconds(0.8f); - Sequence s = DOTween.Sequence(); -// s.Append(target.DOMoveX(2, 1)); - s.AppendCallback(() => { - Debug.Log("Gonna pause here"); - s.Pause(); - }) - .AppendCallback(() => Debug.Log("Will move Y")) - .Append(target.DOMoveY(2, 1)); + target.DOMoveY(y, 2).SetEase(ease); } } \ No newline at end of file diff --git a/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs b/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs index 31f8b01..2e7203c 100644 --- a/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs +++ b/_DOTween.Assembly/DOTween/Core/DOTweenComponent.cs @@ -157,7 +157,9 @@ namespace DG.Tweening.Core // DOTween.initialized = false; // DOTween.instance = null; + if (DOTween.instance == this) DOTween.instance = null; + DOTween.Clear(true); } // Detract/reapply pause time from/to unscaled time @@ -170,10 +172,12 @@ namespace DG.Tweening.Core } } - void OnApplicationQuit() - { - DOTween.isQuitting = true; - } + // Commented this out because it interferes with Unity 2019.3 "no domain reload" experimental playmode + // (now I clear DOTween completely when the DOTween component is destroyed which allows this to be commented out) +// void OnApplicationQuit() +// { +// DOTween.isQuitting = true; +// } #endregion diff --git a/_DOTween.Assembly/DOTween/Core/TweenManager.cs b/_DOTween.Assembly/DOTween/Core/TweenManager.cs index 32530ac..50b5e69 100644 --- a/_DOTween.Assembly/DOTween/Core/TweenManager.cs +++ b/_DOTween.Assembly/DOTween/Core/TweenManager.cs @@ -414,7 +414,7 @@ namespace DG.Tweening.Core if (t == null || t.updateType != updateType) continue; // Wrong updateType or was added to a Sequence (thus removed from active list) while inside current updateLoop if (_totTweenLinks > 0) EvaluateTweenLink(t); // TweenLinks if (!t.active) { - // Manually killed by another tween's callback + // Manually killed by another tween's callback or deactivated by the TweenLink evaluation willKill = true; MarkForKilling(t); continue; diff --git a/_DOTween.Assembly/DOTween/DOTween.cs b/_DOTween.Assembly/DOTween/DOTween.cs index 85d1103..bc21e49 100644 --- a/_DOTween.Assembly/DOTween/DOTween.cs +++ b/_DOTween.Assembly/DOTween/DOTween.cs @@ -34,7 +34,7 @@ namespace DG.Tweening public class DOTween { /// DOTween's version - public static readonly string Version = "1.2.265"; // Last version before modules: 1.1.755 + public static readonly string Version = "1.2.270"; // Last version before modules: 1.1.755 /////////////////////////////////////////////// // Options //////////////////////////////////// diff --git a/_DOTween.Assembly/PostBuild_DOTween.bat b/_DOTween.Assembly/PostBuild_DOTween.bat index e59dafd..ce6b9e6 100644 --- a/_DOTween.Assembly/PostBuild_DOTween.bat +++ b/_DOTween.Assembly/PostBuild_DOTween.bat @@ -40,6 +40,7 @@ set CopyToDir=%1..\..\bin.Global\%5%SubDir% set CopyToDirNoMeta=%1..\..\bin.Global_no_meta\%5%SubDir% set CopyToDirUnityTests=%1..\UnityTests.Unity4\Assets\Demigiant\%5%SubDir% set CopyToDirUnity5Tests=%1..\UnityTests.Unity5\Assets\Demigiant\%5%SubDir% +set CopyToDirUnity2019Tests=%1..\UnityTests.Unity2019\Assets\Demigiant\%5%SubDir% set CopyToDirCompatibilityTests=%1..\UnityCompatibilityTests.Unity35\Assets\Demigiant\%5%SubDir% set CopyToDirExtPluginsTests=%1..\ExternalPluginsTestsAndExamples.Unity5\Assets\Demigiant\%5%SubDir% set CopyToDirModulesTest=%1..\ModulesTest.Unity2018\Assets\Demigiant\%5%SubDir% @@ -53,6 +54,10 @@ echo f | xcopy %CopyFromDir% %CopyToDirModulesTest% /Y /I /E :: bin.Global_no_meta echo ::: Exporting from %CopyFromDir% to %CopyToDirNoMeta% echo f | xcopy %CopyFromDir% %CopyToDirNoMeta% /Y /I /E +:: UnityTests.Unity2019 +echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity2019Tests% +echo f | xcopy %CopyFromDir% %CopyToDirUnity2019Tests% /Y /I /E +exit /B :: UnityTests.Unity5 echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity5Tests% echo f | xcopy %CopyFromDir% %CopyToDirUnity5Tests% /Y /I /E diff --git a/_DOTween.Assembly/bin/DOTween.dll b/_DOTween.Assembly/bin/DOTween.dll index 588e4e4..19c9399 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 c9ea9d6..f11f34c 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 77fa70f..3d41cad 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 915545c..7211c40 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 b3f3dae..666d0ae 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 ed57eca..2c0a513 100644 Binary files a/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb and b/_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb differ