fix: ldtkc files will now read/write object references with a guid to deserialize properly and to not dirty source control unnessesarily

Cammin · Cammin · commit 010cf9d947b0 · 2024-12-11T10:27:26.000-08:00
diff --git a/Assets/LDtkUnity/Editor/Utility/Artifacts/LDtkConfigData.cs b/Assets/LDtkUnity/Editor/Utility/Artifacts/LDtkConfigData.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.IO;
 using System.Text;
+using UnityEditor;
 using UnityEngine;
 
 namespace LDtkUnity.Editor
@@ -23,7 +24,7 @@ internal struct LDtkConfigData
         internal string WriteJson(string projectAssetPath)
         {
             string writePath = GetPath(projectAssetPath);
-            string json = JsonUtility.ToJson(this, true);
+            string json = EditorJsonUtility.ToJson(this, true);
             byte[] byteArray = Encoding.UTF8.GetBytes(json);
             
             LDtkPathUtility.TryCreateDirectoryForFile(writePath);
@@ -41,7 +42,10 @@ internal static LDtkConfigData ReadJson(string assetPath)
 
             byte[] bytes = File.ReadAllBytes(assetPath);
             string json = Encoding.UTF8.GetString(bytes);
-            return JsonUtility.FromJson<LDtkConfigData>(json);
+
+            LDtkConfigData data = new LDtkConfigData();
+            EditorJsonUtility.FromJsonOverwrite(json, data);
+            return data;
         }
         
         internal static string GetPath(string projectAssetPath)
diff --git a/Assets/LDtkUnity/Samples~/Samples/SeparateLevelFiles/SeparateLevelFiles_Config.ldtkc b/Assets/LDtkUnity/Samples~/Samples/SeparateLevelFiles/SeparateLevelFiles_Config.ldtkc
@@ -13,7 +13,9 @@
         {
             "_key": "IntGrid_1",
             "_asset": {
-                "instanceID": 22226
+                "fileID": 11400000,
+                "guid": "85c839224be7398449b593cedc9d81ca",
+                "type": 2
             }
         }
     ],
diff --git a/Assets/Tests/Misc/OtherTechTests/DependencyTest/TestIntGridValueDependency/TestIntGridValueDependency_Config.ldtkc b/Assets/Tests/Misc/OtherTechTests/DependencyTest/TestIntGridValueDependency/TestIntGridValueDependency_Config.ldtkc
@@ -13,19 +13,25 @@
         {
             "_key": "IntGrid_1",
             "_asset": {
-                "instanceID": 29410
+                "fileID": 11400000,
+                "guid": "019c844af99991d409a134bcc556b3b1",
+                "type": 2
             }
         },
         {
             "_key": "IntGrid_2",
             "_asset": {
-                "instanceID": 28118
+                "fileID": 11400000,
+                "guid": "aee5cec04e488604cb16a7da061946bc",
+                "type": 2
             }
         },
         {
             "_key": "IntGrid_3",
             "_asset": {
-                "instanceID": 24110
+                "fileID": 11400000,
+                "guid": "62504a226f3487f49af1e37703e72136",
+                "type": 2
             }
         }
     ],
diff --git a/Assets/Tests/Misc/OtherTechTests/LevelsVania/LevelsVania_Config.ldtkc b/Assets/Tests/Misc/OtherTechTests/LevelsVania/LevelsVania_Config.ldtkc
@@ -13,7 +13,9 @@
         {
             "_key": "Collisions_1",
             "_asset": {
-                "instanceID": 25948
+                "fileID": 11400000,
+                "guid": "608aedeab5fb3ac48959b083b4ecd7c1",
+                "type": 2
             }
         },
         {
@@ -27,37 +29,49 @@
         {
             "_key": "Item",
             "_asset": {
-                "instanceID": 30982
+                "fileID": 6381717676898315408,
+                "guid": "154ba3503afd20d4580ff3f817fd2177",
+                "type": 3
             }
         },
         {
             "_key": "Player",
             "_asset": {
-                "instanceID": 33704
+                "fileID": 6381717676898315408,
+                "guid": "2c40888790883084b832d4183474c09a",
+                "type": 3
             }
         },
         {
             "_key": "Exit",
             "_asset": {
-                "instanceID": 31998
+                "fileID": 6381717676898315408,
+                "guid": "109ac9123036bb24ca5866d7aa81f4b3",
+                "type": 3
             }
         },
         {
             "_key": "SecretArea",
             "_asset": {
-                "instanceID": 31288
+                "fileID": 6381717676898315408,
+                "guid": "455e2726c152eb946bab81090f7c0afa",
+                "type": 3
             }
         },
         {
             "_key": "Teleport",
             "_asset": {
-                "instanceID": 30554
+                "fileID": 6381717676898315408,
+                "guid": "9958dbc3bfc14c64ba545adf3467ed50",
+                "type": 3
             }
         },
         {
             "_key": "Ladder",
             "_asset": {
-                "instanceID": 30794
+                "fileID": 6381717676898315408,
+                "guid": "4bd923e45ce962547bb6ae2dd76a5984",
+                "type": 3
             }
         }
     ]
diff --git a/Assets/Tests/Misc/OtherTechTests/TestAllFieldsLevels/TestAllFieldsLevels_Config.ldtkc b/Assets/Tests/Misc/OtherTechTests/TestAllFieldsLevels/TestAllFieldsLevels_Config.ldtkc
@@ -14,19 +14,25 @@
         {
             "_key": "TestAllFields",
             "_asset": {
-                "instanceID": 43784
+                "fileID": 2518318380925621618,
+                "guid": "3222c3d6e0104884eb44c4821f66e354",
+                "type": 3
             }
         },
         {
             "_key": "NoFields",
             "_asset": {
-                "instanceID": 43824
+                "fileID": 2518318380925621618,
+                "guid": "be7f9038a4c1bc04d9d62adff8d0cab8",
+                "type": 3
             }
         },
         {
             "_key": "TestAllNullable",
             "_asset": {
-                "instanceID": 43832
+                "fileID": 2518318380925621618,
+                "guid": "55ee5e096e24b4542bc1968b36e6c019",
+                "type": 3
             }
         }
     ]
diff --git a/Assets/Tests/Misc/OtherTechTests/Test_file_for_API_showing_all_featuresLevels/Test_file_for_API_showing_all_featuresLevels_Config.ldtkc b/Assets/Tests/Misc/OtherTechTests/Test_file_for_API_showing_all_featuresLevels/Test_file_for_API_showing_all_featuresLevels_Config.ldtkc
@@ -45,31 +45,41 @@
         {
             "_key": "EntityFieldsTest",
             "_asset": {
-                "instanceID": 70644
+                "fileID": 8271057754295682963,
+                "guid": "8edc4af9ae4379948ac2d95a7603e233",
+                "type": 3
             }
         },
         {
             "_key": "Labels",
             "_asset": {
-                "instanceID": 70646
+                "fileID": 8271057754295682963,
+                "guid": "651dd273af932094fbe35791264dcfa4",
+                "type": 3
             }
         },
         {
             "_key": "RectRegion",
             "_asset": {
-                "instanceID": 70648
+                "fileID": 8271057754295682963,
+                "guid": "e355c9bebb8a0fe458316f819cb5df56",
+                "type": 3
             }
         },
         {
             "_key": "CircleRegion",
             "_asset": {
-                "instanceID": 70650
+                "fileID": 8271057754295682963,
+                "guid": "9a9f4260bc1dd5444a09370d4abf42f8",
+                "type": 3
             }
         },
         {
             "_key": "EntityRefTest",
             "_asset": {
-                "instanceID": 70650
+                "fileID": 8271057754295682963,
+                "guid": "9a9f4260bc1dd5444a09370d4abf42f8",
+                "type": 3
             }
         }
     ]

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@`
`13`	`13`	`{`
`14`	`14`	`"_key": "IntGrid_1",`
`15`	`15`	`"_asset": {`
`16`		`- "instanceID": 22226`
	`16`	`+ "fileID": 11400000,`
	`17`	`+ "guid": "85c839224be7398449b593cedc9d81ca",`
	`18`	`+ "type": 2`
`17`	`19`	`}`
`18`	`20`	`}`
`19`	`21`	`],`
Original file line number	Diff line number	Diff line change
`@@ -13,19 +13,25 @@`
`13`	`13`	`{`
`14`	`14`	`"_key": "IntGrid_1",`
`15`	`15`	`"_asset": {`
`16`		`- "instanceID": 29410`
	`16`	`+ "fileID": 11400000,`
	`17`	`+ "guid": "019c844af99991d409a134bcc556b3b1",`
	`18`	`+ "type": 2`
`17`	`19`	`}`
`18`	`20`	`},`
`19`	`21`	`{`
`20`	`22`	`"_key": "IntGrid_2",`
`21`	`23`	`"_asset": {`
`22`		`- "instanceID": 28118`
	`24`	`+ "fileID": 11400000,`
	`25`	`+ "guid": "aee5cec04e488604cb16a7da061946bc",`
	`26`	`+ "type": 2`
`23`	`27`	`}`
`24`	`28`	`},`
`25`	`29`	`{`
`26`	`30`	`"_key": "IntGrid_3",`
`27`	`31`	`"_asset": {`
`28`		`- "instanceID": 24110`
	`32`	`+ "fileID": 11400000,`
	`33`	`+ "guid": "62504a226f3487f49af1e37703e72136",`
	`34`	`+ "type": 2`
`29`	`35`	`}`
`30`	`36`	`}`
`31`	`37`	`],`
Original file line number	Diff line number	Diff line change
`@@ -14,19 +14,25 @@`
`14`	`14`	`{`
`15`	`15`	`"_key": "TestAllFields",`
`16`	`16`	`"_asset": {`
`17`		`- "instanceID": 43784`
	`17`	`+ "fileID": 2518318380925621618,`
	`18`	`+ "guid": "3222c3d6e0104884eb44c4821f66e354",`
	`19`	`+ "type": 3`
`18`	`20`	`}`
`19`	`21`	`},`
`20`	`22`	`{`
`21`	`23`	`"_key": "NoFields",`
`22`	`24`	`"_asset": {`
`23`		`- "instanceID": 43824`
	`25`	`+ "fileID": 2518318380925621618,`
	`26`	`+ "guid": "be7f9038a4c1bc04d9d62adff8d0cab8",`
	`27`	`+ "type": 3`
`24`	`28`	`}`
`25`	`29`	`},`
`26`	`30`	`{`
`27`	`31`	`"_key": "TestAllNullable",`
`28`	`32`	`"_asset": {`
`29`		`- "instanceID": 43832`
	`33`	`+ "fileID": 2518318380925621618,`
	`34`	`+ "guid": "55ee5e096e24b4542bc1968b36e6c019",`
	`35`	`+ "type": 3`
`30`	`36`	`}`
`31`	`37`	`}`
`32`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -45,31 +45,41 @@`
`45`	`45`	`{`
`46`	`46`	`"_key": "EntityFieldsTest",`
`47`	`47`	`"_asset": {`
`48`		`- "instanceID": 70644`
	`48`	`+ "fileID": 8271057754295682963,`
	`49`	`+ "guid": "8edc4af9ae4379948ac2d95a7603e233",`
	`50`	`+ "type": 3`
`49`	`51`	`}`
`50`	`52`	`},`
`51`	`53`	`{`
`52`	`54`	`"_key": "Labels",`
`53`	`55`	`"_asset": {`
`54`		`- "instanceID": 70646`
	`56`	`+ "fileID": 8271057754295682963,`
	`57`	`+ "guid": "651dd273af932094fbe35791264dcfa4",`
	`58`	`+ "type": 3`
`55`	`59`	`}`
`56`	`60`	`},`
`57`	`61`	`{`
`58`	`62`	`"_key": "RectRegion",`
`59`	`63`	`"_asset": {`
`60`		`- "instanceID": 70648`
	`64`	`+ "fileID": 8271057754295682963,`
	`65`	`+ "guid": "e355c9bebb8a0fe458316f819cb5df56",`
	`66`	`+ "type": 3`
`61`	`67`	`}`
`62`	`68`	`},`
`63`	`69`	`{`
`64`	`70`	`"_key": "CircleRegion",`
`65`	`71`	`"_asset": {`
`66`		`- "instanceID": 70650`
	`72`	`+ "fileID": 8271057754295682963,`
	`73`	`+ "guid": "9a9f4260bc1dd5444a09370d4abf42f8",`
	`74`	`+ "type": 3`
`67`	`75`	`}`
`68`	`76`	`},`
`69`	`77`	`{`
`70`	`78`	`"_key": "EntityRefTest",`
`71`	`79`	`"_asset": {`
`72`		`- "instanceID": 70650`
	`80`	`+ "fileID": 8271057754295682963,`
	`81`	`+ "guid": "9a9f4260bc1dd5444a09370d4abf42f8",`
	`82`	`+ "type": 3`
`73`	`83`	`}`
`74`	`84`	`}`
`75`	`85`	`]`