feat: Update package.json to 1.2.2

Fixed a bug when trying to deserialize a null type with FromJson.

.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

.github/workflows/release.yaml

@@ -61,10 +61,10 @@ jobs:
     needs: [update-packagejson]
     strategy:
       matrix:
-        unity: ["2020.3.8f1"]
+        unity: ["2021.3.29f1"]
         include:
-          - unityVersion: 2020.3.8f1
+          - unityVersion: 2021.3.29f1
-            license: UNITY_LICENSE_2020
+            license: UNITY_LICENSE
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -74,9 +74,11 @@ jobs:
           ref: ${{ needs.update-packagejson.outputs.sha }}
 
       - name: Export unitypackage
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v4
         env:
-          UNITY_LICENSE: ${{ secrets[matrix.license] }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
           projectPath: .
           unityVersion: ${{ matrix.unityVersion }}

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/CopyAndPasteProperty.cs

@@ -0,0 +1,67 @@
+// NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.
+#if UNITY_2021_3_OR_NEWER
+using UnityEditor;
+using UnityEngine;
+
+namespace MackySoft.SerializeReferenceExtensions.Editor
+{
+	public static class CopyAndPasteProperty
+	{
+
+		const string kCopiedPropertyPathKey = "SerializeReferenceExtensions.CopiedPropertyPath";
+		const string kClipboardKey = "SerializeReferenceExtensions.CopyAndPasteProperty";
+
+		static readonly GUIContent kPasteContent = new GUIContent("Paste Property");
+
+		[InitializeOnLoadMethod]
+		static void Initialize ()
+		{
+			EditorApplication.contextualPropertyMenu += OnContextualPropertyMenu;
+		}
+
+		static void OnContextualPropertyMenu (GenericMenu menu, SerializedProperty property)
+		{
+			if (property.propertyType == SerializedPropertyType.ManagedReference)
+			{
+				// NOTE: When the callback function is called, the SerializedProperty is rewritten to the property that was being moused over at the time,
+				// so a new SerializedProperty instance must be created.
+				SerializedProperty clonedProperty = property.Copy();
+
+				menu.AddItem(new GUIContent($"Copy \"{property.propertyPath}\" property"), false, Copy, clonedProperty);
+
+				string copiedPropertyPath = SessionState.GetString(kCopiedPropertyPathKey, string.Empty);
+				if (!string.IsNullOrEmpty(copiedPropertyPath))
+				{
+					menu.AddItem(new GUIContent($"Paste \"{copiedPropertyPath}\" property"), false, Paste, clonedProperty);
+				}
+				else
+				{
+					menu.AddDisabledItem(kPasteContent);
+				}
+			}
+		}
+
+		static void Copy (object customData)
+		{
+			SerializedProperty property = (SerializedProperty)customData;
+			string json = JsonUtility.ToJson(property.managedReferenceValue);
+			SessionState.SetString(kCopiedPropertyPathKey, property.propertyPath);
+			SessionState.SetString(kClipboardKey, json);
+		}
+
+		static void Paste (object customData)
+		{
+			SerializedProperty property = (SerializedProperty)customData;
+			string json = SessionState.GetString(kClipboardKey, string.Empty);
+			if (string.IsNullOrEmpty(json))
+			{
+				return;
+			}
+
+			Undo.RecordObject(property.serializedObject.targetObject, "Paste Property");
+			JsonUtility.FromJsonOverwrite(json, property.managedReferenceValue);
+			property.serializedObject.ApplyModifiedProperties();
+		}
+	}
+}
+#endif

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/CopyAndPasteProperty.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 734d3eb8da4785b49919aea6db62d877
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs

@@ -2,14 +2,32 @@
 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;
+			object result = null;
-			property.managedReferenceValue = obj;
+
-			return obj;
+#if UNITY_2021_3_OR_NEWER
+			// NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.
+			if (property.managedReferenceValue != null && type != null)
+			{
+				// Restore an previous values from json.
+				string json = JsonUtility.ToJson(property.managedReferenceValue);
+				result = JsonUtility.FromJson(json, type);
+			}
+#endif
+
+			if (result == null)
+			{
+				result = (type != null) ? Activator.CreateInstance(type) : null;
+			}
+			
+			property.managedReferenceValue = result;
+			return result;
+
 		}
 
 		public static Type GetType (string typeName) {

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs

@@ -25,6 +25,8 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 
 		static Type GetCustomPropertyDrawerType (Type type)
 		{
+			Type[] interfaceTypes = type.GetInterfaces();
+			
 			foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
 			{
 				foreach (Type drawerType in assembly.GetTypes())
@@ -36,9 +38,39 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 						if (field != null)
 						{
 							var fieldType = field.GetValue(customPropertyDrawer) as Type;
-							if (fieldType != null && fieldType == type)
+							if (fieldType != null)
 							{
-								return drawerType;
+								if (fieldType == type)
+								{
+									return drawerType;
+								}
+								
+								// If the property drawer also allows for being applied to child classes, check if they match
+								var useForChildrenField = customPropertyDrawer.GetType().GetField("m_UseForChildren", BindingFlags.NonPublic | BindingFlags.Instance);
+								if (useForChildrenField != null)
+								{
+									object useForChildrenValue = useForChildrenField.GetValue(customPropertyDrawer);
+									if (useForChildrenValue is bool && (bool)useForChildrenValue)
+									{
+										// Check interfaces
+										if (Array.Exists(interfaceTypes, interfaceType => interfaceType == fieldType))
+										{
+											return drawerType;
+										}
+
+										// Check derived types
+										Type baseType = type.BaseType;
+										while (baseType != null)
+										{
+											if (baseType == fieldType)
+											{
+												return drawerType;
+											}
+
+											baseType = baseType.BaseType;
+										}
+									}
+								}
 							}
 						}
 					}

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs

@@ -35,12 +35,14 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 			EditorGUI.BeginProperty(position,label,property);
 
 			if (property.propertyType == SerializedPropertyType.ManagedReference) {
-				// Draw the subclass selector popup.
-				Rect popupPosition = new Rect(position);
-				popupPosition.width -= EditorGUIUtility.labelWidth;
-				popupPosition.x += EditorGUIUtility.labelWidth;
-				popupPosition.height = EditorGUIUtility.singleLineHeight;
 
+				// render label first to avoid label overlap for lists
+				Rect foldoutLabelRect = new Rect(position);
+				foldoutLabelRect.height = EditorGUIUtility.singleLineHeight;
+				foldoutLabelRect.x += EditorGUI.indentLevel * 12;
+				Rect popupPosition = EditorGUI.PrefixLabel(foldoutLabelRect, label);
+
+				// Draw the subclass selector popup.
 				if (EditorGUI.DropdownButton(popupPosition,GetTypeName(property),FocusType.Keyboard)) {
 					TypePopupCache popup = GetTypePopup(property);
 					m_TargetProperty = property;
@@ -54,7 +56,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 					// Draw the property with custom property drawer.
 					Rect foldoutRect = new Rect(position);
 					foldoutRect.height = EditorGUIUtility.singleLineHeight;
-					property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, label, true);
+					property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, GUIContent.none, true);
 
 					if (property.isExpanded)
 					{
@@ -70,7 +72,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 				}
 				else
 				{
-					EditorGUI.PropertyField(position, property, label, true);
+					EditorGUI.PropertyField(position, property, GUIContent.none, true);
 				}
 			} else {
 				EditorGUI.LabelField(position,label,k_IsNotManagedReferenceLabel);

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/package.json

@@ -1,8 +1,9 @@
 {
 	"name": "com.mackysoft.serializereference-extensions",
 	"displayName": "SerializeReference Extensions",
-	"version": "1.1.9",
+	"author": { "name": "MackySoft", "url": "https://github.com/mackysoft" },
-	"unity": "2019.4",
+	"version": "1.2.2",
+	"unity": "2021.3",
 	"description": "Provide popup to specify the type of the field serialized by the [SerializeReference] attribute in the inspector.",
 	"keywords": [ "SerializeReference", "Editor" ],
 	"license": "MIT",

README.md

@@ -15,9 +15,18 @@ The `SubclassSelector` attribute allows you to easily set subclasses of those ab
 - Easily set subclass by popup.
 - **[New]** Type finding by fuzzy finder.
 - **[New]** Override the type name and path by the `AddTypeMenu` attribute.
+- **[New]** Available `CustomPropertyDrawer` for subclasses.
+- **[New]** Restore values of previous object from JSON when subclass is changed. (required Unity 2021.3 or later)
+- **[New]** Copy & Paste the subclass properties. (required Unity 2021.3 or later)
+
+> See below for the reason for the limitation of versions less than Unity 2021.3.
+> 
+> https://blog.unity.com/engine-platform/serializereference-improvements-in-unity-2021-lts
 
 ## 📥 Installation
 
+#### Install via `.unitypackage`
+
 Download any version from releases.
 
 Releases: https://github.com/mackysoft/Unity-SerializeReferenceExtensions/releases
@@ -26,10 +35,17 @@ Releases: https://github.com/mackysoft/Unity-SerializeReferenceExtensions/releas
 
 Or, you can add this package by opening PackageManager and entering
 
-`https://github.com/mackysoft/Unity-SerializeReferenceExtensions.git?path=Assets/MackySoft/MackySoft.SerializeReferenceExtensions`
+```
+https://github.com/mackysoft/Unity-SerializeReferenceExtensions.git?path=Assets/MackySoft/MackySoft.SerializeReferenceExtensions
+```
 
 from the `Add package from git URL` option.
 
+If you are specifying a version, enter `#{VERSION}` at the end, as shown below.
+
+```
+https://github.com/mackysoft/Unity-SerializeReferenceExtensions.git?path=Assets/MackySoft/MackySoft.SerializeReferenceExtensions#1.1.9
+```
 
 #### Install via Open UPM