From cbb4009abdf84cf020be9cfc1de88dc436652bb3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 07 一月 2019 10:44:07 +0800
Subject: [PATCH] Merge branch 'master' into CrossServerBoss
---
Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs b/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs
index fb47cfd..4a86a8a 100644
--- a/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs
+++ b/Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs
@@ -21,7 +21,7 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(Snxxz.UI.CrossServerOneVsOneModel);
- Utils.BeginObjectRegister(type, L, translator, 0, 27, 19, 9);
+ Utils.BeginObjectRegister(type, L, translator, 0, 27, 21, 10);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -58,6 +58,7 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsMatching", _g_get_IsMatching);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "matchStartTime", _g_get_matchStartTime);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "roundEndTime", _g_get_roundEndTime);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsNewDay", _g_get_IsNewDay);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "freeMaxMatchNum", _g_get_freeMaxMatchNum);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "buyMaxMatchNum", _g_get_buyMaxMatchNum);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceFormula", _g_get_priceFormula);
@@ -65,6 +66,7 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "dayAwardTypelist", _g_get_dayAwardTypelist);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "afterOpenDayOpenCross", _g_get_afterOpenDayOpenCross);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "pkResultInfo", _g_get_pkResultInfo);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "LocalSaveThirdTypeKey", _g_get_LocalSaveThirdTypeKey);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossServerRedpoint", _g_get_crossServerRedpoint);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossOneVsOneRedpoint", _g_get_crossOneVsOneRedpoint);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossArenaRedpoint", _g_get_crossArenaRedpoint);
@@ -75,6 +77,7 @@
Utils.RegisterFunc(L, Utils.SETTER_IDX, "isClickCoolTime", _s_set_isClickCoolTime);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "IsMatching", _s_set_IsMatching);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "matchStartTime", _s_set_matchStartTime);
+ Utils.RegisterFunc(L, Utils.SETTER_IDX, "LocalSaveThirdTypeKey", _s_set_LocalSaveThirdTypeKey);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossServerRedpoint", _s_set_crossServerRedpoint);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossOneVsOneRedpoint", _s_set_crossOneVsOneRedpoint);
Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossArenaRedpoint", _s_set_crossArenaRedpoint);
@@ -864,6 +867,20 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_IsNewDay(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsNewDay);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _g_get_freeMaxMatchNum(RealStatePtr L)
{
try {
@@ -955,6 +972,20 @@
Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
translator.Push(L, gen_to_be_invoked.pkResultInfo);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_LocalSaveThirdTypeKey(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushstring(L, gen_to_be_invoked.LocalSaveThirdTypeKey);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
@@ -1094,6 +1125,21 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _s_set_LocalSaveThirdTypeKey(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
+ gen_to_be_invoked.LocalSaveThirdTypeKey = LuaAPI.lua_tostring(L, 2);
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 0;
+ }
+
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _s_set_crossServerRedpoint(RealStatePtr L)
{
try {
--
Gitblit v1.8.0