Merge pull request #41 from mackysoft/feature/new-object-from-json

Restore values from json on create new managed reference
mackysoft · Dec 31, 2023 · e6f57ed · e6f57ed
2 parents cdcbbed + 59da386
commit e6f57ed
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -28,9 +28,13 @@ jobs:
 
       # Build
       - name: Build .unitypackage
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v4
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          unityVersion: 2020.3.8f1
+          unityVersion: 2021.3.29f1
           buildMethod: MackySoft.PackageTools.Editor.UnityPackageExporter.Export
 
       # Upload

diff --git a/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs b/Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs
@@ -2,14 +2,27 @@
 using System;
 using System.Reflection;
 using UnityEditor;
+using UnityEngine;
 
 namespace MackySoft.SerializeReferenceExtensions.Editor {
 	public static class ManagedReferenceUtility {
 
 		public static object SetManagedReference (this SerializedProperty property,Type type) {
-			object obj = (type != null) ? Activator.CreateInstance(type) : null;
-			property.managedReferenceValue = obj;
-			return obj;
+			object result;
+			if (property.managedReferenceValue != null)
+			{
+				// Restore an previous values from json.
+				string json = JsonUtility.ToJson(property.managedReferenceValue);
+				result = JsonUtility.FromJson(json, type);
+			}
+			else
+			{
+				result = (type != null) ? Activator.CreateInstance(type) : null;
+			}
+
+			property.managedReferenceValue = result;
+			return result;
+
 		}
 
 		public static Type GetType (string typeName) {