UnityMirror/dotween-upm-fork
1
0
Fork 0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2026-02-06 15:24:57 +08:00
Code

Modules are now applied automatically if they were setup previously and stored in DOTweenSettings

Browse Source
This commit is contained in:
Demigiant 2018-08-02 21:21:33 +02:00
parent 98b2b57dd9
commit 44421094ea
17 changed files with 112 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll
View File

Binary file not shown.

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/DOTween.dll.mdb
View File

Binary file not shown.

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll
View File

Binary file not shown.

BIN
UnityTests.Unity5/Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb
View File

Binary file not shown.

2
UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModulePhysics.cs
View File

@ -1,4 +1,4 @@
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
#if true // MODULE_MARKER

2
UnityTests.Unity5/Assets/Demigiant/DOTween/Modules/DOTweenModuleUtils.cs
View File

@ -1,4 +1,4 @@
// Author: Daniele Giardini - http://www.demigiant.com
// Author: Daniele Giardini - http://www.demigiant.com
// Created: 2018/07/13
using System;

4
_DOTween.Assembly/DOTweenEditor/DOTweenProcessors.cs
View File

@ -45,6 +45,8 @@ namespace DG.DOTweenEditor
);
return AssetDeleteResult.DidNotDelete;
}
}
public class UtilityWindowPostProcessor : AssetPostprocessor
@ -64,6 +66,8 @@ namespace DG.DOTweenEditor
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;

98
_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindow.cs
View File

@ -37,7 +37,7 @@ namespace DG.DOTweenEditor.UI
// NOTE: this is also called via Reflection by UpgradeWindow
public static void Open()
{
EditorWindow window = EditorWindow.GetWindow<DOTweenUtilityWindow>(true, _Title, true);
DOTweenUtilityWindow window = EditorWindow.GetWindow<DOTweenUtilityWindow>(true, _Title, true);
window.minSize = _WinSize;
window.maxSize = _WinSize;
window.ShowUtility();
@ -159,7 +159,7 @@ namespace DG.DOTweenEditor.UI
if (GUILayout.Button("<b>Setup DOTween...</b>\n(add/remove Modules)", EditorGUIUtils.btSetup)) {
// DOTweenDefines.Setup();
// _setupRequired = EditorUtils.DOTweenSetupRequired();
DOTweenUtilityWindowModules.Refresh(_src, true);
DOTweenUtilityWindowModules.ApplyModulesSettings();
_src.modules.showPanel = true;
EditorUtility.SetDirty(_src);
EditorUtils.DeleteLegacyNoModulesDOTweenFiles();
@ -265,43 +265,91 @@ namespace DG.DOTweenEditor.UI
// ===================================================================================
// METHODS ---------------------------------------------------------------------------
void Connect(bool forceReconnect = false)
public static DOTweenSettings GetDOTweenSettings()
{
if (_src != null && !forceReconnect) return;
return ConnectToSource(null, false, false);
}
static DOTweenSettings ConnectToSource(DOTweenSettings src, bool createIfMissing, bool fullSetup)
{
LocationData assetsLD = new LocationData(EditorUtils.assetsPath + EditorUtils.pathSlash + "Resources");
LocationData dotweenLD = new LocationData(EditorUtils.dotweenDir + "Resources");
bool hasDemigiantDir = EditorUtils.demigiantDir != null;
LocationData demigiantLD = hasDemigiantDir ? new LocationData(EditorUtils.demigiantDir + "Resources") : new LocationData();
if (_src == null) {
if (src == null) {
// Load eventual existing settings
_src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
if (_src == null) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
if (_src == null && hasDemigiantDir) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
if (src == null) src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
if (src == null && hasDemigiantDir) src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
}
if (_src == null) {
// Settings don't exist. Create it in external folder
if (src == null) {
// Settings don't exist.
if (!createIfMissing) return null; // Stop here
// Create it in external folder
if (!Directory.Exists(assetsLD.dir)) AssetDatabase.CreateFolder(assetsLD.adbParentDir, "Resources");
_src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
}
// Move eventual settings from previous location and setup everything correctly
DOTweenSettings.SettingsLocation settingsLoc = _src.storeSettingsLocation;
switch (settingsLoc) {
case DOTweenSettings.SettingsLocation.AssetsDirectory:
MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
break;
case DOTweenSettings.SettingsLocation.DOTweenDirectory:
MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
break;
case DOTweenSettings.SettingsLocation.DemigiantDirectory:
MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
break;
if (fullSetup) {
// Move eventual settings from previous location and setup everything correctly
DOTweenSettings.SettingsLocation settingsLoc = src.storeSettingsLocation;
switch (settingsLoc) {
case DOTweenSettings.SettingsLocation.AssetsDirectory:
src = MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
break;
case DOTweenSettings.SettingsLocation.DOTweenDirectory:
src = MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
break;
case DOTweenSettings.SettingsLocation.DemigiantDirectory:
src = MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
break;
}
}
return src;
}
void MoveSrc(LocationData[] from, LocationData to)
void Connect(bool forceReconnect = false)
{
if (_src != null && !forceReconnect) return;
_src = ConnectToSource(_src, true, true);
// LocationData assetsLD = new LocationData(EditorUtils.assetsPath + EditorUtils.pathSlash + "Resources");
// LocationData dotweenLD = new LocationData(EditorUtils.dotweenDir + "Resources");
// bool hasDemigiantDir = EditorUtils.demigiantDir != null;
// LocationData demigiantLD = hasDemigiantDir ? new LocationData(EditorUtils.demigiantDir + "Resources") : new LocationData();
//
// if (_src == null) {
// // Load eventual existing settings
// _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, false);
// if (_src == null) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(dotweenLD.adbFilePath, false);
// if (_src == null && hasDemigiantDir) _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(demigiantLD.adbFilePath, false);
// }
// if (_src == null) {
// // Settings don't exist.
// if (!createSrcIfMissing) return; // Stop here
// // Create it in external folder
// if (!Directory.Exists(assetsLD.dir)) AssetDatabase.CreateFolder(assetsLD.adbParentDir, "Resources");
// _src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(assetsLD.adbFilePath, true);
// }
//
// // Move eventual settings from previous location and setup everything correctly
// DOTweenSettings.SettingsLocation settingsLoc = _src.storeSettingsLocation;
// switch (settingsLoc) {
// case DOTweenSettings.SettingsLocation.AssetsDirectory:
// MoveSrc(new[] { dotweenLD, demigiantLD }, assetsLD);
// break;
// case DOTweenSettings.SettingsLocation.DOTweenDirectory:
// MoveSrc(new[] { assetsLD, demigiantLD }, dotweenLD);
// break;
// case DOTweenSettings.SettingsLocation.DemigiantDirectory:
// MoveSrc(new[] { assetsLD, dotweenLD }, demigiantLD);
// break;
// }
}
static DOTweenSettings MoveSrc(LocationData[] from, LocationData to)
{
if (!Directory.Exists(to.dir)) AssetDatabase.CreateFolder(to.adbParentDir, "Resources");
foreach (LocationData ld in from) {
@ -316,7 +364,7 @@ namespace DG.DOTweenEditor.UI
}
}
}
_src = EditorUtils.ConnectToSourceAsset<DOTweenSettings>(to.adbFilePath, true);
return EditorUtils.ConnectToSourceAsset<DOTweenSettings>(to.adbFilePath, true);
}
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

11
_DOTween.Assembly/DOTweenEditor/UI/DOTweenUtilityWindowModules.cs
View File

@ -113,6 +113,17 @@ namespace DG.DOTweenEditor.UI
#endregion
#region Public Methods
// Also called via Reflection by Autorun
public static void ApplyModulesSettings()
{
DOTweenSettings src = DOTweenUtilityWindow.GetDOTweenSettings();
if (src != null) Refresh(src, true);
}
#endregion
#region Methods
public static void Refresh(DOTweenSettings src, bool applySrcSettings = false)

17
_DOTween.Assembly/DOTweenUpgradeManager/Autorun.cs
View File

@ -4,6 +4,7 @@
// This work is subject to the terms at http://dotween.demigiant.com/license.php
using System;
using System.Reflection;
using UnityEditor;
using UnityEditor.Callbacks;
using UnityEngine;
@ -25,12 +26,26 @@ namespace DG.DOTweenUpgradeManager
public static void OnUpdate()
{
if (!UpgradeWindowIsOpen()) UpgradeWindow.Open();
if (!UpgradeWindowIsOpen()) {
ApplyModulesSettings();
UpgradeWindow.Open();
}
}
static bool UpgradeWindowIsOpen()
{
return Resources.FindObjectsOfTypeAll<UpgradeWindow>().Length > 0;
}
static void ApplyModulesSettings()
{
Type doeditorT = Type.GetType("DG.DOTweenEditor.UI.DOTweenUtilityWindowModules, DOTweenEditor");
if (doeditorT != null) {
MethodInfo miOpen = doeditorT.GetMethod("ApplyModulesSettings", BindingFlags.Static | BindingFlags.Public);
if (miOpen != null) {
miOpen.Invoke(null, null);
}
}
}
}
}

8
_DOTween.Assembly/DOTweenUpgradeManager/UpgradeWindow.cs
View File

@ -62,8 +62,12 @@ namespace DG.DOTweenUpgradeManager
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);
if (doeditorT != null) {
MethodInfo miOpen = doeditorT.GetMethod("Open", BindingFlags.Static | BindingFlags.Public);
if (miOpen != null) {
miOpen.Invoke(null, null);
}
}
EditorApplication.update -= Autorun.OnUpdate;
this.Close();
}

BIN
_DOTween.Assembly/bin/DOTween.dll
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/DOTween.dll.mdb
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/Editor/DOTweenEditor.dll
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/Editor/DOTweenEditor.dll.mdb
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll
View File

Binary file not shown.

BIN
_DOTween.Assembly/bin/Editor/DOTweenUpgradeManager.dll.mdb
View File

Binary file not shown.