Assets/Coffee/EditorExtensions/InjectablePropertyDrawer/Editor/PropertyGetterDelegate.cs

@@ -11,7 +11,7 @@ public static class PropertyGetterDelegate
 	{
 		const BindingFlags kBfAll = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.FlattenHierarchy;
 		static readonly Dictionary<Type,Dictionary<string, MemberInfo>> s_TypeMemberMap = new Dictionary<Type,Dictionary<string, MemberInfo>>();
-		static readonly Regex s_RegexArray = new Regex(@"^Array\.data\[([0-9]+)\]\.!?", RegexOptions.Compiled);
+		static readonly Regex s_RegexArray = new Regex(@"^Array\.data\[([0-9]+)\](\.!?|$)", RegexOptions.Compiled);
 		static readonly Regex s_RegexNested = new Regex(@"^(\w+)\.!?", RegexOptions.Compiled);
 		static readonly Dictionary<int,Func<object,object>> s_PropertyGetterMap = new Dictionary<int, Func<object, object>>();
 
@@ -20,51 +20,58 @@ public static class PropertyGetterDelegate
 		/// </summary>
 		public static object GetInstance(this SerializedProperty property)
 		{
-			int hash = property.propertyPath.GetHashCode();
-
-			// Find getter delegate.
-			Func<object,object> getter = null;
-			if (s_PropertyGetterMap.TryGetValue(hash, out getter))
+			try
 			{
-				return getter(property);
-			}
+				int hash = property.propertyPath.GetHashCode();
 
-			// Create getter delegate.
-			object instance;
-			string path = property.propertyPath;
-			getter = p => (p as SerializedProperty).serializedObject.targetObject;
-			while (0 < path.Length)
-			{
-				var preGetter = getter;
-				instance = preGetter(property);
-				Match match;
-
-				// Array property.
-				if ((match = s_RegexArray.Match(path)).Success)
-				{
-					var arg = new object[]{ int.Parse(match.Groups[1].Value) };
-					var mi = instance.GetMemberInfo("get_Item", MemberTypes.Method) as MethodInfo;
-					getter = x => mi.Invoke(preGetter(x), arg);
-					path = s_RegexArray.Replace(path, "");
-				}
-				// Nested property.
-				else if ((match = s_RegexNested.Match(path)).Success)
+				// Find getter delegate.
+				Func<object,object> getter = null;
+				if (s_PropertyGetterMap.TryGetValue(hash, out getter))
 				{
-					var fi = instance.GetMemberInfo(match.Groups[1].Value, MemberTypes.Field) as FieldInfo;
-					getter = x => fi.GetValue(preGetter(x));
-					path = s_RegexNested.Replace(path, "");
+					return getter(property);
 				}
-				// Property.
-				else
+
+				// Create getter delegate.
+				object instance;
+				string path = property.propertyPath;
+				getter = p => (p as SerializedProperty).serializedObject.targetObject;
+				while (0 < path.Length)
 				{
-					var fi = instance.GetMemberInfo(path, MemberTypes.Field) as FieldInfo;
-					getter = x => fi.GetValue(preGetter(x));
-					break;
+					var preGetter = getter;
+					instance = preGetter(property);
+					Match match;
+
+					// Array property.
+					if ((match = s_RegexArray.Match(path)).Success)
+					{
+						var arg = new object[]{ int.Parse(match.Groups[1].Value) };
+						var mi = instance.GetMemberInfo(instance is Array ? "Get" : "get_Item", MemberTypes.Method) as MethodInfo;
+						getter = x => mi.Invoke(preGetter(x), arg);
+						path = s_RegexArray.Replace(path, "");
+					}
+					// Nested property.
+					else if ((match = s_RegexNested.Match(path)).Success)
+					{
+						var fi = instance.GetMemberInfo(match.Groups[1].Value, MemberTypes.Field) as FieldInfo;
+						getter = x => fi.GetValue(preGetter(x));
+						path = s_RegexNested.Replace(path, "");
+					}
+					// Property.
+					else
+					{
+						var fi = instance.GetMemberInfo(path, MemberTypes.Field) as FieldInfo;
+						getter = x => fi.GetValue(preGetter(x));
+						break;
+					}
 				}
-			}
-			s_PropertyGetterMap.Add(hash, getter);
+				s_PropertyGetterMap.Add(hash, getter);
 
-			return getter(property);
+				return getter(property);
+			}
+			catch
+			{
+				return null;
+			}
 		}
 
 		/// <summary>

Assets/Coffee/EditorExtensions/InjectablePropertyDrawer/Editor/UnityEventDrawerEx.cs

@@ -173,7 +173,10 @@ static void DrawDelegate(Rect position, Delegate del)
 		public static IList GetRuntimeCalls(SerializedProperty property)
 		{
 			var propertyInstance = property.GetInstance();
-			return s_FiRuntimeCalls.GetValue(s_FiCalls.GetValue(propertyInstance)) as IList;
+
+			return propertyInstance != null
+				? s_FiRuntimeCalls.GetValue(s_FiCalls.GetValue(propertyInstance)) as IList
+				: new List<object>() as IList;
 		}
 	}
 

Assets/Test/TestBehavior.cs

@@ -1,5 +1,7 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
+using System.Collections.Generic;
+
 
 public class TestBehavior : MonoBehaviour
 {
@@ -8,7 +10,21 @@ public class TestBehavior : MonoBehaviour
 
 	};
 
-	[SerializeField] TransformUnityEvent onYourCustomEvent = new TransformUnityEvent();
+	[System.Serializable]
+	public class Nested
+	{
+		public TransformUnityEvent nestedEvent = new TransformUnityEvent();
+		public TransformUnityEvent[] nestedEventArray = new TransformUnityEvent[]{};
+		public List<TransformUnityEvent> nestedEventList = new List<TransformUnityEvent>();
+	}
+
+	public TransformUnityEvent onYourCustomEvent = new TransformUnityEvent();
+	public TransformUnityEvent[] onYourCustomEventArray = new TransformUnityEvent[]{};
+	public List<TransformUnityEvent> onYourCustomEventList = new List<TransformUnityEvent>();
+
+	public Nested nested = new Nested();
+	public Nested[] nestedArray = new Nested[]{};
+	public List<Nested> nestedList = new List<Nested>{};
 
 	void OnEnable()
 	{

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [v0.4.0](https://github.com/mob-sakai/UnityEventDrawerEx/tree/v0.4.0) (2018-06-18)
+
+[Full Changelog](https://github.com/mob-sakai/UnityEventDrawerEx/compare/v0.3.0...v0.4.0)
+
+Supports UnityEvent collection such as `List<UnityEvent>` and `UnityEvent[]`.
+
+**Fixed bugs:**
+
+- Error has occurred with UnityEvent collection such as List\<UnityEvent\> and UnityEvent\[\]. [\#13](https://github.com/mob-sakai/UnityEventDrawerEx/issues/13)
+
 ## [v0.3.0](https://github.com/mob-sakai/UnityEventDrawerEx/tree/v0.3.0) (2018-06-11)
 
 [Full Changelog](https://github.com/mob-sakai/UnityEventDrawerEx/compare/v0.2.0...v0.3.0)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "UnityEventDrawerEx",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mob-sakai/UnityEventDrawerEx.git"