From 1f5dc1a93b4442a43fdfcce74f525545dd7fbb96 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 19 二月 2019 16:56:10 +0800
Subject: [PATCH] Merge branch 'master' into TreasureRevise
---
Lua/Gen/ItemConfigWrap.cs | 69 ++++++++++++++++------------------
1 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/Lua/Gen/ItemConfigWrap.cs b/Lua/Gen/ItemConfigWrap.cs
index d0cdd95..abe0bf7 100644
--- a/Lua/Gen/ItemConfigWrap.cs
+++ b/Lua/Gen/ItemConfigWrap.cs
@@ -21,9 +21,8 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(ItemConfig);
- Utils.BeginObjectRegister(type, L, translator, 0, 1, 70, 0);
+ Utils.BeginObjectRegister(type, L, translator, 0, 0, 70, 0);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnConfigParseCompleted", _m_OnConfigParseCompleted);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "ID", _g_get_ID);
@@ -102,21 +101,21 @@
Utils.EndObjectRegister(type, L, translator, null, null,
null, null, null);
- Utils.BeginClassRegister(type, L, __CreateInstance, 7, 2, 1);
+ Utils.BeginClassRegister(type, L, __CreateInstance, 9, 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, "GemItemInit", _m_GemItemInit_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetGemDataByLevelAndType", _m_GetGemDataByLevelAndType_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "IsWing", _m_IsWing_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "inited", _g_get_inited);
- Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "tag_Wings", _g_get_tag_Wings);
- Utils.RegisterFunc(L, Utils.CLS_SETTER_IDX, "tag_Wings", _s_set_tag_Wings);
-
+
Utils.EndClassRegister(type, L, translator);
}
@@ -332,20 +331,16 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnConfigParseCompleted(RealStatePtr L)
+ static int _m_GemItemInit_xlua_st_(RealStatePtr L)
{
try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- ItemConfig gen_to_be_invoked = (ItemConfig)translator.FastGetCSObj(L, 1);
{
- gen_to_be_invoked.OnConfigParseCompleted( );
+ ItemConfig.GemItemInit( );
@@ -374,6 +369,31 @@
ItemConfig gen_ret = ItemConfig.GetGemDataByLevelAndType( _level, _type );
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_IsWing_xlua_st_(RealStatePtr L)
+ {
+ try {
+
+
+
+
+ {
+ int _itemId = LuaAPI.xlua_tointeger(L, 1);
+
+ bool gen_ret = ItemConfig.IsWing( _itemId );
+ LuaAPI.lua_pushboolean(L, gen_ret);
@@ -1381,32 +1401,7 @@
return 1;
}
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_tag_Wings(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- translator.Push(L, ItemConfig.tag_Wings);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _s_set_tag_Wings(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- ItemConfig.tag_Wings = (System.Collections.Generic.Dictionary<int, ItemConfig>)translator.GetObject(L, 1, typeof(System.Collections.Generic.Dictionary<int, ItemConfig>));
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 0;
- }
--
Gitblit v1.8.0