From e02ac9afc27cf8cb820302ca7f61697e6db3fbf9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 十二月 2018 18:33:16 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（是否跨服服务器判断错误）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 8 ++++----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index e42e2c6..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():
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
index b4d8357..eae5dde 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.py
@@ -51,7 +51,7 @@
playerID = curPlayer.GetPlayerID()
GameWorld.Log("GY_Query_CrossRealmReg DoResult %s" % funResult, playerID)
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
GameWorld.Log(" 跨服服务器不允许上传报名数据!", playerID)
return
--
Gitblit v1.8.0