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

client_Hale

2018-12-27 283d6f496211a319b5b4ea85eb0bba91b444927b

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

 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs

@@ -24,7 +24,10 @@
        DEBUG_0102 = true;

        DTC0403_tagPlayerLoginLoadOK.finishedLogin = false;

        DEBUG_STEP = 0;

        DTC0403_tagPlayerLoginLoadOK.neverLoginOk = true;

        if (vNetData.socketType == GameNetSystem.SocketType.Main)

        {

            DTC0403_tagPlayerLoginLoadOK.neverLoginOk = true;

        }



        MapTransferUtility.Instance.lastMoveToWorldBossTime = float.MinValue;

        MapTransferUtility.Instance.lastMoveToWorldBossNpcID = 0;


 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs

@@ -32,7 +32,7 @@
        switch (vNetData.socketType)

        {

            case GameNetSystem.SocketType.Main:

                if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr5 == 1)

                if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.Main)

                {

                    var mapOk = new C0107_tagCInitMapOK();

                    mapOk.MapID = PlayerDatas.Instance.baseData.MapID;

@@ -41,7 +41,7 @@
                }

                break;

            case GameNetSystem.SocketType.CrossSever:

                if (loginModel.reconnectBackGround)

                if (loginModel.reconnectBackGround || StageManager.Instance.socketType != GameNetSystem.SocketType.CrossSever)

                {

                    var mapOk = new C0107_tagCInitMapOK();

                    mapOk.MapID = PlayerDatas.Instance.baseData.MapID;


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0431_tagTimeTick.cs

@@ -26,8 +26,7 @@
                        WindowCenter.Instance.Open<BattlePrepareCoolDownWin>();

                    }

                    break;

                case CrossServerOneVsOneModel.CrossServerDataMapId:

                    WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

                case CrossServerOneVsOneModel.CrossServerDataMapId:                  
                    if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>())

                    {

                        WindowCenter.Instance.Open<BattlePrepareCoolDownWin>();

@@ -38,6 +37,7 @@
        switch (mapId)

        {

            case CrossServerOneVsOneModel.CrossServerDataMapId:

                WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

                WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();

                break;

        }


 Fight/GameActor/GA_Hero.cs

@@ -984,6 +984,8 @@


    PlayerTaskDatas m_TaskModel;

    PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }

    PlayerMainDate m_MainModel;

    PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

    private void UpdateAutoStartFight()

    {

        if (DTCB105_tagMCPlayerWallow.forceOffLine)

@@ -1001,7 +1003,15 @@
                 && !NewBieCenter.Instance.inGuiding

                 && PlayerTaskDatas.IsOPenAutoResolve())

            {

                SnxxzGame.Instance.StartCoroutine(Wait());

                if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun

             && onMainModel.MoveBool)

                {



                }

                else

                {

                    SnxxzGame.Instance.StartCoroutine(Wait());

                }             
            }

        }




 Lua/Gen/DelegatesGensBridge.cs

@@ -1008,7 +1008,30 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp44(object p0, object p1)
        public int __Gen_Delegate_Imp44(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                
                PCall(L, 2, 1, errFunc);
                
                
                int __gen_ret = LuaAPI.xlua_tointeger(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public bool __Gen_Delegate_Imp45(object p0, object p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1031,7 +1054,7 @@
#endif
        }
        
        public Snxxz.UI.DungeonAssistModel __Gen_Delegate_Imp45(object p0)
        public Snxxz.UI.DungeonAssistModel __Gen_Delegate_Imp46(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1053,7 +1076,7 @@
#endif
        }
        
        public FriendsModel __Gen_Delegate_Imp46(object p0)
        public FriendsModel __Gen_Delegate_Imp47(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1075,7 +1098,7 @@
#endif
        }
        
        public Snxxz.UI.TreasureModel __Gen_Delegate_Imp47(object p0)
        public Snxxz.UI.TreasureModel __Gen_Delegate_Imp48(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1097,7 +1120,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp48(object p0, bool p1, float p2)
        public void __Gen_Delegate_Imp49(object p0, bool p1, float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1121,7 +1144,7 @@
#endif
        }
        
        public System.Collections.Generic.List<string> __Gen_Delegate_Imp49(object p0)
        public System.Collections.Generic.List<string> __Gen_Delegate_Imp50(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1143,7 +1166,7 @@
#endif
        }
        
        public Snxxz.UI.FairyModel __Gen_Delegate_Imp50(object p0)
        public Snxxz.UI.FairyModel __Gen_Delegate_Imp51(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1165,7 +1188,7 @@
#endif
        }
        
        public Snxxz.UI.TeamModel __Gen_Delegate_Imp51(object p0)
        public Snxxz.UI.TeamModel __Gen_Delegate_Imp52(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1187,7 +1210,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp52(object p0, int p1, out int p2)
        public bool __Gen_Delegate_Imp53(object p0, int p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1211,7 +1234,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp53(object p0, out string p1)
        public bool __Gen_Delegate_Imp54(object p0, out string p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1234,7 +1257,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp54(object p0, out int p1, out int p2)
        public bool __Gen_Delegate_Imp55(object p0, out int p1, out int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1258,7 +1281,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp55(object p0, out int p1, out float p2)
        public bool __Gen_Delegate_Imp56(object p0, out int p1, out float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1282,7 +1305,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp56(object p0, VipPrivilegeType p1)
        public int __Gen_Delegate_Imp57(object p0, VipPrivilegeType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1305,7 +1328,7 @@
#endif
        }
        
        public Snxxz.UI.DungeonAssistModel.RelatedToPlayer __Gen_Delegate_Imp57(object p0, int p1)
        public Snxxz.UI.DungeonAssistModel.RelatedToPlayer __Gen_Delegate_Imp58(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1328,7 +1351,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<string, TableConfig.DungeonHelpBattleConfig> __Gen_Delegate_Imp58(object p0)
        public System.Collections.Generic.Dictionary<string, TableConfig.DungeonHelpBattleConfig> __Gen_Delegate_Imp59(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1350,7 +1373,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>> __Gen_Delegate_Imp59(object p0)
        public System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>> __Gen_Delegate_Imp60(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1372,7 +1395,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp60(object p0, int p1, bool p2)
        public int __Gen_Delegate_Imp61(object p0, int p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1396,7 +1419,7 @@
#endif
        }
        
        public TableConfig.DungeonHelpBattleConfig __Gen_Delegate_Imp61(object p0, int p1, int p2)
        public TableConfig.DungeonHelpBattleConfig __Gen_Delegate_Imp62(object p0, int p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1420,7 +1443,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp62(object p0, object p1, object p2, bool p3, bool p4)
        public void __Gen_Delegate_Imp63(object p0, object p1, object p2, bool p3, bool p4)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1446,7 +1469,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp63(object p0, object p1, out string p2, out string p3, out bool p4, out bool p5)
        public bool __Gen_Delegate_Imp64(object p0, object p1, out string p2, out string p3, out bool p4, out bool p5)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1473,7 +1496,7 @@
#endif
        }
        
        public Snxxz.UI.DungeonAssistModel.AssistPlayerInfo __Gen_Delegate_Imp64(object p0, int p1)
        public Snxxz.UI.DungeonAssistModel.AssistPlayerInfo __Gen_Delegate_Imp65(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1496,7 +1519,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.DungeonAssistModel.AssistPlayerInfo> __Gen_Delegate_Imp65(object p0)
        public System.Collections.Generic.List<Snxxz.UI.DungeonAssistModel.AssistPlayerInfo> __Gen_Delegate_Imp66(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1518,7 +1541,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp66(object p0, int p1, int p2, int p3)
        public void __Gen_Delegate_Imp67(object p0, int p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1543,7 +1566,7 @@
#endif
        }
        
        public Snxxz.UI.Redpoint __Gen_Delegate_Imp67(object p0)
        public Snxxz.UI.Redpoint __Gen_Delegate_Imp68(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1565,7 +1588,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp68(object p0, float p1)
        public void __Gen_Delegate_Imp69(object p0, float p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1588,7 +1611,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp69(object p0)
        public System.Collections.IEnumerator __Gen_Delegate_Imp70(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1610,7 +1633,7 @@
#endif
        }
        
        public StoreModel __Gen_Delegate_Imp70(object p0)
        public StoreModel __Gen_Delegate_Imp71(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1632,7 +1655,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp71(object p0, PlayerDataRefresh p1)
        public void __Gen_Delegate_Imp72(object p0, PlayerDataRefresh p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1655,7 +1678,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp72(object p0, Snxxz.UI.PlayerDetails.DetailType p1)
        public void __Gen_Delegate_Imp73(object p0, Snxxz.UI.PlayerDetails.DetailType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1678,7 +1701,7 @@
#endif
        }
        
        public Snxxz.UI.FairyFeastModel __Gen_Delegate_Imp73(object p0)
        public Snxxz.UI.FairyFeastModel __Gen_Delegate_Imp74(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1700,7 +1723,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp74(object p0, Snxxz.UI.FairyFeastRank p1, Snxxz.UI.FairyFeastRank p2)
        public int __Gen_Delegate_Imp75(object p0, Snxxz.UI.FairyFeastRank p1, Snxxz.UI.FairyFeastRank p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1724,7 +1747,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp75(object p0, uint p1, int p2)
        public void __Gen_Delegate_Imp76(object p0, uint p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1748,7 +1771,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp76(object p0, int p1)
        public System.Collections.IEnumerator __Gen_Delegate_Imp77(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1771,7 +1794,7 @@
#endif
        }
        
        public PlayerMainDate __Gen_Delegate_Imp77(object p0)
        public PlayerMainDate __Gen_Delegate_Imp78(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1793,7 +1816,7 @@
#endif
        }
        
        public Snxxz.UI.RuneTowerModel __Gen_Delegate_Imp78(object p0)
        public Snxxz.UI.RuneTowerModel __Gen_Delegate_Imp79(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1815,7 +1838,7 @@
#endif
        }
        
        public Snxxz.UI.BossHomeModel __Gen_Delegate_Imp79(object p0)
        public Snxxz.UI.BossHomeModel __Gen_Delegate_Imp80(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1837,7 +1860,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp80(object p0, DungeonCoolDownType p1)
        public void __Gen_Delegate_Imp81(object p0, DungeonCoolDownType p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1860,7 +1883,7 @@
#endif
        }
        
        public IceCrystalVeinModel __Gen_Delegate_Imp81(object p0)
        public IceCrystalVeinModel __Gen_Delegate_Imp82(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1882,7 +1905,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp82(object p0, int p1, bool p2)
        public void __Gen_Delegate_Imp83(object p0, int p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1906,7 +1929,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp83(object p0, int p1, object p2, int p3)
        public void __Gen_Delegate_Imp84(object p0, int p1, object p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1931,7 +1954,7 @@
#endif
        }
        
        public Snxxz.UI.PlayerPackModel __Gen_Delegate_Imp84(object p0)
        public Snxxz.UI.PlayerPackModel __Gen_Delegate_Imp85(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1953,7 +1976,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp85(object p0, Snxxz.UI.Item p1, Snxxz.UI.Item p2)
        public int __Gen_Delegate_Imp86(object p0, Snxxz.UI.Item p1, Snxxz.UI.Item p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -1977,7 +2000,7 @@
#endif
        }
        
        public string __Gen_Delegate_Imp86(object p0, int p1)
        public string __Gen_Delegate_Imp87(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2000,7 +2023,7 @@
#endif
        }
        
        public Snxxz.UI.FairyFeastTransmitShow __Gen_Delegate_Imp87()
        public Snxxz.UI.FairyFeastTransmitShow __Gen_Delegate_Imp88()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2021,7 +2044,7 @@
#endif
        }
        
        public UnityEngine.Camera __Gen_Delegate_Imp88(object p0)
        public UnityEngine.Camera __Gen_Delegate_Imp89(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2043,7 +2066,7 @@
#endif
        }
        
        public Snxxz.UI.FairyFeastTransmitShow.FairyTransmitModel __Gen_Delegate_Imp89(object p0)
        public Snxxz.UI.FairyFeastTransmitShow.FairyTransmitModel __Gen_Delegate_Imp90(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2065,7 +2088,7 @@
#endif
        }
        
        public float __Gen_Delegate_Imp90(object p0)
        public float __Gen_Delegate_Imp91(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2087,7 +2110,7 @@
#endif
        }
        
        public Snxxz.UI.RoleParticularModel __Gen_Delegate_Imp91(object p0)
        public Snxxz.UI.RoleParticularModel __Gen_Delegate_Imp92(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2109,7 +2132,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp92(object p0, ulong p1)
        public void __Gen_Delegate_Imp93(object p0, ulong p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2132,7 +2155,7 @@
#endif
        }
        
        public UnityEngine.GameObject __Gen_Delegate_Imp93(object p0)
        public UnityEngine.GameObject __Gen_Delegate_Imp94(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2154,7 +2177,7 @@
#endif
        }
        
        public int __Gen_Delegate_Imp94(object p0, Snxxz.UI.ServerItem p1, Snxxz.UI.ServerItem p2)
        public int __Gen_Delegate_Imp95(object p0, Snxxz.UI.ServerItem p1, Snxxz.UI.ServerItem p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2178,7 +2201,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp95(bool p0)
        public void __Gen_Delegate_Imp96(bool p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2200,7 +2223,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulDungeonModel __Gen_Delegate_Imp96(object p0)
        public Snxxz.UI.GatherSoulDungeonModel __Gen_Delegate_Imp97(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2222,7 +2245,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp97(object p0, int p1, uint p2)
        public void __Gen_Delegate_Imp98(object p0, int p1, uint p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2246,7 +2269,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp98(object p0, int p1, byte p2)
        public void __Gen_Delegate_Imp99(object p0, int p1, byte p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2270,7 +2293,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulComposeModel __Gen_Delegate_Imp99(object p0)
        public Snxxz.UI.GatherSoulComposeModel __Gen_Delegate_Imp100(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2292,7 +2315,7 @@
#endif
        }
        
        public Snxxz.UI.GatheringSoulModel __Gen_Delegate_Imp100(object p0)
        public Snxxz.UI.GatheringSoulModel __Gen_Delegate_Imp101(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2314,7 +2337,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulComposeModel.ComposeCategory> __Gen_Delegate_Imp101(object p0)
        public System.Collections.Generic.List<Snxxz.UI.GatherSoulComposeModel.ComposeCategory> __Gen_Delegate_Imp102(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2336,7 +2359,7 @@
#endif
        }
        
        public System.Collections.Generic.Dictionary<Snxxz.UI.GatherSoulComposeModel.ComposeCategory, System.Collections.Generic.List<int>> __Gen_Delegate_Imp102(object p0)
        public System.Collections.Generic.Dictionary<Snxxz.UI.GatherSoulComposeModel.ComposeCategory, System.Collections.Generic.List<int>> __Gen_Delegate_Imp103(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2358,7 +2381,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulComposeModel.ComposeCategory __Gen_Delegate_Imp103(object p0)
        public Snxxz.UI.GatherSoulComposeModel.ComposeCategory __Gen_Delegate_Imp104(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2380,7 +2403,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp104(object p0, Snxxz.UI.GatherSoulComposeModel.ComposeCategory p1)
        public void __Gen_Delegate_Imp105(object p0, Snxxz.UI.GatherSoulComposeModel.ComposeCategory p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2403,7 +2426,7 @@
#endif
        }
        
        public Snxxz.UI.VirtualItem __Gen_Delegate_Imp105(object p0)
        public Snxxz.UI.VirtualItem __Gen_Delegate_Imp106(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2425,7 +2448,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp106(object p0, Snxxz.UI.VirtualItem p1)
        public void __Gen_Delegate_Imp107(object p0, Snxxz.UI.VirtualItem p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2448,7 +2471,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp107(object p0, int p1, out Snxxz.UI.GatherSoulComposeModel.Compose p2)
        public bool __Gen_Delegate_Imp108(object p0, int p1, out Snxxz.UI.GatherSoulComposeModel.Compose p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2472,7 +2495,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp108(object p0, ScrollerDataType p1, int p2, out float p3)
        public bool __Gen_Delegate_Imp109(object p0, ScrollerDataType p1, int p2, out float p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2497,7 +2520,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp109(object p0, int p1, int p2, bool p3)
        public void __Gen_Delegate_Imp110(object p0, int p1, int p2, bool p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2522,7 +2545,7 @@
#endif
        }
        
        public Snxxz.UI.GatherSoulDungeonHelp __Gen_Delegate_Imp110(object p0)
        public Snxxz.UI.GatherSoulDungeonHelp __Gen_Delegate_Imp111(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2544,7 +2567,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp111(object p0, Snxxz.UI.GatherSoulDungeonHelp p1)
        public void __Gen_Delegate_Imp112(object p0, Snxxz.UI.GatherSoulDungeonHelp p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2567,7 +2590,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp112(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo> p2)
        public bool __Gen_Delegate_Imp113(object p0, int p1, out System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo> p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -2584,29 +2607,6 @@
                p2 = (System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo>)translator.GetObject(L, errFunc + 2, typeof(System.Collections.Generic.List<Snxxz.UI.GatherSoulDungeonModel.ItemInfo>));
                
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public int __Gen_Delegate_Imp113(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                LuaAPI.xlua_pushinteger(L, p1);
                
                PCall(L, 2, 1, errFunc);
                
                
                int __gen_ret = LuaAPI.xlua_tointeger(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -3895,7 +3895,29 @@
#endif
        }
        
        public Treasure3DConfig __Gen_Delegate_Imp169(object p0)
        public Snxxz.UI.KingTreasureModel __Gen_Delegate_Imp169(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
            {
#endif
                RealStatePtr L = luaEnv.rawL;
                int errFunc = LuaAPI.pcall_prepare(L, errorFuncRef, luaReference);
                ObjectTranslator translator = luaEnv.translator;
                translator.PushAny(L, p0);
                
                PCall(L, 1, 1, errFunc);
                
                
                Snxxz.UI.KingTreasureModel __gen_ret = (Snxxz.UI.KingTreasureModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.KingTreasureModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
            }
#endif
        }
        
        public Treasure3DConfig __Gen_Delegate_Imp170(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3917,7 +3939,7 @@
#endif
        }
        
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp170(object p0)
        public Snxxz.UI.AchievementModel __Gen_Delegate_Imp171(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3939,7 +3961,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp171(object p0, int p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp172(object p0, int p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3962,7 +3984,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp172(object p0, UnityEngine.Vector3 p1)
        public UnityEngine.Vector3 __Gen_Delegate_Imp173(object p0, UnityEngine.Vector3 p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -3985,7 +4007,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp173(object p0, float p1)
        public System.Collections.IEnumerator __Gen_Delegate_Imp174(object p0, float p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4008,7 +4030,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp174(object p0, bool p1, bool p2)
        public void __Gen_Delegate_Imp175(object p0, bool p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4032,7 +4054,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp175(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        public void __Gen_Delegate_Imp176(object p0, Snxxz.UI.TreasureAnimation.TreasureShowStep p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4055,7 +4077,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp176(object p0, bool p1, int p2)
        public void __Gen_Delegate_Imp177(object p0, bool p1, int p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4079,7 +4101,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp177(object p0, PackType p1, int p2, int p3)
        public void __Gen_Delegate_Imp178(object p0, PackType p1, int p2, int p3)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4104,7 +4126,7 @@
#endif
        }
        
        public UnityEngine.Transform __Gen_Delegate_Imp178(object p0)
        public UnityEngine.Transform __Gen_Delegate_Imp179(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4126,7 +4148,7 @@
#endif
        }
        
        public UnityEngine.Vector3 __Gen_Delegate_Imp179(object p0)
        public UnityEngine.Vector3 __Gen_Delegate_Imp180(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4148,7 +4170,7 @@
#endif
        }
        
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp180(object p0)
        public Treasure3DConfig.TreasureParam __Gen_Delegate_Imp181(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4170,7 +4192,7 @@
#endif
        }
        
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp181()
        public Snxxz.UI.UI3DTreasureSelectStage __Gen_Delegate_Imp182()
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4191,7 +4213,7 @@
#endif
        }
        
        public TreasureCategory __Gen_Delegate_Imp182(object p0)
        public TreasureCategory __Gen_Delegate_Imp183(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4213,7 +4235,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp183(object p0, bool p1, TreasureCategory p2)
        public void __Gen_Delegate_Imp184(object p0, bool p1, TreasureCategory p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4237,7 +4259,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp184(object p0, TreasureCategory p1, object p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp185(object p0, TreasureCategory p1, object p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4261,7 +4283,7 @@
#endif
        }
        
        public void __Gen_Delegate_Imp185(object p0, TreasureCategory p1, bool p2)
        public void __Gen_Delegate_Imp186(object p0, TreasureCategory p1, bool p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4285,7 +4307,7 @@
#endif
        }
        
        public System.Collections.IEnumerator __Gen_Delegate_Imp186(object p0, object p1, float p2)
        public System.Collections.IEnumerator __Gen_Delegate_Imp187(object p0, object p1, float p2)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -4309,7 +4331,7 @@
#endif
        }
        
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp187(object p0)
        public Snxxz.UI.SignInModel __Gen_Delegate_Imp188(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)

 Lua/Gen/SnxxzUICrossServerOneVsOneModelWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.CrossServerOneVsOneModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 19, 14, 5);
            Utils.BeginObjectRegister(type, L, translator, 0, 20, 16, 6);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnBeforePlayerDataInitialize", _m_OnBeforePlayerDataInitialize);
@@ -35,6 +35,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "UpdatePKResultInfo", _m_UpdatePKResultInfo);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendCrossMatch", _m_SendCrossMatch);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SendBuyMatchCount", _m_SendBuyMatchCount);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetMatchTip", _m_TryGetMatchTip);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnReceivePackage", _m_OnReceivePackage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "TryGetOneVsOneHistory", _m_TryGetOneVsOneHistory);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "SetPkInfoLocalSave", _m_SetPkInfoLocalSave);
@@ -54,13 +55,16 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "priceFormula", _g_get_priceFormula);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "winStreakScoreFormula", _g_get_winStreakScoreFormula);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "dayAwardTypelist", _g_get_dayAwardTypelist);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "afterOpenDayOpenCross", _g_get_afterOpenDayOpenCross);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "pkResultInfo", _g_get_pkResultInfo);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossOneVsOneRedpoint", _g_get_crossOneVsOneRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossArenaRedpoint", _g_get_crossArenaRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossDayAwardsRedpoint", _g_get_crossDayAwardsRedpoint);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "crossMatchRedpoint", _g_get_crossMatchRedpoint);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "IsMatching", _s_set_IsMatching);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "matchStartTime", _s_set_matchStartTime);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossOneVsOneRedpoint", _s_set_crossOneVsOneRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossArenaRedpoint", _s_set_crossArenaRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossDayAwardsRedpoint", _s_set_crossDayAwardsRedpoint);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "crossMatchRedpoint", _s_set_crossMatchRedpoint);
@@ -69,10 +73,11 @@
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);

            Utils.BeginClassRegister(type, L, __CreateInstance, 5, 0, 0);
            Utils.BeginClassRegister(type, L, __CreateInstance, 6, 0, 0);
            
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossServerDataMapId", Snxxz.UI.CrossServerOneVsOneModel.CrossServerDataMapId);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossOneVsOneRedKey", Snxxz.UI.CrossServerOneVsOneModel.CrossOneVsOneRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossArenaRedKey", Snxxz.UI.CrossServerOneVsOneModel.CrossArenaRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossDayAwardsRedKey", Snxxz.UI.CrossServerOneVsOneModel.CrossDayAwardsRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossMatchRedKey", Snxxz.UI.CrossServerOneVsOneModel.CrossMatchRedKey);
@@ -444,6 +449,34 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_TryGetMatchTip(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    
                        bool gen_ret = gen_to_be_invoked.TryGetMatchTip(  );
                        LuaAPI.lua_pushboolean(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_OnReceivePackage(RealStatePtr L)
        {
            try {
@@ -702,6 +735,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_afterOpenDayOpenCross(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.afterOpenDayOpenCross);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_pkResultInfo(RealStatePtr L)
        {
            try {
@@ -709,6 +756,20 @@
            
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.pkResultInfo);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_crossOneVsOneRedpoint(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.crossOneVsOneRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
@@ -791,6 +852,21 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_crossOneVsOneRedpoint(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.crossOneVsOneRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 0;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_crossArenaRedpoint(RealStatePtr L)
        {
            try {

 Lua/Gen/SnxxzUIFairyFeastModelWrap.cs

@@ -352,7 +352,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.FairyFeastModel gen_to_be_invoked = (Snxxz.UI.FairyFeastModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.transmitCostSeconds);
                LuaAPI.lua_pushnumber(L, gen_to_be_invoked.transmitCostSeconds);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }

 Lua/Gen/StageManagerWrap.cs

@@ -21,7 +21,7 @@
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(StageManager);
            Utils.BeginObjectRegister(type, L, translator, 0, 5, 9, 2);
            Utils.BeginObjectRegister(type, L, translator, 0, 5, 11, 3);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "LoadCreateRoleStage", _m_LoadCreateRoleStage);
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "LoadSelectRoleStage", _m_LoadSelectRoleStage);
@@ -31,6 +31,7 @@
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "loadingProgressEvent", _e_loadingProgressEvent);
            
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isServerPreparing", _g_get_isServerPreparing);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isCrossServerPreparing", _g_get_isCrossServerPreparing);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "StageType", _g_get_StageType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "CurrentStage", _g_get_CurrentStage);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "currentMapId", _g_get_currentMapId);
@@ -38,9 +39,11 @@
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "stageAssetName", _g_get_stageAssetName);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isLoading", _g_get_isLoading);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "isClientChangeMap", _g_get_isClientChangeMap);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "socketType", _g_get_socketType);
            Utils.RegisterFunc(L, Utils.GETTER_IDX, "onStageLoadFinish", _g_get_onStageLoadFinish);
            
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "isServerPreparing", _s_set_isServerPreparing);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "isCrossServerPreparing", _s_set_isCrossServerPreparing);
            Utils.RegisterFunc(L, Utils.SETTER_IDX, "onStageLoadFinish", _s_set_onStageLoadFinish);
            
            
@@ -186,6 +189,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_isCrossServerPreparing(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                StageManager gen_to_be_invoked = (StageManager)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.isCrossServerPreparing);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_StageType(RealStatePtr L)
        {
            try {
@@ -284,6 +301,20 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_socketType(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                StageManager gen_to_be_invoked = (StageManager)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.socketType);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
            }
            return 1;
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _g_get_onStageLoadFinish(RealStatePtr L)
        {
            try {
@@ -315,6 +346,21 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _s_set_isCrossServerPreparing(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
			
                StageManager gen_to_be_invoked = (StageManager)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.isCrossServerPreparing = LuaAPI.lua_toboolean(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_onStageLoadFinish(RealStatePtr L)
        {
            try {

 Lua/Gen/UIHelperWrap.cs

@@ -31,7 +31,7 @@
            Utils.EndObjectRegister(type, L, translator, null, null,
                null, null, null);

            Utils.BeginClassRegister(type, L, __CreateInstance, 49, 0, 0);
            Utils.BeginClassRegister(type, L, __CreateInstance, 64, 0, 0);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSuitNameByName", _m_GetSuitNameByName_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetSurplusSeconds", _m_GetSurplusSeconds_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetTime", _m_GetTime_xlua_st_);
@@ -44,6 +44,7 @@
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetPropertyDecimalCount", _m_GetPropertyDecimalCount_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "HasSpecialCharac", _m_HasSpecialCharac_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetColorNameByItemColor", _m_GetColorNameByItemColor_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetDanLVColor", _m_GetDanLVColor_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetUIColor", _m_GetUIColor_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "AppendStringColor", _m_AppendStringColor_xlua_st_);
            Utils.RegisterFunc(L, Utils.CLS_IDX, "GetRealmName", _m_GetRealmName_xlua_st_);
@@ -81,6 +82,20 @@
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_LightGreen", UIHelper.s_LightGreen);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_LightYellow", UIHelper.s_LightYellow);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_Gray", UIHelper.s_Gray);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV0", UIHelper.s_BrightDanLV0);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV1", UIHelper.s_BrightDanLV1);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV2", UIHelper.s_BrightDanLV2);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV3", UIHelper.s_BrightDanLV3);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV4", UIHelper.s_BrightDanLV4);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV5", UIHelper.s_BrightDanLV5);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_BrightDanLV6", UIHelper.s_BrightDanLV6);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV0", UIHelper.s_GrayDanLV0);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV1", UIHelper.s_GrayDanLV1);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV2", UIHelper.s_GrayDanLV2);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV3", UIHelper.s_GrayDanLV3);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV4", UIHelper.s_GrayDanLV4);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV5", UIHelper.s_GrayDanLV5);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "s_GrayDanLV6", UIHelper.s_GrayDanLV6);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FightPowerFormula", UIHelper.FightPowerFormula);
            
            
@@ -424,6 +439,49 @@
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetDanLVColor_xlua_st_(RealStatePtr L)
        {
            try {
            
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
            
                int gen_param_count = LuaAPI.lua_gettop(L);
            
                if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 2)) 
                {
                    int _danLv = LuaAPI.xlua_tointeger(L, 1);
                    bool _bright = LuaAPI.lua_toboolean(L, 2);
                    
                        UnityEngine.Color gen_ret = UIHelper.GetDanLVColor( _danLv, _bright );
                        translator.PushUnityEngineColor(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                if(gen_param_count == 1&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)) 
                {
                    int _danLv = LuaAPI.xlua_tointeger(L, 1);
                    
                        UnityEngine.Color gen_ret = UIHelper.GetDanLVColor( _danLv );
                        translator.PushUnityEngineColor(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 UIHelper.GetDanLVColor!");
            
        }
        
        [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
        static int _m_GetUIColor_xlua_st_(RealStatePtr L)
        {
            try {

 System/Compose/New/ComposeWin.cs

@@ -254,7 +254,6 @@


        private void OnClickWingsCompose()

        {



            CloseSubWindows();

            if (windowState == WindowState.Opened)

            {

@@ -270,6 +269,7 @@


        private void GatherSoulCompose()

        {

            ComposeModel.SetCurComposeModel(null);

            CloseSubWindows();

            if (windowState == WindowState.Opened)

            {


 System/Compose/New/ComposeWinModel.cs

@@ -1290,6 +1290,7 @@
    Equip = 4,

    Item = 5,

    MountDogz = 6,

    GatherSoul = 7,

}



public enum NeedMatType


 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs

@@ -86,6 +86,7 @@
                }

                else

                {

                    stateImg.gameObject.SetActive(false);

                    sellImg.gameObject.SetActive(true);

                    itemCell.countText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Red, remainNum.ToString()),

                        "/" + canBuyCnt.ToString());


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -325,7 +325,7 @@
                UpdatePkResultEvent();

            }

        }



        PlayerBuffDatas buffDatas { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } }

        /// <summary>

        ///0-取消匹配; 1-进行匹配

        /// </summary>

@@ -337,6 +337,7 @@
            CC101_tagCMCrossRealmPKMatch match = new CC101_tagCMCrossRealmPKMatch();

            match.Type = (byte)type;

            GameNetSystem.Instance.SendInfo(match);

            CrossServerRewardModel.PkType = buffDatas.PkType;

        }



        public void SendBuyMatchCount()


 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -345,7 +345,7 @@
    {

        var match = new CC104_tagCMExitCrossRealm();

        GameNetSystem.Instance.SendToCrossServer(match);



        SetPkType();

    }



    private static int pkDanLvNow = 0;

@@ -397,6 +397,18 @@
            redPointStre2.state = RedPointState.None;

        }

    }



    private static int m_PkType = 0;

    public static int PkType

    {

        get { return m_PkType; }

        set { m_PkType = value; }

    }



    private static void SetPkType()

    {

        DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType);

    }

}






 System/FairyAu/FairyFeastModel.cs

@@ -16,7 +16,7 @@


        public event Action fairyFeastPlayerUpdate;



        public int transmitCostSeconds { get; private set; }

        public float transmitCostSeconds { get; private set; }

        string expFormula { get; set; }

        public int riseLevel { get; private set; }

        public int expFlyStage { get; private set; }

@@ -52,7 +52,7 @@
            expFlyStage = 3;

            if (config != null)

            {

                transmitCostSeconds = int.Parse(config.Numerical2);

                transmitCostSeconds = float.Parse(config.Numerical2) / 1000;

                expFlyStage = int.Parse(config.Numerical3);

                expFlyCount = int.Parse(config.Numerical4);

            }


 System/GatheringSoul/GatherSoulBuildBehaviour.cs

@@ -35,6 +35,14 @@
            }

        }



        bool isCollecting

        {

            get

            {

                return WindowCenter.Instance.IsOpen<RealmCollectWin>();

            }

        }



        GatherSoulDungeonModel model

        {

            get { return ModelCenter.Instance.GetModel<GatherSoulDungeonModel>(); }

@@ -53,10 +61,10 @@


            model.missionHelpUpdate -= MissionHelpUpdate;

            model.missionHelpUpdate += MissionHelpUpdate;

            PlayerRealmData.OnPlayerCollect -= OnPlayerCollect;

            PlayerRealmData.OnPlayerCollect += OnPlayerCollect;

            PlayerRealmData.OnPlayerCollectEnd -= OnPlayerCollectEnd;

            PlayerRealmData.OnPlayerCollectEnd += OnPlayerCollectEnd;

            WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterOpenEvent;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

            DisplayBase();

            DisplayEffect();

        }

@@ -64,8 +72,8 @@
        public void Dispose()

        {

            model.missionHelpUpdate -= MissionHelpUpdate;

            PlayerRealmData.OnPlayerCollect -= OnPlayerCollect;

            PlayerRealmData.OnPlayerCollectEnd -= OnPlayerCollectEnd;

            WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterOpenEvent;

            WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;

            collectNpcId = 0;

            serverInstanceId = 0;

            satisfyBuild = false;

@@ -85,7 +93,7 @@
        {

            m_AttackEffect.StopImediatly();

            m_IceEffect.StopImediatly();

            if (PrepareHandler.Instance.isPreparing)

            if (isCollecting)

            {

                if (buildNpcId == model.attckDefendNpcId)

                {

@@ -98,19 +106,19 @@
            }

        }



        private void OnPlayerCollect(H0812_tagBeginPrepare package)

        private void WindowAfterOpenEvent(Window window)

        {

            DisplayEffect();

        }



        private void OnPlayerCollectEnd(int arg1, byte arg2)

        private void WindowAfterCloseEvent(Window window)

        {

            DisplayEffect();

        }



        private void BuildAttackDefend()

        {

            if (PrepareHandler.Instance.isPreparing)

            if (isCollecting)

            {

                return;

            }

@@ -127,7 +135,7 @@


        private void BuildIceDefend()

        {

            if (PrepareHandler.Instance.isPreparing)

            if (isCollecting)

            {

                return;

            }


 System/GatheringSoul/GatherSoulDungeonHintWin.cs

@@ -16,6 +16,7 @@
    public class GatherSoulDungeonHintWin : Window

    {

        [SerializeField] Text m_HelpRemind;

        [SerializeField] Image m_HeadIcon;



        [SerializeField] RectTransform m_ContainerReady;

        [SerializeField] RectTransform m_ContainerTarget;

@@ -78,11 +79,14 @@
            if (mission.step <= 1)

            {

                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_0"));

                m_HeadIcon.SetSprite("XT_JH_11");

            }

            else

            {

                m_HelpRemind.text = UIHelper.ReplaceNewLine(Language.Get("GatherSoulHelpRemind_1"));

                m_HeadIcon.SetSprite("XT_JH_10");

            }

            m_HeadIcon.SetNativeSize();

        }



        void DisplayMissionTarget()


 System/MainInterfacePanel/HighSettingTip.cs

@@ -60,7 +60,7 @@
        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } }

        PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }



        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        private void Start()

        {

@@ -364,9 +364,26 @@
        }

        void OnClickCrossServerBtn()//跨服PK

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<CrossServerWin>();

            int limitlv = Config.Instance.Get<FuncOpenLVConfig>(157).LimitLV;

            if (FuncOpen.Instance.IsFuncOpen(157)&& TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                WindowCenter.Instance.Open<CrossServerWin>();

            }

            else

            {

                if (PlayerDatas.Instance.baseData.LV >= limitlv)

                {

                    SysNotifyMgr.Instance.ShowTip("CrossMatching14", limitlv);

                }

                else

                {

                    SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross);

                }     
            }

        }



          
        public void ShowButton()//向上

        {




 System/WindowJump/WindowJumpMgr.cs

@@ -175,7 +175,10 @@
            case JumpUIType.ComposeFunc5:

            case JumpUIType.TicketCompose1:

            case JumpUIType.TicketCompose2:

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.GatherSoul271:

                composeModel.SetCurComposeModel(null);

                SetJumpLogic<ComposeWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.EquipCompose1: