Skip to content

Commit ca974c7

Browse files
committed
更新tolua#到1.0.5.214版
1 parent dd8ae19 commit ca974c7

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

Assets/LuaFramework/Lua/Logic/Game.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function Game.OnInitOK()
4949

5050
CtrlManager.Init();
5151
local ctrl = CtrlManager.GetCtrl(CtrlNames.Prompt);
52-
if ctrl ~= nil and AppConst.ExampleMode then
52+
if ctrl ~= nil and AppConst.ExampleMode == 1 then
5353
ctrl:Awake();
5454
end
5555

Assets/LuaFramework/ToLua/Core/TypeChecker.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ public static bool CheckTypes(IntPtr L, int begin, Type type0, Type type1, Type
8686
CheckType(L, type5, begin + 5) && CheckType(L, type6, begin + 6) && CheckType(L, type7, begin + 7) && CheckType(L, type8, begin + 8) && CheckType(L, type9, begin + 9);
8787
}
8888

89-
public static bool CheckTypes(IntPtr L, params Type[] types)
89+
public static bool CheckTypes(IntPtr L, int begin, params Type[] types)
9090
{
9191
for (int i = 0; i < types.Length; i++)
9292
{
93-
if (!CheckType(L, types[i], i + 1))
93+
if (!CheckType(L, types[i], i + begin))
9494
{
9595
return false;
9696
}

ReadMe.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ tolua#地址: https://github.com/topameng/tolua
1616
XlsxToLua: https://github.com/zhangqi-ulua/XlsxToLua
1717
UnityHello: https://github.com/woshihuo12/UnityHello
1818

19+
//-------------2016-07-30-------------
20+
(1)更新tolua#到1.0.5.214版
21+
1922
//-------------2016-07-16-------------
2023
(1)更新tolua#到1.0.5.208版
2124
(2)修改资源管理器,减少GC与修正卸载某个AB正处于异步加载中导致崩溃的BUG

0 commit comments

Comments
 (0)