From 669ad215fec240afaf92be612f2b0077731c8e0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 10:38:46 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服代码)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index e32d51e..fbdd9b5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -998,7 +998,7 @@
                                 Def_UniversalGameRecType_40,
                                 Def_UniversalGameRecType_RedPacketRecord,   # 红包产出结果记录41
                                 Def_UniversalGameRecType_42,
-                                Def_UniversalGameRecType_MergeEvent, # 跨服玩家数据变更事件信息43
+                                Def_UniversalGameRecType_43,
                                 Def_UniversalGameRecType_MergePKAwardRecord, # 跨服PK奖励领取记录44
                                 Def_UniversalGameRecType_MergePKTopPlayerEquip, # 跨服PK赛高手玩家装备预览信息45
                                 Def_UniversalGameRecType_MergePKScoreAward, # 跨服PK积分领奖记录46

--
Gitblit v1.8.0