diff --git a/Assets/Scripts/Common/BFMain.cs b/Assets/Scripts/Common/BFMain.cs index f01fa24a1..7a7225a23 100644 --- a/Assets/Scripts/Common/BFMain.cs +++ b/Assets/Scripts/Common/BFMain.cs @@ -17,6 +17,7 @@ namespace BF // 是否是单机版 public static bool IsStandAlone = false; public static bool IsShenhe = false; + public static bool IsWhite = false; public static bool IsGotServerTime = false; public const string FILE_HEAD = "for_file_head"; public const string FILE_HEAD_BASE64 = "Zm9yX2ZpbGVfaGVhZ"; diff --git a/Assets/XLua/Gen/BF_BFMainWrap.cs b/Assets/XLua/Gen/BF_BFMainWrap.cs index 32cb3c8b1..98f3b11e8 100644 --- a/Assets/XLua/Gen/BF_BFMainWrap.cs +++ b/Assets/XLua/Gen/BF_BFMainWrap.cs @@ -47,7 +47,7 @@ namespace XLua.CSObjectWrap Utils.EndObjectRegister(type, L, translator, null, null, null, null, null); - Utils.BeginClassRegister(type, L, __CreateInstance, 6, 5, 5); + Utils.BeginClassRegister(type, L, __CreateInstance, 6, 6, 6); Utils.RegisterFunc(L, Utils.CLS_IDX, "SetServerTime", _m_SetServerTime_xlua_st_); Utils.RegisterFunc(L, Utils.CLS_IDX, "ForFree", _m_ForFree_xlua_st_); @@ -58,12 +58,14 @@ namespace XLua.CSObjectWrap Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsStandAlone", _g_get_IsStandAlone); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsShenhe", _g_get_IsShenhe); + Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsWhite", _g_get_IsWhite); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "IsGotServerTime", _g_get_IsGotServerTime); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "ServerTime", _g_get_ServerTime); Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "DifferenceTime", _g_get_DifferenceTime); Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsStandAlone", _s_set_IsStandAlone); Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsShenhe", _s_set_IsShenhe); + Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsWhite", _s_set_IsWhite); Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "IsGotServerTime", _s_set_IsGotServerTime); Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "ServerTime", _s_set_ServerTime); Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "DifferenceTime", _s_set_DifferenceTime); @@ -428,6 +430,18 @@ namespace XLua.CSObjectWrap return 1; } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _g_get_IsWhite(RealStatePtr L) + { + try { + + LuaAPI.lua_pushboolean(L, BF.BFMain.IsWhite); + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 1; + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_IsGotServerTime(RealStatePtr L) { @@ -492,6 +506,19 @@ namespace XLua.CSObjectWrap return 0; } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _s_set_IsWhite(RealStatePtr L) + { + try { + + BF.BFMain.IsWhite = LuaAPI.lua_toboolean(L, 1); + + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 0; + } + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _s_set_IsGotServerTime(RealStatePtr L) { diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 1f9cd7cbe..15bf8f8e6 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/first/first.lua.bytes b/Assets/lua/app/first/first.lua.bytes index a1c7cc55d..84eba13f9 100644 Binary files a/Assets/lua/app/first/first.lua.bytes and b/Assets/lua/app/first/first.lua.bytes differ diff --git a/Assets/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index baf65acfb..820fbdf97 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes index 718dd9949..d4e52664e 100644 Binary files a/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/game_setting_ui.lua.bytes differ