add IgnoreBaseAttribute to skip auto gen event base

pangweiwei · Nov 26, 2015 · 7020492 · 7020492
1 parent 1655e36
commit 7020492
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/Assets/Plugins/Slua_Managed/LuaObject.cs b/Assets/Plugins/Slua_Managed/LuaObject.cs
@@ -68,6 +68,15 @@ public StaticExportAttribute()
 
     public class LuaOut { }
 
+	[AttributeUsage(AttributeTargets.Class)]
+	public class IgnoreBaseAttribute : System.Attribute
+	{
+		public IgnoreBaseAttribute()
+		{
+			//
+		}
+	}
+
 	public partial class LuaObject
 	{
 

diff --git a/Assets/Slua/Editor/LuaCodeGen.cs b/Assets/Slua/Editor/LuaCodeGen.cs
@@ -599,7 +599,7 @@ public bool Generate(Type t)
 					RegFunction(t, file);
 					End(file);
 
-					if (t.BaseType != null && t.BaseType.Name == "UnityEvent`1")
+					if (t.BaseType != null && t.BaseType.Name == "UnityEvent`1" && !t.IsDefined(typeof(IgnoreBaseAttribute),false))
 					{
 						string f = path + "LuaUnityEvent_" + _Name(GenericName(t.BaseType)) + ".cs";
 						file = new StreamWriter(f, false, Encoding.UTF8);

diff --git a/Assets/Slua/example/HelloWorld.cs b/Assets/Slua/example/HelloWorld.cs
@@ -13,7 +13,16 @@ public struct foostruct
 }
 
 [CustomLuaClass]
-public class SLuaTest : MonoBehaviour { }
+[IgnoreBase] // skip auto gen "UnityEngine.Events.UnityEvent<int>" to avoid conflict
+public class IntEvent : UnityEngine.Events.UnityEvent<int>
+{
+	public IntEvent() { }
+}
+
+[CustomLuaClass]
+public class SLuaTest : MonoBehaviour {
+	public IntEvent intevent;
+}
 
 [CustomLuaClass]
 public class XXList : List<int> { }