From 2af64e0aa0a6d8c4aea5fed79986adfa364a1ace Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 19:38:10 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(Add: C1 03 跨服PK玩家历史赛季信息 #tagMCCrossRealmPKPlayerHisSeasonInfo)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index f498649..9d4f853 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -129,7 +129,7 @@
 def ClientServerMsg_PKMatch(serverGroupID, playerInfoDict, tick):
     ## 请求匹配
     
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         GameWorld.ErrLog("非跨服服务器不处理跨服PK匹配请求!")
         return
     
@@ -192,7 +192,7 @@
 def ClientServerMsg_PKCancel(playerInfoDict, tick):
     ## 取消匹配
     
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         GameWorld.ErrLog("非跨服服务器不处理取消跨服PK匹配!")
         return
     
@@ -248,7 +248,7 @@
 def ClientServerMsg_PKPrepareOK(playerInfoDict, tick):
     ## 玩家跨服对战数据准备OK
     
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         GameWorld.ErrLog("非跨服服务器不处理取消跨服PK匹配!")
         return
     
@@ -324,7 +324,7 @@
     ## 玩家跨服PK匹配定时处理逻辑
     
     # 非跨服服务器不处理跨服PK匹配逻辑
-    if not GameWorld.IsMergeServer():
+    if not GameWorld.IsCrossServer():
         return
     
     if not IsCrossRealmPKOpen():
@@ -333,7 +333,7 @@
     # 同步子服排行榜
     #__SyncBillboardToClientServer(False, tick)
     
-    processTick = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 1)
+    processTick = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 1) * 1000
     processTickKey = "PKMatchLastTick"
     lastProcessTick = GameWorld.GetGameWorld().GetDictByKey(processTickKey)
     if tick - lastProcessTick < processTick:
@@ -346,7 +346,7 @@
     __ReadyOKRoomPlayerProcess(tick)
     
     maxGroupCnt = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 2)
-    outTimeTick = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 3)
+    outTimeTick = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 3) * 1000
     
     # 每个赛区单独匹配
     for pkZoneID, matchPlayerIDList in PyGameData.g_crossPKZoneMatchPlayerDict.items():

--
Gitblit v1.8.0