From 1deb0b9086974c1205cddee149b88b6974d35ecd Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 13:59:21 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（删除旧跨服无用代码）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 0ed63b0..37cf805 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -67,7 +67,7 @@
GameWorld.Log("跨服报名成功 , actionType=%s" % (actionType), playerID)
# 跨服PK上传数据完毕，通知跨服服务器，准备完毕
- if actionType == ShareDefine.Def_MergeAction_MergePK:
+ if actionType == ShareDefine.Def_CrossAction_PK:
regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID)
vsRoomID = curPlayer.GetVsRoomId()
--
Gitblit v1.8.0