更新tolua#到1.0.6.304版

tuduanyuan · Apr 18, 2017 · a7a5b92 · a7a5b92
1 parent 49128f1
commit a7a5b92
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/Assets/LuaFramework/Editor/CustomSettings.cs b/Assets/LuaFramework/Editor/CustomSettings.cs
@@ -109,7 +109,7 @@ public static class CustomSettings
         _GT(typeof(AsyncOperation)).SetBaseType(typeof(System.Object)),        
         _GT(typeof(LightType)),
         _GT(typeof(SleepTimeout)),
-#if UNITY_5_3_OR_NEWER
+#if UNITY_5_3_OR_NEWER && !UNITY_5_6_OR_NEWER
         _GT(typeof(UnityEngine.Experimental.Director.DirectorPlayer)),
 #endif
         _GT(typeof(Animator)),

diff --git a/Assets/LuaFramework/ToLua/Core/LuaMisc.cs b/Assets/LuaFramework/ToLua/Core/LuaMisc.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 topameng([email protected])
+Copyright (c) 2015-2017 topameng([email protected])
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -207,7 +207,7 @@ static bool CompareLuaDelegate(LuaDelegate a, LuaDelegate b)
 
             if (l != null && r == null)
             {
-                return a.func == null && b.self == null;
+                return a.func == null && a.self == null;
             }
 
             if (a.func != b.func || a.self != b.self)

diff --git a/Assets/LuaFramework/ToLua/Core/LuaState.cs b/Assets/LuaFramework/ToLua/Core/LuaState.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 topameng([email protected])
+Copyright (c) 2015-2017 topameng([email protected])
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1314,7 +1314,7 @@ public void Push(object obj)
 
         public void PushObject(object obj)
         {
-            if (obj.GetType().IsEnum)
+            if (obj != null && obj.GetType().IsEnum)
             {
                 ToLua.Push(L, (Enum)obj);
             }

diff --git a/Assets/LuaFramework/ToLua/Core/ToLua.cs b/Assets/LuaFramework/ToLua/Core/ToLua.cs
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015-2016 topameng([email protected])
+Copyright (c) 2015-2017 topameng([email protected])
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/ReadMe.txt b/ReadMe.txt
@@ -21,6 +21,9 @@ XlsxToLua:   https://github.com/zhangqi-ulua/XlsxToLua
 UnityHello:  https://github.com/woshihuo12/UnityHello
 Excel配置：https://github.com/sy-yanghuan/proton
 
+//-------------2017-04-18-------------
+(1)更新tolua#到1.0.6.304版
+
 //-------------2017-03-19-------------
 (1)更新tolua#到1.0.6.293版