From d68d2b97c4309cc841129d8b0fe4985b8a640c4c Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期六, 22 十二月 2018 17:59:10 +0800
Subject: [PATCH] 5398 子 【开发】【1.4】跨服竞技场 ,正在进入跨服时,限制进入副本

---
 System/CrossServerOneVsOne/CrossServerModel.cs |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/System/CrossServerOneVsOne/CrossServerModel.cs b/System/CrossServerOneVsOne/CrossServerModel.cs
index af7006f..1b2dc54 100644
--- a/System/CrossServerOneVsOne/CrossServerModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerModel.cs
@@ -9,7 +9,7 @@
 {
     [XLua.Hotfix]
     [XLua.LuaCallCSharp]
-    public class CrossServerModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk
+    public class CrossServerModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize,ISwitchAccount ,IPlayerLoginOk
     {
         public string PkResultLocalSaveKey { get; private set; }
         public List<CrossServerPkResult> localSaveResults { get; private set; }
@@ -23,12 +23,12 @@
 
         public override void Init()
         {
+            IsMatching = false;
             ParseFuncConfig();
         }
 
         public void OnBeforePlayerDataInitialize()
         {
-            IsMatching = false;
             dungeonModel.updateMissionEvent -= UpdateFBHelp;
             rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;
             CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;
@@ -42,12 +42,21 @@
             GetLocalSaveData();
         }
 
+        public void OnSwitchAccount()
+        {
+            IsMatching = false;
+        }
+
         public void OnPlayerLoginOk()
         {
             rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;
             CrossServerPlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;
             dungeonModel.updateMissionEvent += UpdateFBHelp;
             UpdateDayAwardState();
+            if(IsMatching)
+            {
+                SendCrossMatch(1);
+            }
         }
 
         public override void UnInit()
@@ -57,6 +66,7 @@
 
         private void InitData()
         {
+            CrossServerPKSeason.Instance.InitData();
             CrossServerPlayerInfo.Instance.InitData();
             pkResultInfo = new CrossServerPkResult();
         }

--
Gitblit v1.8.0