From e1f0325c4e2c8e49bc1ee5d6934ad35ddd480942 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 13 三月 2019 09:37:01 +0800
Subject: [PATCH] Merge branch 'master' into Realm
---
Lua/Gen/ItemPlusConfigWrap.cs | 45 ++++++++-------------------------------------
1 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/Lua/Gen/ItemPlusConfigWrap.cs b/Lua/Gen/ItemPlusConfigWrap.cs
index 3c77c2e..7b55308 100644
--- a/Lua/Gen/ItemPlusConfigWrap.cs
+++ b/Lua/Gen/ItemPlusConfigWrap.cs
@@ -41,14 +41,13 @@
Utils.EndObjectRegister(type, L, translator, null, null,
null, null, null);
- Utils.BeginClassRegister(type, L, __CreateInstance, 8, 1, 0);
+ Utils.BeginClassRegister(type, L, __CreateInstance, 7, 1, 0);
Utils.RegisterFunc(L, Utils.CLS_IDX, "Get", _m_Get_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetKeys", _m_GetKeys_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetValues", _m_GetValues_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "Has", _m_Has_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "Init", _m_Init_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTypeAndGrade", _m_GetTypeAndGrade_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetItemPlusData", _m_GetItemPlusData_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTypeAndLevel", _m_GetTypeAndLevel_xlua_st_);
@@ -297,7 +296,7 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetTypeAndGrade_xlua_st_(RealStatePtr L)
+ static int _m_GetTypeAndLevel_xlua_st_(RealStatePtr L)
{
try {
@@ -307,38 +306,10 @@
{
- int __type = LuaAPI.xlua_tointeger(L, 1);
- int __level = LuaAPI.xlua_tointeger(L, 2);
+ int _type = LuaAPI.xlua_tointeger(L, 1);
+ int _level = LuaAPI.xlua_tointeger(L, 2);
- ItemPlusConfig gen_ret = ItemPlusConfig.GetTypeAndGrade( __type, __level );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetItemPlusData_xlua_st_(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
-
-
- {
- int __type = LuaAPI.xlua_tointeger(L, 1);
- int __level = LuaAPI.xlua_tointeger(L, 2);
-
- ItemPlusConfig.ItemPlusData gen_ret = ItemPlusConfig.GetItemPlusData( __type, __level );
+ ItemPlusConfig gen_ret = ItemPlusConfig.GetTypeAndLevel( _type, _level );
translator.Push(L, gen_ret);
@@ -416,7 +387,7 @@
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
ItemPlusConfig gen_to_be_invoked = (ItemPlusConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushstring(L, gen_to_be_invoked.attType);
+ translator.Push(L, gen_to_be_invoked.attType);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
@@ -430,7 +401,7 @@
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
ItemPlusConfig gen_to_be_invoked = (ItemPlusConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.lua_pushstring(L, gen_to_be_invoked.attValue);
+ translator.Push(L, gen_to_be_invoked.attValue);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
--
Gitblit v1.8.0