SnxxServerCode.git

			@@ -177,7 +177,8 @@
			Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s" # 合服活动记录数据时机0-否 1-是
			Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s" # 合服活动可领奖时机0-否 1-是

			Def_Notify_WorldKey_GameWorldBossReborn = 'GameWorldBossReborn_%s' # 世界boss重生, %s为标识点28,29
			Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
			Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
			Def_Notify_WorldKey_BossKilledCnt = 'BossKilledCnt_%s' # boss击杀次数, 参数为NPCID
			Def_Notify_WorldKey_GameWorldBossOnlineCnt = "GameWorldBossOnlineCnt_%s" #世界boss重生时间计算在线人数统计 %s为bossid
			Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer' # boss分流玩家信息
			@@ -228,11 +229,13 @@
			OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
			OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
			OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
			OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
			OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
			OperationActionName_BossReborn,OperationActionName_SpringSale,
			OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
			OperationActionName_RealmPoint, OperationActionName_FlashSale,
			OperationActionName_WishingWell, OperationActionName_TotalRecharge]
			OperationActionName_WishingWell, OperationActionName_TotalRecharge,
			OperationActionName_WeekParty, ]
			#需要记录开启活动时的世界等级的运营活动
			NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]

			@@ -897,7 +900,9 @@
			Def_TalkExtraValue_Bit_GM, #GM
			Def_TalkExtraValue_Bit_JOB, #job
			Def_TalkExtraValue_Bit_BubbleBox, #气泡框
			) = range(0, 4)
			Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID
			Def_TalkExtraValue_Bit_LV, #等级
			) = range(0, 6)

			#聊天信息附加值中某信息数据所占位置
			#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
			@@ -906,6 +911,8 @@
			Def_TalkExtraValue_Bit_GM:[2, 3], # GM
			Def_TalkExtraValue_Bit_JOB:[3, 4], # job
			Def_TalkExtraValue_Bit_BubbleBox:[4, 6], # 气泡框
			Def_TalkExtraValue_Bit_ServerGroupID:[6, 13], # 服务器组ID
			Def_TalkExtraValue_Bit_LV:[13, 17], # 等级
			}

			# 聊天频道暂用语音
			@@ -973,7 +980,7 @@
			Def_UniversalGameRecType_27,
			Def_UniversalGameRecType_28,
			Def_UniversalGameRecType_BossInfo, # boss信息29
			Def_UniversalGameRecType_30,
			Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息
			Def_UniversalGameRecType_31,
			Def_UniversalGameRecType_32,
			Def_UniversalGameRecType_ManorWarInfo, # 领地争夺战占领结果33
			@@ -1188,6 +1195,7 @@
			CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
			CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
			CrossServerMsg_Notify = "Notify" # 提示信息
			CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
			CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
			CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
			CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
			@@ -1196,20 +1204,32 @@
			CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
			CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
			CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
			CrossServerMsg_CrossBossInfo = "CrossBossInfo" # 跨服Boss信息
			CrossServerMsg_CrossBossState = "CrossBossState" # 跨服Boss状态
			CrossServerMsg_PutInItem = "PutInItem" # 获得物品
			CrossServerMsg_GiveMoney = "GiveMoney" # 获得货币
			CrossServerMsg_DropGoodItem = "DropGoodItem" # 掉落好物品
			CrossServerMsg_RebornRet = "RebornRet" # 复活结果
			CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
			CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成

			# 子服发送跨服信息定义
			ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
			ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
			ClientServerMsg_GMCMD = "GMCMD" # GM命令
			ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
			ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
			ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
			ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
			ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
			ClientServerMsg_Reborn = "Reborn" # 复活
			ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
			ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
			ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC

			# 跨服活动类型
			(
			Def_CrossAction_PK, # 跨服匹配PK
			) = range(1)
			#跨服广播类型定义
			CrossNotify_World = "World"
			CrossNotify_Family = "Family"

			#角色改名结果
			(
			@@ -1259,6 +1279,7 @@
			Def_IudetWingProgressValue = 42 #羽翼精炼值
			Def_IudetCreateTime = 44 # 时效物品的创建时间
			Def_IudetGatherSoulLV = 46 # 聚魂等级
			Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
			# 200~300 宠物数据用
			Def_IudetPet_NPCID = 200 # npcID
			Def_IudetPet_ClassLV = 202 # 阶级
			@@ -1320,7 +1341,7 @@
			)=range(5)

			# 战斗力模块类型
			Def_MFPType_Max = 27
			Def_MFPType_Max = 28
			ModuleFightPowerTypeList = (
			Def_MFPType_Role, # 角色 0
			Def_MFPType_Equip, # 装备(基本装备位) 1
			@@ -1346,6 +1367,7 @@
			Def_MFPType_Dogz, # 神兽 21
			Def_MFPType_GatherSoul, # 聚魂 22
			Def_MFPType_MagicWeapon4, # 王者法宝 23
			Def_MFPType_Coat, # ʱװ 24
			Def_MFPType_Other, # 其他

			#以下暂时没用到，改时再处理
			@@ -1702,8 +1724,11 @@
			retBaldric5, #17 佩饰
			retBaldric6, #18 佩饰
			retHorse, #19 坐骑
			retWeaponSkin, #20 时装武器
			retClothesSkin, #21 时装衣服
			retWeapon2Skin, #22 时装副手
			retMax,
			) = range(1, 21)
			) = range(1, 24)


			# 神兽装备位定义
			@@ -1733,9 +1758,10 @@
			EntFBAskRet_TJG, # 12 脱机挂中
			EntFBAskRet_Sit, # 13 打坐中
			EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
			EntFBAskRet_InCrossMap, # 15 跨服地图中
			EntFBAskRet_Other, # xx 其他限制
			EntFBAskRet_Max,
			) = range(17)
			) = range(18)


			#增加仙盟活跃的活动类型