更新tolua#到1.0.6.289版

Author: jarjin2000

Assets/LuaFramework/Editor/CustomSettings.cs

@@ -108,17 +108,22 @@ public static class CustomSettings
         _GT(typeof(AsyncOperation)).SetBaseType(typeof(System.Object)),        
         _GT(typeof(LightType)),
         _GT(typeof(SleepTimeout)),
+#if UNITY_5_3_OR_NEWER
+        _GT(typeof(UnityEngine.Experimental.Director.DirectorPlayer)),
+#endif
         _GT(typeof(Animator)),
         _GT(typeof(Input)),
         _GT(typeof(KeyCode)),
         _GT(typeof(SkinnedMeshRenderer)),
         _GT(typeof(Space)),      
 
 
-        _GT(typeof(MeshRenderer)),            
+        _GT(typeof(MeshRenderer)),
+#if !UNITY_5_4_OR_NEWER
         _GT(typeof(ParticleEmitter)),
         _GT(typeof(ParticleRenderer)),
         _GT(typeof(ParticleAnimator)), 
+#endif
 
         _GT(typeof(BoxCollider)),
         _GT(typeof(MeshCollider)),
@@ -137,7 +142,8 @@ public static class CustomSettings
         _GT(typeof(QualitySettings)),
         _GT(typeof(RenderSettings)),                                                   
         _GT(typeof(BlendWeights)),           
-        _GT(typeof(RenderTexture)),       
+        _GT(typeof(RenderTexture)),  
+		_GT(typeof(Resources)),     
 
         //for LuaFramework
         _GT(typeof(UIPanel)),
@@ -163,9 +169,11 @@ public static class CustomSettings
     public static List<Type> dynamicList = new List<Type>()
     {
         typeof(MeshRenderer),
+#if !UNITY_5_4_OR_NEWER
         typeof(ParticleEmitter),
         typeof(ParticleRenderer),
         typeof(ParticleAnimator),
+#endif
 
         typeof(BoxCollider),
         typeof(MeshCollider),

Assets/LuaFramework/ToLua/Core/LuaFunction.cs

@@ -61,6 +61,11 @@ public override void Dispose()
             base.Dispose();
         }
 
+        public T ToDelegate<T>() where T: class
+        {
+            return DelegateFactory.CreateDelegate(typeof(T), this) as T;
+        }
+
         public virtual int BeginPCall()
         {
             if (luaState == null)
@@ -353,11 +358,16 @@ public void PushArgs(object[] args)
             luaState.PushArgs(args);
         }
 
-        public void PushByteBuffer(byte[] buffer)
+        public void PushByteBuffer(byte[] buffer, int len = -1)
         {
             try
             {
-                luaState.PushByteBuffer(buffer);
+                if (len == -1)
+                {
+                    len = buffer.Length;
+                }
+
+                luaState.PushByteBuffer(buffer, len);
                 ++argCount;
             }
             catch (Exception e)

Assets/LuaFramework/ToLua/Examples/05_LuaCoroutine/TestCoroutine.cs

@@ -46,5 +46,10 @@ void OnGUI()
             func.Call();
             func.Dispose();
         }
+        else if (GUI.Button(new Rect(50, 250, 120, 45), "GC"))
+        {
+            lua.DoString("collectgarbage('collect')", "TestCoroutine.cs");
+            Resources.UnloadUnusedAssets();
+        }
     }
 }

Assets/LuaFramework/ToLua/Lua/misc/functions.lua

@@ -2,6 +2,20 @@ local require = require
 local string = string
 local table = table
 
+function string.split(input, delimiter)
+    input = tostring(input)
+    delimiter = tostring(delimiter)
+    if (delimiter=='') then return false end
+    local pos,arr = 0, {}
+    -- for each divider found
+    for st,sp in function() return string.find(input, delimiter, pos, true) end do
+        table.insert(arr, string.sub(input, pos, st - 1))
+        pos = sp + 1
+    end
+    table.insert(arr, string.sub(input, pos))
+    return arr
+end
+
 function import(moduleName, currentModuleName)
     local currentModuleNameParts
     local moduleFullName = moduleName

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

@@ -5,19 +5,19 @@
 
 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 delegate Delegate DelegateValue(LuaFunction func, LuaTable self, bool flag);
+	public static Dictionary<Type, DelegateValue> dict = new Dictionary<Type, DelegateValue>();
 
-    static DelegateFactory()
-    {
-        Register();
-    }
+	static DelegateFactory()
+	{
+		Register();
+	}
 
-    [NoToLuaAttribute]
-    public static void Register()
-    {
-        dict.Clear();
-    }
+	[NoToLuaAttribute]
+	public static void Register()
+	{
+		dict.Clear();
+	}
 
     [NoToLuaAttribute]
     public static Delegate CreateDelegate(Type t, LuaFunction func = null)
@@ -26,28 +26,28 @@ public static Delegate CreateDelegate(Type t, LuaFunction func = null)
 
         if (!dict.TryGetValue(t, out Create))
         {
-            throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t)));
+            throw new LuaException(string.Format("Delegate {0} not register", LuaMisc.GetTypeName(t)));            
         }
 
         if (func != null)
         {
             LuaState state = func.GetLuaState();
             LuaDelegate target = state.GetLuaDelegate(func);
-
+            
             if (target != null)
             {
                 return Delegate.CreateDelegate(t, target, target.method);
-            }
+            }  
             else
             {
                 Delegate d = Create(func, null, false);
                 target = d.Target as LuaDelegate;
                 state.AddLuaDelegate(target, func);
                 return d;
-            }
+            }       
         }
 
-        return Create(func, null, false);
+        return Create(func, null, false);        
     }
 
     [NoToLuaAttribute]
@@ -114,7 +114,7 @@ public static Delegate RemoveDelegate(Delegate obj, Delegate dg)
         }
 
         LuaState state = remove.func.GetLuaState();
-        Delegate[] ds = obj.GetInvocationList();
+        Delegate[] ds = obj.GetInvocationList();        
 
         for (int i = 0; i < ds.Length; i++)
         {
@@ -131,5 +131,6 @@ public static Delegate RemoveDelegate(Delegate obj, Delegate dg)
 
         return obj;
     }
+
 }