UnityMirror/dotween-upm-fork
1
0
Fork 0
mirror of https://github.com/Cardidi/dotween-upm-fork.git synced 2025-12-21 01:36:05 +08:00
Code

- minor

Browse Source
This commit is contained in:
Demigiant 2018-07-16 14:14:54 +02:00
parent 23982b5631
commit 927c38fa61
5 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UnityTests.Unity5/Assets/Demigiant/DemiLib/Core/Editor/Imgs/project.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1fa36039328c18e48808faaf6a351f48
folderAsset: yes
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
UnityTests.Unity5/ProjectSettings/ProjectSettings.asset
View File

Binary file not shown.

6
_DOTween.Assembly/DOTweenEditor/DOTweenSetup.cs
View File

@ -44,6 +44,12 @@ namespace DG.DOTweenEditor
EditorUtils.RemoveGlobalDefine(GlobalDefine_TextMeshPro); EditorUtils.RemoveGlobalDefine(GlobalDefine_TextMeshPro);
} }
// Removes all legacy defines
public static void RemoveAllLegacyDefines()
{
EditorUtils.RemoveGlobalDefine(GlobalDefine_Legacy_NoRigidbody);
}
// Adds all Unity Modules defines but not the ones for external assets // Adds all Unity Modules defines but not the ones for external assets
public static void AddAllUnityDefines() public static void AddAllUnityDefines()
{ {

8
_DOTween.Assembly/DOTweenEditor/DOTweenUtilityWindow.cs
View File

@ -30,6 +30,7 @@ namespace DG.DOTweenEditor
break; break;
} }
if (!containsDOTween) return AssetDeleteResult.DidNotDelete; if (!containsDOTween) return AssetDeleteResult.DidNotDelete;
Debug.Log("::: DOTween deleted");
// DOTween is being deleted: deal with it // DOTween is being deleted: deal with it
// Remove EditorPrefs // Remove EditorPrefs
EditorPrefs.DeleteKey(Application.dataPath + DOTweenUtilityWindow.Id); EditorPrefs.DeleteKey(Application.dataPath + DOTweenUtilityWindow.Id);
@ -53,21 +54,24 @@ namespace DG.DOTweenEditor
static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths) static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
{ {
Debug.Log("::::::::::::::::::::: OnPostprocessAllAssets :::::::::::::::::::::::::::::");
if (_setupDialogRequested) return; if (_setupDialogRequested) return;
string[] dotweenEntries = System.Array.FindAll(importedAssets, name => name.Contains("DOTween") && !name.EndsWith(".meta") && !name.EndsWith(".jpg") && !name.EndsWith(".png")); string[] dotweenEntries = System.Array.FindAll(importedAssets, name => name.Contains("DOTween") && !name.EndsWith(".meta") && !name.EndsWith(".jpg") && !name.EndsWith(".png"));
bool dotweenImported = dotweenEntries.Length > 0; bool dotweenImported = dotweenEntries.Length > 0;
Debug.Log("::: DOTween imported: " + dotweenImported);
if (dotweenImported) { if (dotweenImported) {
// Delete old DOTween files // Delete old DOTween files
EditorUtils.DeleteLegacyNoModulesDOTweenFiles(); EditorUtils.DeleteLegacyNoModulesDOTweenFiles();
// Delete old DemiLib configuration // Delete old DemiLib configuration
EditorUtils.DeleteOldDemiLibCore(); EditorUtils.DeleteOldDemiLibCore();
// Remove old NoRigidbody define // Remove old legacy defines
EditorUtils.RemoveGlobalDefine(DOTweenSetup.GlobalDefine_Legacy_NoRigidbody); DOTweenSetup.RemoveAllLegacyDefines();
// //
bool differentCoreVersion = EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.Id) != Application.dataPath + DOTween.Version; 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 differentProVersion = EditorUtils.hasPro && EditorPrefs.GetString(Application.dataPath + DOTweenUtilityWindow.IdPro) != Application.dataPath + EditorUtils.proVersion;
bool setupRequired = differentCoreVersion || differentProVersion; bool setupRequired = differentCoreVersion || differentProVersion;
Debug.Log("::: Setup required: " + setupRequired + " - " + differentCoreVersion + "/" + differentProVersion);
if (setupRequired) { if (setupRequired) {
_setupDialogRequested = true; _setupDialogRequested = true;
EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.Id, Application.dataPath + DOTween.Version); EditorPrefs.SetString(Application.dataPath + DOTweenUtilityWindow.Id, Application.dataPath + DOTween.Version);

8
_DOTween.Assembly/PostBuild_DOTween.bat
View File

@ -47,7 +47,10 @@ set CopyToDirModulesTest=%1..\ModulesTest.Unity2018\Assets\Demigiant\%5%SubDir%
:: Modules test project :: Modules test project
echo ::: Exporting from %CopyFromDir% to %CopyToDirModulesTest% echo ::: Exporting from %CopyFromDir% to %CopyToDirModulesTest%
echo f | xcopy %CopyFromDir% %CopyToDirModulesTest% /Y /I /E echo f | xcopy %CopyFromDir% %CopyToDirModulesTest% /Y /I /E
:: exit /B :: UnityTests.Unity5
echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity5Tests%
echo f | xcopy %CopyFromDir% %CopyToDirUnity5Tests% /Y /I /E
exit /B
:: bin.Global :: bin.Global
echo ::: Exporting from %CopyFromDir% to %CopyToDir% echo ::: Exporting from %CopyFromDir% to %CopyToDir%
echo f | xcopy %CopyFromDir% %CopyToDir% /Y /I /E echo f | xcopy %CopyFromDir% %CopyToDir% /Y /I /E
@ -57,9 +60,6 @@ echo f | xcopy %CopyFromDir% %CopyToDirNoMeta% /Y /I /E
:: UnityTests.Unity4 :: UnityTests.Unity4
echo ::: Exporting from %CopyFromDir% to %CopyToDirUnityTests% echo ::: Exporting from %CopyFromDir% to %CopyToDirUnityTests%
echo f | xcopy %CopyFromDir% %CopyToDirUnityTests% /Y /I /E echo f | xcopy %CopyFromDir% %CopyToDirUnityTests% /Y /I /E
:: UnityTests.Unity5
echo ::: Exporting from %CopyFromDir% to %CopyToDirUnity5Tests%
echo f | xcopy %CopyFromDir% %CopyToDirUnity5Tests% /Y /I /E
:: UnityCompatibilityTests.Unity35 :: UnityCompatibilityTests.Unity35
echo ::: Exporting from %CopyFromDir% to %CopyToDirCompatibilityTests% echo ::: Exporting from %CopyFromDir% to %CopyToDirCompatibilityTests%
echo f | xcopy %CopyFromDir% %CopyToDirCompatibilityTests% /Y /I /E echo f | xcopy %CopyFromDir% %CopyToDirCompatibilityTests% /Y /I /E