From 27b47cf6b4ab46c5daeae9676b01a292daaf642f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 11:28:44 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(删除旧跨服封包)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index af51dfc..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
@@ -1366,7 +1366,7 @@
 )=range(5)
 
 # 战斗力模块类型
-Def_MFPType_Max = 26
+Def_MFPType_Max = 27
 ModuleFightPowerTypeList = (
 Def_MFPType_Role, # 角色 0
 Def_MFPType_Equip, # 装备(基本装备位) 1
@@ -1391,6 +1391,7 @@
 Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
 Def_MFPType_Dogz, # 神兽 21
 Def_MFPType_GatherSoul, # 聚魂 22
+Def_MFPType_MagicWeapon4, # 王者法宝 23
 Def_MFPType_Other, # 其他
 
 #以下暂时没用到,改时再处理
@@ -1681,8 +1682,8 @@
 SuccType_DogzBattle, #x神兽出战129
 SuccType_DogzEquipPlus, #出战神兽装备总强化X级130
 SuccType_Collect, #采集X物品X次131
-SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)44
-SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)45
+SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂(不包含核心)132
+SuccType_GatherSoulLvUp, #累计聚魂总等级XX(不包含核心)133
 ) = range(1, 134)
 
 

--
Gitblit v1.8.0