Merge branch 'master' of https://github.com/mr-kelly/KSFramework

mr-kelly · Dec 2, 2016 · 5bc1da9 · 5bc1da9
2 parents aaaa18d + 5f08dc7
commit 5bc1da9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/KEngine b/KEngine
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