From 1036f630180a5c4b1f2083dc34dedb7adb81ab61 Mon Sep 17 00:00:00 2001 From: client_Wu Xijin <364452445@qq.com> Date: 星期六, 10 十一月 2018 15:01:01 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client --- Assets/XLua/Gen/PlayerDeadModelWrap.cs | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/Assets/XLua/Gen/PlayerDeadModelWrap.cs b/Assets/XLua/Gen/PlayerDeadModelWrap.cs index f70637a..bbf55b1 100644 --- a/Assets/XLua/Gen/PlayerDeadModelWrap.cs +++ b/Assets/XLua/Gen/PlayerDeadModelWrap.cs @@ -21,7 +21,7 @@ { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(PlayerDeadModel); - Utils.BeginObjectRegister(type, L, translator, 0, 18, 16, 9); + Utils.BeginObjectRegister(type, L, translator, 0, 18, 17, 9); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize); @@ -44,6 +44,7 @@ Utils.RegisterFunc(L, Utils.METHOD_IDX, "CloseRebornWinEvent", _e_CloseRebornWinEvent); Utils.RegisterFunc(L, Utils.GETTER_IDX, "dungeonKillArray", _g_get_dungeonKillArray); + Utils.RegisterFunc(L, Utils.GETTER_IDX, "RebornConditions", _g_get_RebornConditions); Utils.RegisterFunc(L, Utils.GETTER_IDX, "playerIsDie", _g_get_playerIsDie); Utils.RegisterFunc(L, Utils.GETTER_IDX, "IsCanReborn", _g_get_IsCanReborn); Utils.RegisterFunc(L, Utils.GETTER_IDX, "localBossState", _g_get_localBossState); @@ -523,6 +524,20 @@ } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] + static int _g_get_RebornConditions(RealStatePtr L) + { + try { + ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); + + PlayerDeadModel gen_to_be_invoked = (PlayerDeadModel)translator.FastGetCSObj(L, 1); + translator.Push(L, gen_to_be_invoked.RebornConditions); + } catch(System.Exception gen_e) { + return LuaAPI.luaL_error(L, "c# exception:" + gen_e); + } + return 1; + } + + [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_playerIsDie(RealStatePtr L) { try { -- Gitblit v1.8.0