Merge branch 'master' into GrowthFund

client_Zxw

2019-01-15 4c6d58af44cd4235501e15a78bf79674ba2fcc4a

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -302,6 +302,9 @@
            translator.DelayWrapLoader(typeof(SelectEquipModel), SelectEquipModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerBossModel), SnxxzUICrossServerBossModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerOneVsOneModel), SnxxzUICrossServerOneVsOneModelWrap.__Register);
        
        
@@ -328,13 +331,13 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DogzPackModel), SnxxzUIDogzPackModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DogzDungeonModel), SnxxzUIDogzDungeonModelWrap.__Register);
        
        }
        
        static void wrapInit2(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DogzDungeonModel), SnxxzUIDogzDungeonModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.DungeonAssistModel), SnxxzUIDungeonAssistModelWrap.__Register);
        
@@ -379,6 +382,12 @@
        
        
            translator.DelayWrapLoader(typeof(FakeDungeonUtility), FakeDungeonUtilityWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.FashionDecomposeModel), SnxxzUIFashionDecomposeModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.FashionDressModel), SnxxzUIFashionDressModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.BossHomeModel), SnxxzUIBossHomeModelWrap.__Register);
@@ -479,6 +488,10 @@
        
            translator.DelayWrapLoader(typeof(ServerListCenter), ServerListCenterWrap.__Register);
        
        }
        
        static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.LoginAdModel), SnxxzUILoginAdModelWrap.__Register);
        
@@ -488,10 +501,6 @@
        
            translator.DelayWrapLoader(typeof(CoinTaskTipModel), CoinTaskTipModelWrap.__Register);
        
        }
        
        static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(FeatureNoticeModel), FeatureNoticeModelWrap.__Register);
        
@@ -571,6 +580,9 @@
            translator.DelayWrapLoader(typeof(Snxxz.UI.OpenServerActivityNotifyModel), SnxxzUIOpenServerActivityNotifyModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(ActionTypeClass), ActionTypeClassWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.RedEnvelopeModel), SnxxzUIRedEnvelopeModelWrap.__Register);
        
        
@@ -633,6 +645,10 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.SkillModel), SnxxzUISkillModelWrap.__Register);
        
        }
        
        static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.TalentModel), SnxxzUITalentModelWrap.__Register);
        
@@ -645,10 +661,6 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.BuySuccessModel), SnxxzUIBuySuccessModelWrap.__Register);
        
        }
        
        static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(StoreModel), StoreModelWrap.__Register);
        
@@ -790,6 +802,10 @@
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.MapModel), SnxxzUIMapModelWrap.__Register);
        
        }
        
        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(WorldMapSkip), WorldMapSkipWrap.__Register);
        
@@ -802,10 +818,6 @@
        
            translator.DelayWrapLoader(typeof(TimeDownMgr), TimeDownMgrWrap.__Register);
        
        }
        
        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
        {
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.UI3DModelExhibition), SnxxzUIUI3DModelExhibitionWrap.__Register);