From 48c780320dc826c50015d31dea1bbe55e7cf5173 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 18:19:55 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(增加强制退出跨服状态;增加相关提示;增加部分匹配限制;组队匹配进入副本增加验证是否跨服匹配中)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index ded7ad0..70637d6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -82,6 +82,7 @@
 import PlayerFamilyTech
 import PlayerCostRebate
 import PlayerFairyCeremony
+import PlayerCrossRealmPK
 import FunctionNPCCommon
 import CrossRealmPlayer
 import ChNetSendPack
@@ -1714,6 +1715,12 @@
             NotifyCode(curPlayer, "SingleEnterPK", [mapID])
         return ShareDefine.EntFBAskRet_PKState
     
+    ## 跨服PK匹配中
+    if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer):
+        if isNotify:
+            NotifyCode(curPlayer, "CrossMatching8", [mapID])            
+        return ShareDefine.EntFBAskRet_CrossPKMatching
+    
     #===============================================================================================
     # # 这里不做状态限制,由前端处理,因为策划要根据界面来处理,同一传送功能有可能在不同界面
     # # PK状态检查

--
Gitblit v1.8.0