Upgrade KEngine

mr-kelly · Nov 17, 2016 · 65280c2 · 65280c2
1 parent 8d25ff4
commit 65280c2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/KEngine b/KEngine
diff --git a/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/LuaModule.cs b/KSFramework/Assets/Plugins/KSFramework/Modules/LuaModule/LuaModule.cs
@@ -243,25 +243,7 @@ public IEnumerator Init()
 		[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
 		static public int ImportCSharpType(IntPtr l)
 		{
-			try
-			{
-				string cls;
-				Helper.checkType(l, 1, out cls);
-				Type t = LuaObject.FindType(cls);
-				if (t == null)
-				{
-					return Helper.error(l, "Can't find {0} to create", cls);
-				}
-
-				LuaClassObject co = new LuaClassObject(t);
-				LuaObject.pushObject(l,co);
-				Helper.pushValue(l, true);
-				return 2;
-			}
-			catch (Exception e)
-			{
-				return Helper.error(l, e);
-			}
+		    return Helper.GetClass(l);
 		}
         /// <summary>
         /// same as SLua default import

diff --git a/slua b/slua
+18 −0		KEngine.UnityProject/Assets/KEngine.Editor/Editor/BuildTools.cs
+13 −2		KEngine.UnityProject/Assets/KEngine.Editor/Editor/SettingModuleEditor.cs
+ −		KEngine.UnityProject/Assets/KEngine.Editor/Editor/TableMLCompiler/TableMLCompiler.dll
+ −		KEngine.UnityProject/Assets/KEngine.Editor/Editor/TableMLCompiler/TableMLCompiler.dll.mdb
+1 −1		KEngine.UnityProject/Assets/KEngine.Editor/Editor/TableMLCompiler/TableMLCompiler.dll.mdb.meta
+ −		KEngine.UnityProject/Assets/KEngine.Editor/Editor/TableMLCompiler/TableMLCompiler.pdb
+ −		KEngine.UnityProject/Assets/KEngine.Lib/TableML/TableML.dll
+ −		KEngine.UnityProject/Assets/KEngine.Lib/TableML/TableML.dll.mdb
+1 −1		KEngine.UnityProject/Assets/KEngine.Lib/TableML/TableML.dll.mdb.meta
+ −		KEngine.UnityProject/Assets/KEngine.Lib/TableML/TableML.pdb
+3 −0		KEngine.UnityProject/Assets/KEngine/CoreModules/ResourceModule/KResourceModule.cs
+1 −1		Assets/Plugins/Slua_Managed/Helper.cs
+23 −14		Assets/Plugins/Slua_Managed/LuaObject.cs
+19 −0		Assets/Plugins/Slua_Managed/LuaState.cs