From 8f9ba65c87a5f8cc0d59398638245ac1c788071e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 29 三月 2019 15:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerExam.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerExam.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerExam.py
index f8a5c4d..d3be8ca 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerExam.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerExam.py
@@ -170,7 +170,7 @@
 # @remarks 
 def Exam_ChangeState(state):
     # 跨服服务器功能限制
-    if GameWorld.IsMergeServer():
+    if GameWorld.IsCrossServer():
         return
     
     if state == 0:

--
Gitblit v1.8.0