From 7ad71af40785129d9a2ade0bb3bd81d87f56754d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 15 五月 2019 19:35:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

---
 Lua/Gen/XLuaGenAutoRegister.cs |  102 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/Lua/Gen/XLuaGenAutoRegister.cs b/Lua/Gen/XLuaGenAutoRegister.cs
index 8089500..086dfa3 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs
+++ b/Lua/Gen/XLuaGenAutoRegister.cs
@@ -254,6 +254,9 @@
             translator.DelayWrapLoader(typeof(EquipWashConfig), EquipWashConfigWrap.__Register);
         
         
+            translator.DelayWrapLoader(typeof(EquipWashSpecConfig), EquipWashSpecConfigWrap.__Register);
+        
+        
             translator.DelayWrapLoader(typeof(FaceConfig), FaceConfigWrap.__Register);
         
         
@@ -328,13 +331,13 @@
         
             translator.DelayWrapLoader(typeof(HelpInfoConfig), HelpInfoConfigWrap.__Register);
         
-        
-            translator.DelayWrapLoader(typeof(HolidayHomingConfig), HolidayHomingConfigWrap.__Register);
-        
         }
         
         static void wrapInit2(LuaEnv luaenv, ObjectTranslator translator)
         {
+        
+            translator.DelayWrapLoader(typeof(HolidayHomingConfig), HolidayHomingConfigWrap.__Register);
+        
         
             translator.DelayWrapLoader(typeof(HolidayHomingPointConfig), HolidayHomingPointConfigWrap.__Register);
         
@@ -429,6 +432,18 @@
             translator.DelayWrapLoader(typeof(MapConfig), MapConfigWrap.__Register);
         
         
+            translator.DelayWrapLoader(typeof(MapData_10010Config), MapData_10010ConfigWrap.__Register);
+        
+        
+            translator.DelayWrapLoader(typeof(MapData_10080Config), MapData_10080ConfigWrap.__Register);
+        
+        
+            translator.DelayWrapLoader(typeof(MapData_10090Config), MapData_10090ConfigWrap.__Register);
+        
+        
+            translator.DelayWrapLoader(typeof(MapData_10120Config), MapData_10120ConfigWrap.__Register);
+        
+        
             translator.DelayWrapLoader(typeof(MapEventPointConfig), MapEventPointConfigWrap.__Register);
         
         
@@ -473,6 +488,10 @@
         
             translator.DelayWrapLoader(typeof(OSCBillTagAwardConfig), OSCBillTagAwardConfigWrap.__Register);
         
+        }
+        
+        static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(OSRedAchieveConfig), OSRedAchieveConfigWrap.__Register);
         
@@ -488,10 +507,6 @@
         
             translator.DelayWrapLoader(typeof(PersonalBossConfig), PersonalBossConfigWrap.__Register);
         
-        }
-        
-        static void wrapInit3(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(PetClassCostConfig), PetClassCostConfigWrap.__Register);
         
@@ -630,6 +645,10 @@
         
             translator.DelayWrapLoader(typeof(TreasureConfig), TreasureConfigWrap.__Register);
         
+        }
+        
+        static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(TreasureDungeonConfig), TreasureDungeonConfigWrap.__Register);
         
@@ -645,10 +664,6 @@
         
             translator.DelayWrapLoader(typeof(TreasureSkillConfig), TreasureSkillConfigWrap.__Register);
         
-        }
-        
-        static void wrapInit4(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(TreasureUpConfig), TreasureUpConfigWrap.__Register);
         
@@ -787,6 +802,10 @@
         
             translator.DelayWrapLoader(typeof(StoryHintModel), StoryHintModelWrap.__Register);
         
+        }
+        
+        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(LuaBehaviour), LuaBehaviourWrap.__Register);
         
@@ -802,10 +821,6 @@
         
             translator.DelayWrapLoader(typeof(UnityEngine.Object), UnityEngineObjectWrap.__Register);
         
-        }
-        
-        static void wrapInit5(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(UnityEngine.Vector2), UnityEngineVector2Wrap.__Register);
         
@@ -888,6 +903,15 @@
             translator.DelayWrapLoader(typeof(UnityEngine.Debug), UnityEngineDebugWrap.__Register);
         
         
+            translator.DelayWrapLoader(typeof(UnityEngine.UI.ScrollRect), UnityEngineUIScrollRectWrap.__Register);
+        
+        
+            translator.DelayWrapLoader(typeof(UnityEngine.UI.RawImage), UnityEngineUIRawImageWrap.__Register);
+        
+        
+            translator.DelayWrapLoader(typeof(UnityEngine.UI.InputField), UnityEngineUIInputFieldWrap.__Register);
+        
+        
             translator.DelayWrapLoader(typeof(ModelUtility), ModelUtilityWrap.__Register);
         
         
@@ -935,6 +959,10 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.BossShowModel), SnxxzUIBossShowModelWrap.__Register);
         
+        }
+        
+        static void wrapInit6(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.ChatBubbleModel), SnxxzUIChatBubbleModelWrap.__Register);
         
@@ -959,10 +987,6 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerBossModel), SnxxzUICrossServerBossModelWrap.__Register);
         
-        }
-        
-        static void wrapInit6(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerOneVsOneModel), SnxxzUICrossServerOneVsOneModelWrap.__Register);
         
@@ -1092,6 +1116,10 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.WorldBossModel), SnxxzUIWorldBossModelWrap.__Register);
         
+        }
+        
+        static void wrapInit7(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(FriendsModel), FriendsModelWrap.__Register);
         
@@ -1116,10 +1144,6 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.HappyXBModel), SnxxzUIHappyXBModelWrap.__Register);
         
-        }
-        
-        static void wrapInit7(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.HazyDemonKingModel), SnxxzUIHazyDemonKingModelWrap.__Register);
         
@@ -1249,6 +1273,10 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.AccumulateRechargeModel), SnxxzUIAccumulateRechargeModelWrap.__Register);
         
+        }
+        
+        static void wrapInit8(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.FestivalRedpackModel), SnxxzUIFestivalRedpackModelWrap.__Register);
         
@@ -1273,10 +1301,6 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.LuckyTreasureModel), SnxxzUILuckyTreasureModelWrap.__Register);
         
-        }
-        
-        static void wrapInit8(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.MonthlyInvestmentModel), SnxxzUIMonthlyInvestmentModelWrap.__Register);
         
@@ -1406,6 +1430,10 @@
         
             translator.DelayWrapLoader(typeof(HangUpSetModel), HangUpSetModelWrap.__Register);
         
+        }
+        
+        static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(PrivateRemind), PrivateRemindWrap.__Register);
         
@@ -1430,10 +1458,6 @@
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.TeamModel), SnxxzUITeamModelWrap.__Register);
         
-        }
-        
-        static void wrapInit9(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(Snxxz.UI.ConfirmCancel), SnxxzUIConfirmCancelWrap.__Register);
         
@@ -1563,6 +1587,10 @@
         
             translator.DelayWrapLoader(typeof(E_NpcType), E_NpcTypeWrap.__Register);
         
+        }
+        
+        static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(E_MovingState), E_MovingStateWrap.__Register);
         
@@ -1587,10 +1615,6 @@
         
             translator.DelayWrapLoader(typeof(E_SkillFuncType), E_SkillFuncTypeWrap.__Register);
         
-        }
-        
-        static void wrapInit10(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(E_SkillCastType), E_SkillCastTypeWrap.__Register);
         
@@ -1720,6 +1744,10 @@
         
             translator.DelayWrapLoader(typeof(ItemTipChildType), ItemTipChildTypeWrap.__Register);
         
+        }
+        
+        static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator)
+        {
         
             translator.DelayWrapLoader(typeof(InstalledAsset), InstalledAssetWrap.__Register);
         
@@ -1744,10 +1772,6 @@
         
             translator.DelayWrapLoader(typeof(FileExtersion), FileExtersionWrap.__Register);
         
-        }
-        
-        static void wrapInit11(LuaEnv luaenv, ObjectTranslator translator)
-        {
         
             translator.DelayWrapLoader(typeof(GMCommand), GMCommandWrap.__Register);
         

--
Gitblit v1.8.0