From 9473a532fb1160cf720af536c8d6d3d3237bf9af Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 12 三月 2019 15:56:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Lua/Gen/ItemPlusMaxConfigWrap.cs |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/Lua/Gen/ItemPlusMaxConfigWrap.cs b/Lua/Gen/ItemPlusMaxConfigWrap.cs
index 50636ec..5ec29f8 100644
--- a/Lua/Gen/ItemPlusMaxConfigWrap.cs
+++ b/Lua/Gen/ItemPlusMaxConfigWrap.cs
@@ -21,15 +21,14 @@
         {
 			ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			System.Type type = typeof(ItemPlusMaxConfig);
-			Utils.BeginObjectRegister(type, L, translator, 0, 1, 5, 0);
+			Utils.BeginObjectRegister(type, L, translator, 0, 1, 4, 0);
 			
 			Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnConfigParseCompleted", _m_OnConfigParseCompleted);
 			
 			
 			Utils.RegisterFunc(L, Utils.GETTER_IDX, "id", _g_get_id);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "EquipType", _g_get_EquipType);
-            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipPhase", _g_get_equipPhase);
-            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipColor", _g_get_equipColor);
+            Utils.RegisterFunc(L, Utils.GETTER_IDX, "equipStar", _g_get_equipStar);
             Utils.RegisterFunc(L, Utils.GETTER_IDX, "levelMax", _g_get_levelMax);
             
 			
@@ -43,7 +42,7 @@
             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, "GetEquipTypeAndPhaseColor", _m_GetEquipTypeAndPhaseColor_xlua_st_);
+            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetEquipTypeAndEquipStar", _m_GetEquipTypeAndEquipStar_xlua_st_);
             Utils.RegisterFunc(L, Utils.CLS_IDX, "GetItemPlusMaxLv", _m_GetItemPlusMaxLv_xlua_st_);
             
 			
@@ -293,7 +292,7 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-        static int _m_GetEquipTypeAndPhaseColor_xlua_st_(RealStatePtr L)
+        static int _m_GetEquipTypeAndEquipStar_xlua_st_(RealStatePtr L)
         {
 		    try {
             
@@ -303,11 +302,10 @@
             
                 
                 {
-                    int __equipType = LuaAPI.xlua_tointeger(L, 1);
-                    int __equipPhase = LuaAPI.xlua_tointeger(L, 2);
-                    int __equipColor = LuaAPI.xlua_tointeger(L, 3);
+                    int _equipType = LuaAPI.xlua_tointeger(L, 1);
+                    int _equipStar = LuaAPI.xlua_tointeger(L, 2);
                     
-                        ItemPlusMaxConfig gen_ret = ItemPlusMaxConfig.GetEquipTypeAndPhaseColor( __equipType, __equipPhase, __equipColor );
+                        ItemPlusMaxConfig gen_ret = ItemPlusMaxConfig.GetEquipTypeAndEquipStar( _equipType, _equipStar );
                         translator.Push(L, gen_ret);
                     
                     
@@ -390,27 +388,13 @@
         }
         
         [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-        static int _g_get_equipPhase(RealStatePtr L)
+        static int _g_get_equipStar(RealStatePtr L)
         {
 		    try {
                 ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
 			
                 ItemPlusMaxConfig gen_to_be_invoked = (ItemPlusMaxConfig)translator.FastGetCSObj(L, 1);
-                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipPhase);
-            } catch(System.Exception gen_e) {
-                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
-            }
-            return 1;
-        }
-        
-        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
-        static int _g_get_equipColor(RealStatePtr L)
-        {
-		    try {
-                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-			
-                ItemPlusMaxConfig gen_to_be_invoked = (ItemPlusMaxConfig)translator.FastGetCSObj(L, 1);
-                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipColor);
+                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.equipStar);
             } catch(System.Exception gen_e) {
                 return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
             }

--
Gitblit v1.8.0