Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-07-06 5db22e4befdbf2497a6cea360197564556e3d0c1

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Lua/Gen/SnxxzUIAlchemyModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.AlchemyModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 25, 16, 5);
            Utils.BeginObjectRegister(type, L, translator, 0, 25, 17, 5);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -60,6 +60,7 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "alchemyFairyNotifySymbol", _g_get_alchemyFairyNotifySymbol);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "maxBatchAlchemyCount", _g_get_maxBatchAlchemyCount);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "normalBatchAlchemyLevel", _g_get_normalBatchAlchemyLevel);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "autoFunctionGuideLevel", _g_get_autoFunctionGuideLevel);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isServerPrepare", _g_get_isServerPrepare);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "redpoint", _g_get_redpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "alchemyDrugRedpoint1", _g_get_alchemyDrugRedpoint1);
@@ -946,6 +947,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_autoFunctionGuideLevel(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.AlchemyModel gen_to_be_invoked = (Snxxz.UI.AlchemyModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.autoFunctionGuideLevel);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_isServerPrepare(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIPackModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.PackModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 77, 22, 4);
            Utils.BeginObjectRegister(type, L, translator, 0, 76, 22, 4);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -39,7 +39,6 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateItemUseCnt", _m_UpdateItemUseCnt);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdateItemSumUseCnt", _m_UpdateItemSumUseCnt);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetRoleEquipPathId", _m_GetRoleEquipPathId);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "IsShowAddEquipByPlace", _m_IsShowAddEquipByPlace);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSinglePack", _m_GetSinglePack);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnLockPackGrid", _m_UnLockPackGrid);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetItemByGuid", _m_GetItemByGuid);
@@ -612,29 +611,6 @@
                        LuaAPI.xlua_pushinteger(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_IsShowAddEquipByPlace(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.PackModel gen_to_be_invoked = (Snxxz.UI.PackModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                    return 1;
                }

 Lua/Gen/SnxxzUIRedpointBehaviourWrap.cs

New file
@@ -0,0 +1,191 @@
#if USE_UNI_LUA
using LuaAPI = UniLua.Lua;
using RealStatePtr = UniLua.ILuaState;
using LuaCSFunction = UniLua.CSharpFunctionDelegate;
#else
using LuaAPI = XLua.LuaDLL.Lua;
using RealStatePtr = System.IntPtr;
using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
#endif

using XLua;
using System.Collections.Generic;


namespace XLua.CSObjectWrap
{
    using Utils = XLua.Utils;
    public class SnxxzUIRedpointBehaviourWrap 
    {
        public static void __Register(RealStatePtr L)
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.RedpointBehaviour);
            Utils.BeginObjectRegister(type, L, translator, 0, 0, 5, 2);
			
			
			
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "redpointId", _g_get_redpointId);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "simpleRedpoint", _g_get_simpleRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "quantityRedpoint", _g_get_quantityRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "quantityText", _g_get_quantityText);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "show", _g_get_show);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "redpointId", _s_set_redpointId);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "show", _s_set_show);
            
			
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);

            Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0);
			
			
            
			
			
			
            Utils.EndClassRegister(type, L, translator);
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int __CreateInstance(RealStatePtr L)
        {
            
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                if(LuaAPI.lua_gettop(L) == 1)
                {
					
                    Snxxz.UI.RedpointBehaviour gen_ret = new Snxxz.UI.RedpointBehaviour();
                    translator.Push(L, gen_ret);
                    
                    return 1;
                }
				
            }
            catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return LuaAPI.luaL_error(L, "invalid arguments to Snxxz.UI.RedpointBehaviour constructor!");
            
        }
        
		
        
		
        
        
        
        
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_redpointId(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.redpointId);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_simpleRedpoint(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.simpleRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_quantityRedpoint(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.quantityRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_quantityText(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.quantityText);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_show(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.show);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_redpointId(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.redpointId = LuaAPI.xlua_tointeger(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_show(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.RedpointBehaviour gen_to_be_invoked = (Snxxz.UI.RedpointBehaviour)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.show = LuaAPI.lua_toboolean(L, 2);
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
		
		
		
		
    }
}

 Lua/Gen/SnxxzUIRedpointBehaviourWrap.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 32f69f5d2a068674199253b5d8fb26f2
timeCreated: 1562344969
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -1389,6 +1389,9 @@
            translator.DelayWrapLoader(typeof(Snxxz.UI.Redpoint), SnxxzUIRedpointWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RedpointBehaviour), SnxxzUIRedpointBehaviourWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RedpointCenter), SnxxzUIRedpointCenterWrap.__Register);
        
        
@@ -1427,13 +1430,13 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RuneTowerModel), SnxxzUIRuneTowerModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.ExpertSkillSelectWin), SnxxzUIExpertSkillSelectWinWrap.__Register);
        
        }
        
        static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.ExpertSkillSelectWin), SnxxzUIExpertSkillSelectWinWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(QuickSetting), QuickSettingWrap.__Register);
        
@@ -1584,13 +1587,13 @@
        
            translator.DelayWrapLoader(typeof(WindowJumpMgr), WindowJumpMgrWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(JumpUIType), JumpUITypeWrap.__Register);
        
        }
        
        static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(JumpUIType), JumpUITypeWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.MapModel), SnxxzUIMapModelWrap.__Register);
        
@@ -1741,14 +1744,14 @@
        
            translator.DelayWrapLoader(typeof(FunctionUnlockType), FunctionUnlockTypeWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(RedPointState), RedPointStateWrap.__Register);
        
        }
        
        static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(RedPointState), RedPointStateWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(TeamInviteType), TeamInviteTypeWrap.__Register);
        
        

 Lua/Gen/link.xml

@@ -424,6 +424,7 @@
        <type fullname="PlayerDeadModel" preserve="all"/>
        <type fullname="Snxxz.UI.RankModel" preserve="all"/>
        <type fullname="Snxxz.UI.Redpoint" preserve="all"/>
        <type fullname="Snxxz.UI.RedpointBehaviour" preserve="all"/>
        <type fullname="Snxxz.UI.RedpointCenter" preserve="all"/>
        <type fullname="Snxxz.UI.RidingPetBossModel" preserve="all"/>
        <type fullname="Snxxz.UI.MagicianModel" preserve="all"/>

 System/Redpoint/RedpointBehaviour.cs

@@ -8,7 +8,7 @@


namespace Snxxz.UI

{



    [XLua.LuaCallCSharp]

    public class RedpointBehaviour : MonoBehaviour

    {

        [SerializeField]