更新tolua#到1.0.6.253版

Author: jarjin2000

Assets/LuaFramework/ToLua/Core/LuaDLL.cs

@@ -187,7 +187,7 @@ public string short_src
 
     public class LuaDLL
     {
-        public static string version = "1.0.6.244";
+        public static string version = "1.0.6.250";
         public static int LUA_MULTRET = -1;
         public static string[] LuaTypeName = { "none", "nil", "boolean", "lightuserdata", "number", "string", "table", "function", "userdata", "thread" };        
 

Assets/LuaFramework/ToLua/Core/LuaState.cs

@@ -284,6 +284,12 @@ public void EndPreModule(int reference)
             LuaDLL.tolua_endpremodule(L, reference);
         }
 
+        public void EndPreModule(IntPtr L, int reference)
+        {
+            --beginCount;
+            LuaDLL.tolua_endpremodule(L, reference);
+        }
+
         public void BindPreModule(Type t, LuaCSFunction func)
         {
             preLoadMap[t] = func;
@@ -794,12 +800,14 @@ bool PushLuaFunction(string fullPath, bool checkMap = true)
         void RemoveFromGCList(int reference)
         {            
             lock (gcList)
-            {
-                int index = gcList.FindIndex((gc) => { return gc.reference == reference; });
-
-                if (index >= 0)
+            {                
+                for (int i = 0; i < gcList.Count; i++)
                 {
-                    gcList.RemoveAt(index);
+                    if (gcList[i].reference == reference)
+                    {
+                        gcList.RemoveAt(i);
+                        break;
+                    }
                 }
             }
         }
@@ -1237,9 +1245,9 @@ public void PushObject(object obj)
         {
             if (obj.GetType().IsEnum)
             {
-                ToLua.Push(L, (Enum)obj);                
+                ToLua.Push(L, (Enum)obj);
             }
-            else                
+            else
             {
                 ToLua.PushObject(L, obj);
             }
@@ -1848,13 +1856,13 @@ public void PrintTable(string name)
         {
             LuaTable table = GetTable(name);
             LuaDictTable dict = table.ToDictTable();
-            table.Dispose();            
+            table.Dispose();
             var iter2 = dict.GetEnumerator();
 
-            while (iter2.MoveNext())
-            {
-                Debugger.Log("map item, k,v is {0}:{1}", iter2.Current.Key, iter2.Current.Value);
-            }
+                while (iter2.MoveNext())
+                {
+                    Debugger.Log("map item, k,v is {0}:{1}", iter2.Current.Key, iter2.Current.Value);
+                }                           
 
             iter2.Dispose();
             dict.Dispose();

Assets/LuaFramework/ToLua/Editor/ToLuaMenu.cs

@@ -755,7 +755,7 @@ static void GenPreLoadFunction(BindType bt, StringBuilder sb)
         sb.AppendFormat("\t\t\tstate.BeginPreModule(\"{0}\");\r\n", bt.nameSpace);
         sb.AppendFormat("\t\t\t{0}Wrap.Register(state);\r\n", bt.wrapName);
         sb.AppendFormat("\t\t\tint reference = state.GetMetaReference(typeof({0}));\r\n", bt.name);
-        sb.AppendLineEx("\t\t\tstate.EndPreModule(reference);");                
+        sb.AppendLineEx("\t\t\tstate.EndPreModule(L, reference);");                
         sb.AppendLineEx("\t\t\treturn 1;");
         sb.AppendLineEx("\t\t}");
         sb.AppendLineEx("\t\tcatch(Exception e)");

Assets/LuaFramework/ToLua/Lua/UnityEngine/LayerMask.lua

@@ -38,7 +38,7 @@ function LayerMask.GetMask(...)
 	for i = 1, #arg do		
 		local n = LayerMask.NameToLayer(arg[i])
 
-		if n ~= 0 then
+		if n ~= nil then
 			value = value + 2 ^ n				
 		end
 	end	

Assets/LuaFramework/ToLua/Misc/LuaClient.cs

@@ -25,6 +25,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 using System.Collections;
 using System.IO;
 using System;
+using UnityEngine.SceneManagement;
 
 public class LuaClient : MonoBehaviour
 {
@@ -171,6 +172,10 @@ protected void Awake()
     {
         Instance = this;
         Init();
+
+#if UNITY_5_4
+        SceneManager.sceneLoaded += OnSceneLoaded;
+#endif        
     }
 
     protected virtual void OnLoadFinished()
@@ -180,7 +185,7 @@ protected virtual void OnLoadFinished()
         StartMain();
     }
 
-    protected void OnLevelWasLoaded(int level)
+    void OnLevelLoaded(int level)
     {
         if (levelLoaded != null)
         {
@@ -191,10 +196,25 @@ protected void OnLevelWasLoaded(int level)
         }
     }
 
-    protected void Destroy()
+#if UNITY_5_4
+    void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+    {
+        OnLevelLoaded(scene.buildIndex);
+    }
+#else
+    protected void OnLevelWasLoaded(int level)
+    {
+        OnLevelLoaded(level);
+    }
+#endif
+
+    public virtual void Destroy()
     {
         if (luaState != null)
         {
+#if UNITY_5_4
+        SceneManager.sceneLoaded -= OnSceneLoaded;
+#endif    
             LuaState state = luaState;
             luaState = null;
 

ReadMe.txt

@@ -16,6 +16,9 @@ tolua#地址： https://github.com/topameng/tolua
 XlsxToLua:   https://github.com/zhangqi-ulua/XlsxToLua
 UnityHello:  https://github.com/woshihuo12/UnityHello
 
+//-------------2016-09-18-------------
+(1)更新tolua#到1.0.6.253版
+
 //-------------2016-09-09-------------
 (1)更新tolua#到1.0.6.248版