fix #321

Tencent · Mar 19, 2018 · 0b2a49e · 0b2a49e
1 parent a724e74
commit 0b2a49e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Assets/XLua/Src/Editor/Template/LuaWrapPusher.tpl.txt b/Assets/XLua/Src/Editor/Template/LuaWrapPusher.tpl.txt
@@ -168,8 +168,8 @@ namespace XLua
             if (type == LuaTypes.LUA_TUSERDATA )
             {
 			    val = (<%=full_type_name%>)FastGetCSObj(L, index);
-            }<%if not is_enum then%>
-			else if (type ==LuaTypes.LUA_TTABLE)
+            }
+			else if (type == LuaTypes.LUA_TTABLE)
 			{
 			    val = new <%=full_type_name%>();
 				int top = LuaAPI.lua_gettop(L);
@@ -180,10 +180,14 @@ namespace XLua
 				}
 				LuaAPI.lua_pop(L, 1);
 				<%end)%>
-			}<%end%>
+			}<%if not type_info.Type.IsValueType then%>
+            else if (type == LuaTypes.LUA_TNIL || type == LuaTypes.LUA_TNONE)
+            {
+                val = null;
+            }<%end%>
             else
             {
-                val = (<%=full_type_name%>)objectCasters.GetCaster(typeof(<%=full_type_name%>))(L, index, null);
+                throw new Exception("can not cast " + LuaAPI.lua_type(L, index) + " to " + typeof(<%=full_type_name%>));
             }
         }
 		<%end)%>