Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.3分支 C# 传参bug以及导出 bytecode 时不打开CMD窗口 #227

Open
wants to merge 3 commits into
base: luac5.3
Choose a base branch
from
Open

5.3分支 C# 传参bug以及导出 bytecode 时不打开CMD窗口 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55694a2
导出bytecode时不打开CMD窗口，提高导出速度
jozhn Feb 1, 2021
1c539a8
Update ToLuaMenu.cs
jozhn Feb 1, 2021
c951080
lua 5.3 C#传参给Lua时区分Int和其他类型
jozhn Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Assets/ToLua/Core/ToLua.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,13 @@ public static object ToVarObject(IntPtr L, int stackPos)

switch (type)
{
case LuaTypes.LUA_TNUMBER:
case LuaTypes.LUA_TNUMBER:
#if LUAC_5_3
if (LuaDLL.lua_isinteger(L, stackPos) != 0)
{
return LuaDLL.lua_tointeger(L, stackPos);
}
#endif
return LuaDLL.lua_tonumber(L, stackPos);
case LuaTypes.LUA_TSTRING:
return LuaDLL.lua_tostring(L, stackPos);
Expand Down Expand Up @@ -3008,4 +3014,4 @@ public static void SubRef(this Delegate arg)
}
}
}
}
}
1 change: 1 addition & 0 deletions Assets/ToLua/Editor/ToLuaMenu.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,7 @@ static void ExportLuaBytecode(string srcFile, string outFile)
RedirectStandardInput = true,
RedirectStandardError = true,
WorkingDirectory = exedir,
CreateNoWindow = true,
};

if (!isWin)
Expand Down