Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-24 336c229f0b32edc4d1dfd3579eb70c5bae142286

Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts into Cross_Server

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

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

                    }

                    break;

                case CrossServerModel.CrossServerDataMapId:

                case CrossServerOneVsOneModel.CrossServerDataMapId:

                    WindowCenter.Instance.CloseImmediately<DungeonBeginCoolDownWin>();

                    WindowCenter.Instance.CloseImmediately<DungeonEndCoolDownWin>();

                    if (!WindowCenter.Instance.IsOpen<BattlePrepareCoolDownWin>())


 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC001_tagGCCrossRealmPKMatchOK.cs

@@ -18,7 +18,7 @@
        {

            CrossServerLogin.Instance.UpdateCrossServerOneVsOneData(package);

            WindowCenter.Instance.Open<CrossServerOneVsOneEnterConfirmWin>();

            ModelCenter.Instance.GetModel<CrossServerModel>().IsMatching = false;

            ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>().IsMatching = false;

        }



    }


 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC002_tagGCCrossRealmPKStartMatch.cs

@@ -9,7 +9,7 @@


public class DTCC002_tagGCCrossRealmPKStartMatch : DtcBasic {



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

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

    public static event Action CrossServerStartMatchEvent;

    public override void Done(GameNetPackBasic vNetPack) {




 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC003_tagGCCrossRealmPKOverInfo.cs

@@ -4,7 +4,7 @@
// C0 03 跨服PK战斗结果 #tagGCCrossRealmPKOverInfo





public class DTCC003_tagGCCrossRealmPKOverInfo : DtcBasic {


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

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



    public override void Done(GameNetPackBasic vNetPack) {


        base.Done(vNetPack);



 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC004_tagGCCrossRealmPKSeasonInfo.cs

@@ -13,7 +13,7 @@
        base.Done(vNetPack);



        HC004_tagGCCrossRealmPKSeasonInfo vNetData = vNetPack as HC004_tagGCCrossRealmPKSeasonInfo;

        CrossServerPKSeason.Instance.UpdatePkSeason(vNetData);

        CrossServerOneVsOnePKSeason.Instance.UpdatePkSeason(vNetData);

    }



}


 Core/NetworkPackage/DTCFile/ServerPack/HC0_CrossRealm/DTCC006_tagGCCrossRealmPKSeasonState.cs

@@ -13,7 +13,7 @@
        base.Done(vNetPack);



        HC006_tagGCCrossRealmPKSeasonState vNetData = vNetPack as HC006_tagGCCrossRealmPKSeasonState;

        CrossServerPKSeason.Instance.UpdateSelfSeason(vNetData);

        CrossServerOneVsOnePKSeason.Instance.UpdateSelfSeason(vNetData);

    }



}


 Core/NetworkPackage/DTCFile/ServerPack/HC1_CrossRealm/DTCC101_tagMCCrossRealmPKPlayerInfo.cs

@@ -12,7 +12,7 @@
        base.Done(vNetPack);



        HC101_tagMCCrossRealmPKPlayerInfo vNetData = vNetPack as HC101_tagMCCrossRealmPKPlayerInfo;

        CrossServerPlayerInfo.Instance.UpdatePlayerInfo(vNetData);

        CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfo(vNetData);

    }



}


 Lua/Gen/DelegatesGensBridge.cs

@@ -417,7 +417,7 @@
#endif
        }
        
        public Snxxz.UI.CrossServerModel __Gen_Delegate_Imp18(object p0)
        public Snxxz.UI.CrossServerOneVsOneModel __Gen_Delegate_Imp18(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -431,7 +431,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                Snxxz.UI.CrossServerModel __gen_ret = (Snxxz.UI.CrossServerModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.CrossServerModel));
                Snxxz.UI.CrossServerOneVsOneModel __gen_ret = (Snxxz.UI.CrossServerOneVsOneModel)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.CrossServerOneVsOneModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -439,7 +439,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.CrossServerPkResult> __Gen_Delegate_Imp19(object p0)
        public System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePkResult> __Gen_Delegate_Imp19(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -453,7 +453,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                System.Collections.Generic.List<Snxxz.UI.CrossServerPkResult> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerPkResult>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerPkResult>));
                System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePkResult> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePkResult>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePkResult>));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -619,7 +619,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType> __Gen_Delegate_Imp27(object p0)
        public System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType> __Gen_Delegate_Imp27(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -633,7 +633,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType>));
                System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -641,7 +641,7 @@
#endif
        }
        
        public Snxxz.UI.CrossServerPkResult __Gen_Delegate_Imp28(object p0)
        public Snxxz.UI.CrossServerOneVsOnePkResult __Gen_Delegate_Imp28(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -655,7 +655,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                Snxxz.UI.CrossServerPkResult __gen_ret = (Snxxz.UI.CrossServerPkResult)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.CrossServerPkResult));
                Snxxz.UI.CrossServerOneVsOnePkResult __gen_ret = (Snxxz.UI.CrossServerOneVsOnePkResult)translator.GetObject(L, errFunc + 1, typeof(Snxxz.UI.CrossServerOneVsOnePkResult));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -663,7 +663,7 @@
#endif
        }
        
        public System.Collections.Generic.List<Snxxz.UI.CrossServerPKSeason.PkZoneInfo> __Gen_Delegate_Imp29(object p0)
        public System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo> __Gen_Delegate_Imp29(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -677,7 +677,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                System.Collections.Generic.List<Snxxz.UI.CrossServerPKSeason.PkZoneInfo> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerPKSeason.PkZoneInfo>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerPKSeason.PkZoneInfo>));
                System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo> __gen_ret = (System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo>)translator.GetObject(L, errFunc + 1, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo>));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE
@@ -707,7 +707,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp31(object p0, out Snxxz.UI.CrossServerPKSeason.PkZoneInfo p1)
        public bool __Gen_Delegate_Imp31(object p0, out Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -720,7 +720,7 @@
                
                PCall(L, 1, 2, errFunc);
                
                p1 = (Snxxz.UI.CrossServerPKSeason.PkZoneInfo)translator.GetObject(L, errFunc + 2, typeof(Snxxz.UI.CrossServerPKSeason.PkZoneInfo));
                p1 = (Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo)translator.GetObject(L, errFunc + 2, typeof(Snxxz.UI.CrossServerOneVsOnePKSeason.PkZoneInfo));
                
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);
@@ -730,7 +730,7 @@
#endif
        }
        
        public bool __Gen_Delegate_Imp32(object p0, out Snxxz.UI.CrossServerPKSeason.PkSeasonInfo p1)
        public bool __Gen_Delegate_Imp32(object p0, out Snxxz.UI.CrossServerOneVsOnePKSeason.PkSeasonInfo p1)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -743,7 +743,7 @@
                
                PCall(L, 1, 2, errFunc);
                
                p1 = (Snxxz.UI.CrossServerPKSeason.PkSeasonInfo)translator.GetObject(L, errFunc + 2, typeof(Snxxz.UI.CrossServerPKSeason.PkSeasonInfo));
                p1 = (Snxxz.UI.CrossServerOneVsOnePKSeason.PkSeasonInfo)translator.GetObject(L, errFunc + 2, typeof(Snxxz.UI.CrossServerOneVsOnePKSeason.PkSeasonInfo));
                
                bool __gen_ret = LuaAPI.lua_toboolean(L, errFunc + 1);
                LuaAPI.lua_settop(L, errFunc - 1);

 Lua/Gen/SnxxzUICrossServerModelWrap.cs

@@ -20,7 +20,7 @@
        public static void __Register(RealStatePtr L)
        {
            ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            System.Type type = typeof(Snxxz.UI.CrossServerModel);
            System.Type type = typeof(Snxxz.UI.CrossServerOneVsOneModel);
            Utils.BeginObjectRegister(type, L, translator, 0, 16, 14, 6);
            
            Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
@@ -70,10 +70,10 @@
            Utils.BeginClassRegister(type, L, __CreateInstance, 5, 0, 0);
            
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossServerDataMapId", Snxxz.UI.CrossServerModel.CrossServerDataMapId);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossArenaRedKey", Snxxz.UI.CrossServerModel.CrossArenaRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossDayAwardsRedKey", Snxxz.UI.CrossServerModel.CrossDayAwardsRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossMatchRedKey", Snxxz.UI.CrossServerModel.CrossMatchRedKey);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "CrossServerDataMapId", Snxxz.UI.CrossServerOneVsOneModel.CrossServerDataMapId);
            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);
            
            
            
@@ -90,7 +90,7 @@
                if(LuaAPI.lua_gettop(L) == 1)
                {
                    
                    Snxxz.UI.CrossServerModel gen_ret = new Snxxz.UI.CrossServerModel();
                    Snxxz.UI.CrossServerOneVsOneModel gen_ret = new Snxxz.UI.CrossServerOneVsOneModel();
                    translator.Push(L, gen_ret);
                    
                    return 1;
@@ -119,7 +119,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -146,7 +146,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -173,7 +173,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -200,7 +200,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -227,7 +227,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -254,7 +254,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -281,7 +281,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -308,7 +308,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -335,13 +335,13 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    Snxxz.UI.CrossServerModel.AwardType _start = (Snxxz.UI.CrossServerModel.AwardType)translator.GetObject(L, 2, typeof(Snxxz.UI.CrossServerModel.AwardType));
                    Snxxz.UI.CrossServerModel.AwardType _end = (Snxxz.UI.CrossServerModel.AwardType)translator.GetObject(L, 3, typeof(Snxxz.UI.CrossServerModel.AwardType));
                    Snxxz.UI.CrossServerOneVsOneModel.AwardType _start = (Snxxz.UI.CrossServerOneVsOneModel.AwardType)translator.GetObject(L, 2, typeof(Snxxz.UI.CrossServerOneVsOneModel.AwardType));
                    Snxxz.UI.CrossServerOneVsOneModel.AwardType _end = (Snxxz.UI.CrossServerOneVsOneModel.AwardType)translator.GetObject(L, 3, typeof(Snxxz.UI.CrossServerOneVsOneModel.AwardType));
                    
                        int gen_ret = gen_to_be_invoked.CompareByCompleteProgress( _start, _end );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
@@ -365,7 +365,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -393,7 +393,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -421,7 +421,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -448,12 +448,12 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
                {
                    Snxxz.UI.CrossServerPkResult _resultInfo = (Snxxz.UI.CrossServerPkResult)translator.GetObject(L, 2, typeof(Snxxz.UI.CrossServerPkResult));
                    Snxxz.UI.CrossServerOneVsOnePkResult _resultInfo = (Snxxz.UI.CrossServerOneVsOnePkResult)translator.GetObject(L, 2, typeof(Snxxz.UI.CrossServerOneVsOnePkResult));
                    
                    gen_to_be_invoked.SetPkInfoLocalSave( _resultInfo );
                    
@@ -476,7 +476,7 @@
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
            
            
                
@@ -504,7 +504,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.PkResultLocalSaveKey);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -518,7 +518,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.localSaveResults);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -532,7 +532,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsMatching);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -546,7 +546,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.matchStartTime);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -560,7 +560,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.freeMaxMatchNum);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -574,7 +574,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.buyMaxMatchNum);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -588,7 +588,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.priceFormula);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -602,7 +602,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.winStreakScoreFormula);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -616,7 +616,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.dayAwardTypelist);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -630,7 +630,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                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);
@@ -644,7 +644,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.sortDayAwardslist);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -658,7 +658,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.crossArenaRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -672,7 +672,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.crossDayAwardsRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -686,7 +686,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                translator.Push(L, gen_to_be_invoked.crossMatchRedpoint);
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -702,7 +702,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.IsMatching = LuaAPI.lua_toboolean(L, 2);
            
            } catch(System.Exception gen_e) {
@@ -717,7 +717,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                System.DateTime gen_value;translator.Get(L, 2, out gen_value);
                gen_to_be_invoked.matchStartTime = gen_value;
            
@@ -733,8 +733,8 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.sortDayAwardslist = (System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerModel.AwardType>));
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.sortDayAwardslist = (System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>)translator.GetObject(L, 2, typeof(System.Collections.Generic.List<Snxxz.UI.CrossServerOneVsOneModel.AwardType>));
            
            } catch(System.Exception gen_e) {
                return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
@@ -748,7 +748,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.crossArenaRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
            
            } catch(System.Exception gen_e) {
@@ -763,7 +763,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.crossDayAwardsRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
            
            } catch(System.Exception gen_e) {
@@ -778,7 +778,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
            
                Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
                Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                gen_to_be_invoked.crossMatchRedpoint = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint));
            
            } catch(System.Exception gen_e) {
@@ -795,7 +795,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
            Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                System.Action gen_delegate = translator.GetDelegate<System.Action>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action!");
@@ -829,7 +829,7 @@
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                int gen_param_count = LuaAPI.lua_gettop(L);
            Snxxz.UI.CrossServerModel gen_to_be_invoked = (Snxxz.UI.CrossServerModel)translator.FastGetCSObj(L, 1);
            Snxxz.UI.CrossServerOneVsOneModel gen_to_be_invoked = (Snxxz.UI.CrossServerOneVsOneModel)translator.FastGetCSObj(L, 1);
                System.Action gen_delegate = translator.GetDelegate<System.Action>(L, 3);
                if (gen_delegate == null) {
                    return LuaAPI.luaL_error(L, "#3 need System.Action!");

 Lua/Gen/XLuaGenAutoRegister.cs

@@ -302,7 +302,7 @@
            translator.DelayWrapLoader(typeof(SelectEquipModel), SelectEquipModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerModel), SnxxzUICrossServerModelWrap.__Register);
            translator.DelayWrapLoader(typeof(Snxxz.UI.CrossServerOneVsOneModel), SnxxzUICrossServerModelWrap.__Register);
        
        
            translator.DelayWrapLoader(typeof(Item_Class), Item_ClassWrap.__Register);

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

File was renamed from System/CrossServerOneVsOne/CrossServerArenaWin.cs
@@ -5,7 +5,7 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerArenaWin : Window

    public class CrossServerOneVsOneArenaWin : Window

    {

        [SerializeField] Button scoreRankBtn;

        [SerializeField] Button matchBtn;

@@ -24,7 +24,7 @@
        [SerializeField] GameObject outSeasonTimeObj;

        [SerializeField] GameObject lookPlayerObj;

        [SerializeField] Text lookTimeText;

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

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



        #region Built-in

        protected override void BindController()

@@ -70,7 +70,7 @@
            UpdatePKInfo();

            UpdateActivityState();

            UpdateLookPlayerTime();

            var pkSeason = CrossServerPKSeason.Instance;

            var pkSeason = CrossServerOneVsOnePKSeason.Instance;

            seasonTimeText.text = pkSeason.ToDisplaySeasonTime();

            var openTimes = pkSeason.GetActivityTimes();

            openTimeText.gameObject.SetActive(openTimes != null && openTimes.Count > 0);

@@ -99,7 +99,7 @@


        private void UpdateMatchInfo()

        {

            int remainNum = CrossServerPlayerInfo.Instance.GetDayRemainNum();

            int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

            if (remainNum > 0)

            {

                reaminNumText.text = StringUtility.Contact(UIHelper.AppendStringColor(TextColType.Green,remainNum.ToString()), "/", crossServerModel.freeMaxMatchNum);

@@ -112,9 +112,9 @@


        private void UpdatePKInfo()

        {

            winRateText.text = CrossServerPlayerInfo.Instance.DisplayWinningRate();

            sumNumText.text = CrossServerPlayerInfo.Instance.PKCount.ToString();

            winStreakText.text = CrossServerPlayerInfo.Instance.CWinCount.ToString();

            winRateText.text = CrossServerOneVsOnePlayerInfo.Instance.DisplayWinningRate();

            sumNumText.text = CrossServerOneVsOnePlayerInfo.Instance.PKCount.ToString();

            winStreakText.text = CrossServerOneVsOnePlayerInfo.Instance.CWinCount.ToString();

        }



        private void UpdateMinute()

@@ -191,15 +191,15 @@


        private void ClickBuyTimes()

        {

            int remainNum = CrossServerPlayerInfo.Instance.GetDayRemainNum();

            int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

            if (remainNum >= crossServerModel.freeMaxMatchNum) return;



            WindowCenter.Instance.Open<CrossSeverBuyMatchTimesWin>();

            WindowCenter.Instance.Open<CrossSeverOneVsOneBuyMatchTimesWin>();

        }



        private void ClickDayAward()

        {

            WindowCenter.Instance.Open<CrossServerDayAwardsWin>();

            WindowCenter.Instance.Open<CrossServerOneVsOneDayAwardsWin>();

        }





@@ -229,7 +229,7 @@


        private void ClickMatchRecord()

        {

            WindowCenter.Instance.Open<CrossMatchRecordWin>();

            WindowCenter.Instance.Open<CrossServerOneVsOneMatchRecordWin>();

        }



    }


 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs

File was renamed from System/CrossServerOneVsOne/CrossServerCyclicScroll.cs
@@ -12,12 +12,12 @@
namespace Snxxz.UI

{



    public class CrossServerCyclicScroll : CyclicScroll

    public class CrossServerOneVsOneCyclicScroll : CyclicScroll

    {

        const float fadeOutTime = 0.3f;

        const float relocationTime = 0.4f;



        CrossSeverDayAwardCell showAchievementBehaviour;

        CrossSeverOneVsOneDayAwardCell showAchievementBehaviour;



        bool m_Showing = false;

        public bool showing

@@ -26,9 +26,9 @@
            private set { m_Showing = value; }

        }



        List<CrossServerModel.AwardType> dayAwards;

        List<CrossServerOneVsOneModel.AwardType> dayAwards;



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

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



        public void ShowTreasures(bool _stepByStep)

        {

@@ -41,7 +41,7 @@
        {

            for (int i = 0; i < infiniteItems.Count; i++)

            {

                var item = infiniteItems[i] as CrossSeverDayAwardCell;

                var item = infiniteItems[i] as CrossSeverOneVsOneDayAwardCell;

                item.alphaTween.SetStartState();

                item.linerMove.Stop();

            }

@@ -60,7 +60,7 @@
            this.enabled = true;

        }



        public void ShowBegin(CrossSeverDayAwardCell _showItem)

        public void ShowBegin(CrossSeverOneVsOneDayAwardCell _showItem)

        {

            this.enabled = false;

            showing = true;

@@ -96,7 +96,7 @@
            var index = infiniteItems.IndexOf(_scrollItem);

            if (index != -1)

            {

                var showBehaviour = _scrollItem as CrossSeverDayAwardCell;

                var showBehaviour = _scrollItem as CrossSeverOneVsOneDayAwardCell;

                var lastItem = infiniteItems[infiniteItems.Count - 1];



                showBehaviour.rectTransform.anchoredPosition = lastItem.rectTransform.anchoredPosition.SetY(lastItem.rectTransform.anchoredPosition.y - cellSize.y - spacing.y);

@@ -106,7 +106,7 @@


                for (int i = 0; i < infiniteItems.Count; i++)

                {

                    var item = infiniteItems[i] as CrossSeverDayAwardCell;

                    var item = infiniteItems[i] as CrossSeverOneVsOneDayAwardCell;

                    if (item != null && preIndex + i < datas.Count)

                    {

                        item.Display(datas[preIndex + i]);

@@ -116,7 +116,7 @@
                for (int i = index; i < infiniteItems.Count; i++)

                {

                    var item = infiniteItems[i];

                    var achievementBehaviour = item as CrossSeverDayAwardCell;

                    var achievementBehaviour = item as CrossSeverOneVsOneDayAwardCell;



                    achievementBehaviour.linerMove.from = achievementBehaviour.rectTransform.anchoredPosition;

                    var toY = achievementBehaviour.rectTransform.anchoredPosition.y + cellSize.y + spacing.y;


 System/CrossServerOneVsOne/CrossServerOneVsOneCyclicScroll.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneDayAwardsWin.cs

File was renamed from System/CrossServerOneVsOne/CrossServerDayAwardsWin.cs
@@ -8,12 +8,12 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerDayAwardsWin : Window

    public class CrossServerOneVsOneDayAwardsWin : Window

    {

        [SerializeField] Button closeBtn;

        [SerializeField] CrossServerCyclicScroll m_AchievementScroll;

        [SerializeField] CrossServerOneVsOneCyclicScroll m_AchievementScroll;



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

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



        protected override void BindController()

        {


 System/CrossServerOneVsOne/CrossServerOneVsOneDayAwardsWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs

File was renamed from System/CrossServerOneVsOne/HonorShopCell.cs
@@ -5,7 +5,7 @@


namespace Snxxz.UI

{

    public class HonorShopCell : MonoBehaviour

    public class CrossServerOneVsOneHonorShopCell : MonoBehaviour

    {

        [SerializeField] ItemCell itemCell;

        [SerializeField] Text nameText;


 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneHonorStoreWin.cs

File was renamed from System/CrossServerOneVsOne/HonorStoreWin.cs
@@ -6,7 +6,7 @@


namespace Snxxz.UI

{

    public class HonorStoreWin : Window

    public class CrossServerOneVsOneHonorStoreWin : Window

    {

        [SerializeField] ScrollerController shopCtrl;



@@ -79,7 +79,7 @@
            for(int i = 0; i < length;i++)

            {

                int cellCount = length * cell.index + (i + 1);

                HonorShopCell shopCell = cell.transform.GetChild(i).GetComponent<HonorShopCell>();

                CrossServerOneVsOneHonorShopCell shopCell = cell.transform.GetChild(i).GetComponent<CrossServerOneVsOneHonorShopCell>();

                if(shoplist.Count >= cellCount)

                {

                    shopCell.gameObject.SetActive(true);


 System/CrossServerOneVsOne/CrossServerOneVsOneHonorStoreWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneMatchRecordWin.cs

File was renamed from System/CrossServerOneVsOne/CrossMatchRecordWin.cs
@@ -5,12 +5,12 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossMatchRecordWin : Window

    public class CrossServerOneVsOneMatchRecordWin : Window

    {

        [SerializeField] ScrollerController resultCtrl;

        [SerializeField] Button closeBtn;



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

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



        #region Built-in

        protected override void BindController()


 System/CrossServerOneVsOne/CrossServerOneVsOneMatchRecordWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneMatchResultCell.cs

File was renamed from System/CrossServerOneVsOne/CrossMatchResultCell.cs
@@ -6,13 +6,13 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossMatchResultCell : ScrollerUI

    public class CrossServerOneVsOneMatchResultCell : ScrollerUI

    {

        [SerializeField] Text dateTime;

        [SerializeField] Text info;

        [SerializeField] GameObject victory;

        [SerializeField] GameObject failure;

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

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



        public override void Refresh(CellView cell)

        {


 System/CrossServerOneVsOne/CrossServerOneVsOneMatchResultCell.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

File was renamed from System/CrossServerOneVsOne/CrossServerModel.cs
@@ -9,10 +9,10 @@
{

    [XLua.Hotfix]

    [XLua.LuaCallCSharp]

    public class CrossServerModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize,ISwitchAccount ,IPlayerLoginOk

    public class CrossServerOneVsOneModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize,ISwitchAccount ,IPlayerLoginOk

    {

        public string PkResultLocalSaveKey { get; private set; }

        public List<CrossServerPkResult> localSaveResults { get; private set; }

        public List<CrossServerOneVsOnePkResult> localSaveResults { get; private set; }

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

        public event Action UpdateDayAwardsEvent;

        public const int CrossServerDataMapId = 32010;

@@ -31,7 +31,7 @@
        {

            dungeonModel.updateMissionEvent -= UpdateFBHelp;

            rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;

            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;

            InitData();

        }



@@ -50,7 +50,7 @@
        public void OnPlayerLoginOk()

        {

            rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;

            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;

            dungeonModel.updateMissionEvent += UpdateFBHelp;

            UpdateDayAwardState();

            if(IsMatching)

@@ -66,14 +66,14 @@


        private void InitData()

        {

            CrossServerPKSeason.Instance.InitData();

            CrossServerPlayerInfo.Instance.InitData();

            pkResultInfo = new CrossServerPkResult();

            CrossServerOneVsOnePKSeason.Instance.InitData();

            CrossServerOneVsOnePlayerInfo.Instance.InitData();

            pkResultInfo = new CrossServerOneVsOnePkResult();

        }



        public void UpdateDayAwardState()

        {

            var playerInfo = CrossServerPlayerInfo.Instance;

            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;

            for(int i = 0; i < dayAwardTypelist.Count; i++)

            {

                var dayAward = dayAwardTypelist[i];

@@ -105,9 +105,9 @@
            var mission = dungeonModel.mission;

            if(mission.prepareTime > 0)

            {

                if(!WindowCenter.Instance.IsOpen<CrossServerRoundWin>())

                if(!WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())

                {

                    WindowCenter.Instance.Open<CrossServerRoundWin>();

                    WindowCenter.Instance.Open<CrossServerOneVsOneRoundWin>();

                }

            }



@@ -279,11 +279,11 @@
        #endregion



        #region 协议

        public CrossServerPkResult pkResultInfo { get; private set;}

        public CrossServerOneVsOnePkResult pkResultInfo { get; private set;}

        public event Action UpdatePkResultEvent;

        public void UpdatePKResultInfo(HC003_tagGCCrossRealmPKOverInfo pKOverInfo)

        {

            pkResultInfo = new CrossServerPkResult();

            pkResultInfo = new CrossServerOneVsOnePkResult();

            pkResultInfo.UpdatePkResult(pKOverInfo);

            SetPkInfoLocalSave(pkResultInfo);

            if(UpdatePkResultEvent != null)

@@ -314,19 +314,19 @@


        private void GetLocalSaveData()

        {

            localSaveResults = new List<CrossServerPkResult>();

            localSaveResults = new List<CrossServerOneVsOnePkResult>();

            string[] localJsons = LocalSave.GeStringArray(PkResultLocalSaveKey);

            if(localJsons != null)

            {

                for(int i = 0; i < localJsons.Length; i++)

                {

                    CrossServerPkResult resultInfo = JsonMapper.ToObject<CrossServerPkResult>(localJsons[i]);

                    CrossServerOneVsOnePkResult resultInfo = JsonMapper.ToObject<CrossServerOneVsOnePkResult>(localJsons[i]);

                    localSaveResults.Add(resultInfo);

                }

            }

        }



        public void SetPkInfoLocalSave(CrossServerPkResult resultInfo)

        public void SetPkInfoLocalSave(CrossServerOneVsOnePkResult resultInfo)

        {

            if (localSaveResults.Count >= 30)

            {

@@ -353,8 +353,8 @@
        public Redpoint crossMatchRedpoint = new Redpoint(CrossArenaRedKey, CrossMatchRedKey);

        public void UpdateCrossArenaRedpoint()

        {

            var playerInfo = CrossServerPlayerInfo.Instance;

            var pkSeason = CrossServerPKSeason.Instance;

            var playerInfo = CrossServerOneVsOnePlayerInfo.Instance;

            var pkSeason = CrossServerOneVsOnePKSeason.Instance;



            if(pkSeason.InDay(TimeUtility.ServerNow) 

                && pkSeason.InOpenTime()


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

File was renamed from System/CrossServerOneVsOne/CrossServerPKSeason.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerPKSeason : Singleton<CrossServerPKSeason>

    public class CrossServerOneVsOnePKSeason : Singleton<CrossServerOneVsOnePKSeason>

    {

        public int ZoneCount { get; private set;}    // 所有赛区个数



@@ -94,9 +94,9 @@
        private bool stepDateNotify = false;

        public  const int dailyQuestId = 31;

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

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

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



        public CrossServerPKSeason()

        public CrossServerOneVsOnePKSeason()

        {

            GlobalTimeEvent.Instance.secondEvent += SecondEvent;

        }


 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs

File was renamed from System/CrossServerOneVsOne/CrossServerPkResult.cs
@@ -6,7 +6,7 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerPkResult

    public class CrossServerOneVsOnePkResult

    {

        public string PkEndTime { get; private set; }   // 结算时间，格式 yyyy-MM-dd HH:mm:ss



@@ -28,7 +28,7 @@


        public string VsPlayerName { get; private set; }  //对手名字



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

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



        public void UpdatePkResult(HC003_tagGCCrossRealmPKOverInfo pKOverInfo)

        {


 System/CrossServerOneVsOne/CrossServerOneVsOnePkResult.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs

File was renamed from System/CrossServerOneVsOne/CrossServerPlayerInfo.cs
@@ -7,7 +7,7 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerPlayerInfo : Singleton<CrossServerPlayerInfo>

    public class CrossServerOneVsOnePlayerInfo : Singleton<CrossServerOneVsOnePlayerInfo>

    {

        public int Score { get; private set; }    // 当前积分



@@ -25,7 +25,7 @@


        public int DayBuyCount { get; private set; }     // 当日已购买次数



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

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

        public event Action UpdatePlayerInfoEvent;



        public void InitData()


 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerLeaveCoolDownWin.cs

File was renamed from System/CrossServerOneVsOne/DungeonPlayerLeaveCoolDownWin.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI

{



    public class DungeonPlayerLeaveCoolDownWin : Window

    public class CrossServerOneVsOnePlayerLeaveCoolDownWin : Window

    {

        [SerializeField]

        Transform m_CoolDownContainer;


 System/CrossServerOneVsOne/CrossServerOneVsOnePlayerLeaveCoolDownWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs

File was renamed from System/CrossServerOneVsOne/CrossServerRoundWin.cs
@@ -4,13 +4,13 @@
namespace Snxxz.UI

{

    [XLua.Hotfix]

    public class CrossServerRoundWin : Window

    public class CrossServerOneVsOneRoundWin : Window

    {

        [SerializeField] Text roundText;

        [SerializeField] Text resultText;

        [SerializeField] Text infoText;



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

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

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

        int coolTime = 0;

        #region Built-in


 System/CrossServerOneVsOne/CrossServerOneVsOneRoundWin.cs.meta

 System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs

File was renamed from System/CrossServerOneVsOne/DungeonWaitPlayerCoolDownWin.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI
{

    public class DungeonWaitPlayerCoolDownWin : Window
    public class CrossServerOneVsOneWaitPlayerCoolDownWin : Window
    {
        [SerializeField]
        Transform m_CoolDownContainer;

 System/CrossServerOneVsOne/CrossServerOneVsOneWaitPlayerCoolDownWin.cs.meta

 System/CrossServerOneVsOne/CrossServerRewardModel.cs

@@ -57,7 +57,7 @@
}

public class CrossServerRewardModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

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

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

    public Dictionary<int, SeasonAwardClass> SegmentRewardDic = new Dictionary<int, SeasonAwardClass>();

    public ImpactRankModel.RankAwardItem SeasonRewardDic = new ImpactRankModel.RankAwardItem();

    //Dictionary<int,>


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -21,7 +21,7 @@
        [SerializeField] Transform m_Normal;
        [SerializeField] Transform m_BrokenLine;
        #region Built-in
        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

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

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

        float timer = 0f;

        protected override void BindController()

 System/CrossServerOneVsOne/CrossServerWin.cs

@@ -34,8 +34,8 @@
        [SerializeField] GameObject honorStore_SelectImg;

        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

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

        CrossServerPlayerInfo playerInfo;

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

        CrossServerOneVsOnePlayerInfo playerInfo;

        #region Built-in

        protected override void BindController()

        {

@@ -82,7 +82,7 @@


        private void SetDisplay()

        {

            playerInfo = CrossServerPlayerInfo.Instance;

            playerInfo = CrossServerOneVsOnePlayerInfo.Instance;

            var playerData = PlayerDatas.Instance.baseData;

            headImg.SetSprite(GeneralDefine.GetOtherJobHeadPortrait(playerData.Job, 0));

            nameText.text = playerData.PlayerName;

@@ -137,7 +137,7 @@
        {

            if (honorStore_SelectImg.activeInHierarchy) return;

            CloseSubWindows();

            WindowCenter.Instance.Open<HonorStoreWin>();

            WindowCenter.Instance.Open<CrossServerOneVsOneHonorStoreWin>();

            honorStore_SelectImg.SetActive(true);

        }



@@ -164,11 +164,11 @@
            {

                if (windowState == WindowState.Opened)

                {

                    WindowCenter.Instance.OpenWithoutAnimation<CrossServerArenaWin>();

                    WindowCenter.Instance.OpenWithoutAnimation<CrossServerOneVsOneArenaWin>();

                }

                else

                {

                    WindowCenter.Instance.Open<CrossServerArenaWin>();

                    WindowCenter.Instance.Open<CrossServerOneVsOneArenaWin>();

                }

            }

            arena_SelectImg.SetActive(true);

@@ -197,8 +197,8 @@
            //{

            //    WindowCenter.Instance.Close(window);

            //}

            WindowCenter.Instance.CloseImmediately<CrossServerArenaWin>();

            WindowCenter.Instance.CloseImmediately<HonorStoreWin>();

            WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneArenaWin>();

            WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneHonorStoreWin>();

            WindowCenter.Instance.CloseImmediately<SeasonRewardWin>();

            WindowCenter.Instance.CloseImmediately<SegmentRewardWin>();

            WindowCenter.Instance.CloseImmediately<MatchWin>();


 System/CrossServerOneVsOne/CrossSeverOneVsOneBuyMatchTimesWin.cs

File was renamed from System/CrossServerOneVsOne/CrossSeverBuyMatchTimesWin.cs
@@ -4,7 +4,7 @@


namespace Snxxz.UI

{

    public class CrossSeverBuyMatchTimesWin : Window

    public class CrossSeverOneVsOneBuyMatchTimesWin : Window

    {

        [SerializeField] Text m_TodayBuyTimes;

        [SerializeField] Text m_CostRemind;

@@ -12,7 +12,7 @@
        [SerializeField] Button m_Close;

        [SerializeField] RectTransform m_ContainerBuylimit;



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

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

        ulong price = 0;

        #region Built-in

        protected override void BindController()

@@ -46,8 +46,8 @@


        private void SetDisplay()

        {

            int remainBuyTimes = CrossServerPlayerInfo.Instance.GetDayRemainBuyNum();

            price = (ulong)CrossServerPlayerInfo.Instance.GetBuyMatchNumPrice();

            int remainBuyTimes = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainBuyNum();

            price = (ulong)CrossServerOneVsOnePlayerInfo.Instance.GetBuyMatchNumPrice();

            m_CostRemind.text = Language.Get("TimesBuyLanguage3",price);

            m_ContainerBuylimit.gameObject.SetActive(remainBuyTimes <= 0);

            m_BuyTimes.gameObject.SetActive(remainBuyTimes > 0);


 System/CrossServerOneVsOne/CrossSeverOneVsOneBuyMatchTimesWin.cs.meta

 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

File was renamed from System/CrossServerOneVsOne/CrossSeverDayAwardCell.cs
@@ -7,7 +7,7 @@


namespace Snxxz.UI

{

    public class CrossSeverDayAwardCell : ScrollItem

    public class CrossSeverOneVsOneDayAwardCell : ScrollItem

    {

        [SerializeField] Text taskNameText;

        [SerializeField] Slider progressSlider;

@@ -15,7 +15,7 @@
        [SerializeField] Button recieveBtn;

        [SerializeField] Image stateImg;

        [SerializeField] List<CommonItemBaisc> itemBaiscs = new List<CommonItemBaisc>();

        [SerializeField] CrossServerCyclicScroll m_CrossServerCyclicScroll;

        [SerializeField] CrossServerOneVsOneCyclicScroll m_CrossServerCyclicScroll;



        [SerializeField] UIAlphaTween m_AlphaTween;

        public UIAlphaTween alphaTween { get { return m_AlphaTween; } }

@@ -23,11 +23,11 @@
        [SerializeField] UILinerMove m_LinerMove;

        public UILinerMove linerMove { get { return m_LinerMove; } }



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

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

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

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



        CrossServerModel.AwardType awardType;

        CrossServerOneVsOneModel.AwardType awardType;

        float height = 0;

        bool isLineMove = false;

        public override void Display(object _data)

@@ -36,7 +36,7 @@
            isLineMove = false;

            recieveBtn.AddListener(ClickRecieve);

            crossServerModel.UpdateDayAwardsEvent += UpdateDayAwards;

            awardType = (CrossServerModel.AwardType)_data;

            awardType = (CrossServerOneVsOneModel.AwardType)_data;

            DisplayDayAward();

        }



@@ -50,8 +50,8 @@
        private void DisplayDayAward()

        {

            var awardItems = awardType.awardItems;

            stateImg.gameObject.SetActive(awardType.progress != CrossServerModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerModel.AwardType.CompleteProgress.Completed);

            stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            progressSlider.minValue = 0;

            progressSlider.maxValue = awardType.num;

            progressSlider.value = awardType.curCompletedNum;


 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs.meta

 System/CrossServerOneVsOne/MatchWin.cs

@@ -57,7 +57,7 @@
        {

            crossServerRewardModel.IsOpenMatch = false;

            CloseImmediately();

            WindowCenter.Instance.Open<CrossServerArenaWin>();

            //WindowCenter.Instance.Open<CrossServerArenaWin>();

        }

    }


 System/CrossServerOneVsOne/RankingWin.cs

@@ -49,7 +49,7 @@

        protected override void OnPreOpen()
        {
            m_TextScores.text = CrossServerPlayerInfo.Instance.Score.ToString();
            m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString();
            SetTextMyRank();
            OnCreateGridLineCell(m_ScrollerController);

            m_ScrollerController.JumpIndex(0);
@@ -57,13 +57,13 @@

        protected override void OnAfterOpen()
        {
            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
            crossServerRewardModel.RankInformationUpdate += RankInformationUpdate;
        }

        protected override void OnPreClose()
        {

            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;

            crossServerRewardModel.RankInformationUpdate -= RankInformationUpdate;
        }



@@ -88,7 +88,7 @@
        }
        private void UpdatePlayerInfoEvent()

        {

            m_TextScores.text = CrossServerPlayerInfo.Instance.Score.ToString();

            m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString();

            SetTextMyRank();

        }
        void OnCreateGridLineCell(ScrollerController gridCtrl)

@@ -120,7 +120,7 @@

        private void SetTextMyRank()

        {

            int danlv = CrossServerPlayerInfo.Instance.DanLV;

            int danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV;

            var config= Config.Instance.Get<CrossServerArenaConfig>(danlv);

            if (config != null && danlv >= 6)

            {

@@ -140,7 +140,7 @@

        private void ZoneAndSeasonpanel()

        {

            if (CrossServerPKSeason.Instance.ZoneCount > 1)//赛区

            if (CrossServerOneVsOnePKSeason.Instance.ZoneCount > 1)//赛区

            {

                m_DivisionObj.gameObject.SetActive(true);

                if (m_ClickScreenOtherSpace1.activeSelf)

@@ -152,7 +152,7 @@
            {

                m_DivisionObj.gameObject.SetActive(false);

            }

            if (CrossServerPKSeason.Instance.SeasonID > 1)//赛区

            if (CrossServerOneVsOnePKSeason.Instance.SeasonID > 1)//赛区

            {

                m_SeasonObj.gameObject.SetActive(true);

                if (m_ClickScreenOtherSpace2.activeSelf)


 System/CrossServerOneVsOne/SeasonRewardWin.cs

@@ -37,13 +37,13 @@
        protected override void OnAfterOpen()
        {
            crossServerRewardModel.CrossRealmPKAwardStateUpdate += CrossRealmPKAwardStateUpdate;
            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
        }

        protected override void OnPreClose()
        {

            crossServerRewardModel.CrossRealmPKAwardStateUpdate -= CrossRealmPKAwardStateUpdate;

            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;
        }



        


 System/CrossServerOneVsOne/SegmentRewardCell.cs

@@ -45,7 +45,7 @@
                m_Text_Segment.text = dic.Name;

                ReceiveItem(id);

            }

            if ( CrossServerPlayerInfo.Instance.DanLV>=id)

            if ( CrossServerOneVsOnePlayerInfo.Instance.DanLV>=id)

            {

                bool Bool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, id);

                if (Bool)


 System/CrossServerOneVsOne/SegmentRewardWin.cs

@@ -41,13 +41,13 @@
        protected override void OnAfterOpen()
        {

            crossServerRewardModel.CrossRealmPKAwardStateUpdate += CrossRealmPKAwardStateUpdate;
            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent;
        }

        protected override void OnPreClose()
        {

            crossServerRewardModel.CrossRealmPKAwardStateUpdate -= CrossRealmPKAwardStateUpdate;
            CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;
        }





@@ -122,7 +122,7 @@
        private bool IsReceive(SeasonAwardClass _seasonAwardClass)//未领取

        {

            bool Bool = false;

            if (CrossServerPlayerInfo.Instance.DanLV >= _seasonAwardClass.DanLv && !crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, _seasonAwardClass.DanLv))

            if (CrossServerOneVsOnePlayerInfo.Instance.DanLV >= _seasonAwardClass.DanLv && !crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, _seasonAwardClass.DanLv))

            {

                Bool = true;

            }

@@ -131,7 +131,7 @@
        private bool IsReach(SeasonAwardClass _seasonAwardClass)//未达到

        {

            bool Bool = false;

            if (_seasonAwardClass.DanLv > CrossServerPlayerInfo.Instance.DanLV)

            if (_seasonAwardClass.DanLv > CrossServerOneVsOnePlayerInfo.Instance.DanLV)

            {

                Bool = true;

            }


 System/Dungeon/DungeonModel.cs

@@ -709,15 +709,15 @@
                switch(_type)

                {

                    case DungeonCoolDownType.WaitPlayer:

                        if(!WindowCenter.Instance.IsOpen<DungeonWaitPlayerCoolDownWin>())

                        if(!WindowCenter.Instance.IsOpen<CrossServerOneVsOneWaitPlayerCoolDownWin>())

                        {

                            WindowCenter.Instance.Open<DungeonWaitPlayerCoolDownWin>();

                            WindowCenter.Instance.Open<CrossServerOneVsOneWaitPlayerCoolDownWin>();

                        }

                        break;

                    case DungeonCoolDownType.PlayerLeave:

                        if (!WindowCenter.Instance.IsOpen<DungeonPlayerLeaveCoolDownWin>())

                        if (!WindowCenter.Instance.IsOpen<CrossServerOneVsOnePlayerLeaveCoolDownWin>())

                        {

                            WindowCenter.Instance.Open<DungeonPlayerLeaveCoolDownWin>();

                            WindowCenter.Instance.Open<CrossServerOneVsOnePlayerLeaveCoolDownWin>();

                        }

                        break;

                }


 System/WindowBase/ModelCenter.cs

@@ -211,7 +211,7 @@
            RegisterModel<DungeonAssistModel>();

            RegisterModel<MysticalPurchaseModel>();

            RegisterModel<FuncSwitchModel>();

            RegisterModel<CrossServerModel>();

            RegisterModel<CrossServerOneVsOneModel>();

            RegisterModel<CrossServerRewardModel>();

            RegisterModel<GatheringSoulModel>();

            RegisterModel<VirtualPackModel>();