SnxxServerCode.git

			@@ -146,6 +146,7 @@
			Def_Notify_WorldKey_InitGameWorldTime = "InitGameWorldTime" #启动服务器时间
			Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息，参数为运营活动名
			Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态，参数为日常活动ID
			Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态，参数为日常活动ID
			Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
			Def_Notify_WorldKey_FBCanEnter = "FBCanEnter_%s" # 副本是否可进入，参数为副本DataMapID
			Def_Notify_WorldKey_FBFuncState = "FBFuncState_%s" # 副本状态，参数为副本DataMapID
			@@ -167,6 +168,10 @@
			Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据

			Def_Notify_WorldKey_MergeBoss = "Merge_Boss" # 跨服boss

			Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区
			Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季
			Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭，1-开启中

			Def_Notify_WorldKey_Merge_PK = "Merge_PK" # 跨服PK, 仅跨服服务器有用，做为触发PKState用
			Def_Notify_WorldKey_MergePKState = "MergePK_State" # 由跨服服务器控制的跨服PK活动状态
			@@ -313,7 +318,8 @@
			Def_mitDogzEquipPlus, # 神兽装备强化
			Def_mitRuneCompound, # 符印合成
			Def_mitGatherSoulCompound,# 聚魂合成
			) = range(1, 24)
			Def_mitGatherSoulDecompose,# 聚魂分解
			) = range(1, 25)

			#---写死的技能ID---
			Def_SkillID_AutoTruck = 62220 # 自动运镖buff
			@@ -992,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
			@@ -1198,12 +1204,11 @@
			CrossServerMsg_Notify = "Notify" # 提示信息
			CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
			CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
			CrossServerMsg_PKReadyOKRoomList = "PKMatchResult" # 跨服PK已准备好的房间列表
			CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList" # 跨服PK已准备好的房间列表
			CrossServerMsg_PKTimeoutRoomList = "PKTimeoutRoomList" # 跨服PK已超时的房间列表
			CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
			CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
			CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
			CrossServerMsg_PKActionState = "PKActionState" # 跨服PK活动状态变更

			# 子服发送跨服信息定义
			ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
			@@ -1211,6 +1216,7 @@
			ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
			ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
			ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
			ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜

			#跨服匹配PK奖励类型
			Def_MergePKAwardTypeList = (
			@@ -1360,7 +1366,7 @@
			)=range(5)

			# 战斗力模块类型
			Def_MFPType_Max = 26
			Def_MFPType_Max = 27
			ModuleFightPowerTypeList = (
			Def_MFPType_Role, # 角色 0
			Def_MFPType_Equip, # 装备(基本装备位) 1
			@@ -1385,6 +1391,7 @@
			Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
			Def_MFPType_Dogz, # 神兽 21
			Def_MFPType_GatherSoul, # 聚魂 22
			Def_MFPType_MagicWeapon4, # 王者法宝 23
			Def_MFPType_Other, # 其他

			#以下暂时没用到，改时再处理
			@@ -1536,7 +1543,8 @@
			DailyActionID_KillNPC, # 野外怪物
			DailyActionID_IceLode, # 冰晶矿脉
			DailyActionID_HelpBattleCheckIn, # 助战登记 20
			) = range(1, 20 + 1)
			DailyActionID_CrossReamPK, # 跨服PK 21
			) = range(1, 21 + 1)



			@@ -1674,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)