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/SkillConfigWrap.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Lua/Gen/SkillConfigWrap.cs b/Lua/Gen/SkillConfigWrap.cs
index 292b492..7b63b87 100644
--- a/Lua/Gen/SkillConfigWrap.cs
+++ b/Lua/Gen/SkillConfigWrap.cs
@@ -113,7 +113,7 @@
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, "GetSkillWithOccpyAndType", _m_GetSkillWithOccpyAndType_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSkillActConfigs", _m_GetSkillActConfigs_xlua_st_);
+ Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSkills", _m_GetSkills_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSkillActive", _m_GetSkillActive_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSkillTypeIDAndSkillLV", _m_GetSkillTypeIDAndSkillLV_xlua_st_);
Utils.RegisterFunc(L, Utils.CLS_IDX, "FindSkillByJob", _m_FindSkillByJob_xlua_st_);
@@ -351,7 +351,6 @@
{
- gen_to_be_invoked.OnConfigParseCompleted( );
@@ -378,7 +377,7 @@
int _occupy = LuaAPI.xlua_tointeger(L, 1);
int _type = LuaAPI.xlua_tointeger(L, 2);
- System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<SkillConfig>> gen_ret = SkillConfig.GetSkillWithOccpyAndType( _occupy, _type );
+ System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>> gen_ret = SkillConfig.GetSkillWithOccpyAndType( _occupy, _type );
translator.Push(L, gen_ret);
@@ -393,7 +392,7 @@
}
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetSkillActConfigs_xlua_st_(RealStatePtr L)
+ static int _m_GetSkills_xlua_st_(RealStatePtr L)
{
try {
@@ -407,7 +406,7 @@
int _type = LuaAPI.xlua_tointeger(L, 2);
int __typeId = LuaAPI.xlua_tointeger(L, 3);
- System.Collections.Generic.List<SkillConfig> gen_ret = SkillConfig.GetSkillActConfigs( _occupy, _type, __typeId );
+ System.Collections.Generic.List<int> gen_ret = SkillConfig.GetSkills( _occupy, _type, __typeId );
translator.Push(L, gen_ret);
@@ -434,7 +433,7 @@
{
int _occupy = LuaAPI.xlua_tointeger(L, 1);
- System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<SkillConfig>>> gen_ret = SkillConfig.GetSkillActive( _occupy );
+ System.Collections.Generic.Dictionary<int, System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>> gen_ret = SkillConfig.GetSkillActive( _occupy );
translator.Push(L, gen_ret);
--
Gitblit v1.8.0