更新tolua#到1.0.6.253版

Author: jarjin2000

Assets/LuaFramework/ToLua/Editor/ToLuaExport.cs

@@ -3254,6 +3254,25 @@ public static Delegate CreateDelegate(Type t, LuaFunction func = null)
         {
             throw new LuaException(string.Format(""Delegate {0} not register"", LuaMisc.GetTypeName(t)));            
         }
+
+        if (func != null)
+        {
+            int luaFunctionRef = func.GetReference();
+            WeakReference luaDelegateWeakRef = null;
+            if (!luaDelegateDict.TryGetValue(luaFunctionRef, out luaDelegateWeakRef) || luaDelegateWeakRef == null || !luaDelegateWeakRef.IsAlive)
+            {
+                Delegate d = create(func, null, false);
+                luaDelegateWeakRef = new WeakReference(d.Target);
+                luaDelegateDict[luaFunctionRef] = luaDelegateWeakRef;
+                return d;
+            }
+
+            LuaDelegate luaDelegate = luaDelegateWeakRef.Target as LuaDelegate;
+            if (luaDelegate.self == null)
+                return Delegate.CreateDelegate(t, luaDelegate, ""Call"");
+            else
+                return Delegate.CreateDelegate(t, luaDelegate, ""CallWithSelf"");
+        }
         
         return create(func, null, false);        
     }
@@ -3440,6 +3459,7 @@ public static void GenDelegates(DelegateType[] list)
         sb.Append("{\r\n");        
         sb.Append("\tpublic delegate Delegate DelegateValue(LuaFunction func, LuaTable self, bool flag);\r\n");
         sb.Append("\tpublic static Dictionary<Type, DelegateValue> dict = new Dictionary<Type, DelegateValue>();\r\n");
+        sb.Append("\tpublic static Dictionary<int, WeakReference> luaDelegateDict = new Dictionary<int, WeakReference>();\r\n");
         sb.AppendLineEx();
         sb.Append("\tstatic DelegateFactory()\r\n");
         sb.Append("\t{\r\n");

Assets/LuaFramework/ToLua/Misc/LuaClient.cs

@@ -25,7 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections;
 using System.IO;
 using System;
+
+#if UNITY_5_4
 using UnityEngine.SceneManagement;
+#endif
 
 public class LuaClient : MonoBehaviour
 {

Assets/LuaFramework/ToLua/Source/Generate/DelegateFactory.cs

@@ -7,6 +7,7 @@ public static class DelegateFactory
 {
 	public delegate Delegate DelegateValue(LuaFunction func, LuaTable self, bool flag);
 	public static Dictionary<Type, DelegateValue> dict = new Dictionary<Type, DelegateValue>();
+	public static Dictionary<int, WeakReference> luaDelegateDict = new Dictionary<int, WeakReference>();
 
 	static DelegateFactory()
 	{
@@ -28,6 +29,25 @@ public static Delegate CreateDelegate(Type t, LuaFunction func = null)
         {
             throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t)));            
         }
+
+        if (func != null)
+        {
+            int luaFunctionRef = func.GetReference();
+            WeakReference luaDelegateWeakRef = null;
+            if (!luaDelegateDict.TryGetValue(luaFunctionRef, out luaDelegateWeakRef) || luaDelegateWeakRef == null || !luaDelegateWeakRef.IsAlive)
+            {
+                Delegate d = create(func, null, false);
+                luaDelegateWeakRef = new WeakReference(d.Target);
+                luaDelegateDict[luaFunctionRef] = luaDelegateWeakRef;
+                return d;
+            }
+
+            LuaDelegate luaDelegate = luaDelegateWeakRef.Target as LuaDelegate;
+            if (luaDelegate.self == null)
+                return Delegate.CreateDelegate(t, luaDelegate, "Call");
+            else
+                return Delegate.CreateDelegate(t, luaDelegate, "CallWithSelf");
+        }
 
         return create(func, null, false);        
     }