Forráskód Böngészése

[unity] More robustness changes for asmdef files and Timeline support in Unity 2019, see #1326.

Harald Csaszar 6 éve
szülő
commit
b198c9b48d

+ 11 - 1
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs

@@ -1865,6 +1865,9 @@ namespace Spine.Unity.Editor {
 
 			internal static void HandleSuccessfulTimelinePackageDownload () {
 
+				#if !SPINE_TK2D
+				SpineBuildEnvUtility.EnableSpineAsmdefFiles();
+				#endif
 				SpineBuildEnvUtility.AddDependencyToAsmdefFile(TIMELINE_ASMDEF_DEPENDENCY_STRING);
 				SpineBuildEnvUtility.EnableBuildDefine(SPINE_TIMELINE_PACKAGE_DOWNLOADED_DEFINE);
 			}
@@ -1958,7 +1961,14 @@ namespace Spine.Unity.Editor {
 
 			if (System.IO.File.Exists(filePath)) {
 				string fileContent = File.ReadAllText(filePath);
-				// this simple implementation shall suffice for now.
+				
+				if (!fileContent.Contains("references")) {
+					string nameLine = string.Concat("\"name\": \"", asmdefName, "\"");
+					fileContent = fileContent.Replace(nameLine,
+													nameLine +
+													@",\n""references"": []");
+				}
+
 				if (!fileContent.Contains(dependencyName)) {
 					fileContent = fileContent.Replace(@"""references"": [",
 													@"""references"": [" + dependencyName);

+ 2 - 1
spine-unity/Assets/Spine/Runtime/spine-unity.txt

@@ -1,3 +1,4 @@
 {
-	"name": "spine-unity"
+	"name": "spine-unity",
+	"references": []
 }