SnxxServerCode.git

			@@ -167,24 +167,9 @@

			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活动状态
			Def_Notify_WorldKey_MergePKDayID = "MergePK_DayID" # 跨服PK活动日ID
			Def_Notify_WorldKey_MergePKWeekID = "MergePK_WeekID" # 跨服PK活动周ID
			Def_Notify_WorldKey_MergePKSeasonID = "MergePK_SeasonID" # 跨服PK活动赛季ID
			Def_Notify_WorldKey_MergePKSeasonStartTime = "MergePK_SeasonStartTime" # 跨服PK活动当前赛季开始时间
			Def_Notify_WorldKey_IsSeasonEnd = "MergePK_IsSeasonEnd" # 跨服PK活动当前赛季是否结束

			Def_Notify_WorldKey_Merge_King = "Merge_King" # 由跨服服务器控制的跨服王者争霸活动状态
			Def_Notify_WorldKey_Merge_KingStartID = "Merge_KingStartID" # 王者争霸开始活动ID, 用于奖励状态重置
			Def_Notify_WorldKey_Merge_KingOverID = "Merge_KingOverID" # 王者争霸结束活动ID, 用于奖励状态重置
			Def_Notify_WorldKey_Merge_KingServerHonour = "Merge_KingServerHonour" # 王者争霸本服荣耀排位

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

			Def_BT_CostTeHui, #消费特惠排行榜
			Def_BT_CostTeHuiLast, #消费特惠排行榜上一期
			Def_BT_MergePKDay, #跨服PK日积分榜
			Def_BT_MergePKWeek, #跨服PK周积分榜

			Def_BT_Max, #排行榜最大类型
			) = range(0, 34 + 2)
			) = range(0, 32 + 2)

			#职业对应战力排行榜类型
			JobFightPowerBillboardDict = {
			@@ -967,7 +950,7 @@
			Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
			Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
			Def_UniversalGameRecType_11,
			Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
			Def_UniversalGameRecType_12,
			Def_UniversalGameRecType_13,
			Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
			Def_UniversalGameRecType_15,
			@@ -999,14 +982,14 @@
			Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41
			Def_UniversalGameRecType_42,
			Def_UniversalGameRecType_43,
			Def_UniversalGameRecType_MergePKAwardRecord, # 跨服PK奖励领取记录44
			Def_UniversalGameRecType_MergePKTopPlayerEquip, # 跨服PK赛高手玩家装备预览信息45
			Def_UniversalGameRecType_MergePKScoreAward, # 跨服PK积分领奖记录46
			Def_UniversalGameRecType_MergeKingBattleRecord, # 跨服王者争霸对战信息47
			Def_UniversalGameRecType_MergeKingBattleRecordLast, # 跨服王者争霸上一期对战信息48
			Def_UniversalGameRecType_MergeKingSupportRecord, # 跨服王者争霸支持押注信息49
			Def_UniversalGameRecType_MergeKingTopPlayerEquip, # 跨服王者争霸高手玩家装备预览信息50
			Def_UniversalGameRecType_MergePKUnNotifyOver, # 跨服PK未同步的PK结果51
			Def_UniversalGameRecType_44,
			Def_UniversalGameRecType_45,
			Def_UniversalGameRecType_46,
			Def_UniversalGameRecType_47,
			Def_UniversalGameRecType_48,
			Def_UniversalGameRecType_49,
			Def_UniversalGameRecType_50,
			Def_UniversalGameRecType_51,
			Def_UniversalGameRecType_52,
			Def_UniversalGameRecType_53,
			Def_UniversalGameRecType_54,
			@@ -1033,13 +1016,10 @@

			# 客户端不可查看的自定义表类型
			Def_Confidential_UniversalRecList = (
			Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
			Def_UniversalGameRecType_FamilyWarMember, # 盟联赛参赛人员记录70
			)
			# 只同步自身数据的类型 {类型:自身数据最大条数, ...} , 自身数据最大条数-1时代表自身全部数据; 这里的数据Value1固定为playerID
			Def_Sync_UniversalRecSelfDict = {
			Def_UniversalGameRecType_MergePKAwardRecord:1,
			Def_UniversalGameRecType_MergeKingSupportRecord:-1,
			}

			#家族行为类型在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数
			@@ -1218,42 +1198,10 @@
			ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
			ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜

			#跨服匹配PK奖励类型
			Def_MergePKAwardTypeList = (
			Def_MergePKAward_DayPKCnt, # 0 每日挑战次数奖励
			Def_MergePKAward_DayWinCnt, # 1 每日胜利次数奖励
			Def_MergePKAward_SeasonGrade, # 2 赛季晋级奖励
			Def_MergePKAward_SeasonRank, # 3 赛季排名奖励
			Def_MergePKAward_FirstWinCnt, # 4 首次胜利次数奖励
			) = range(5)

			#跨服战战斗状态
			(
			Def_NotBegin, #还没开始
			Def_ID1Win, #第一个玩家胜利(与CampType_Justice一致)
			Def_ID2Win, #第二个玩家胜利(与CampType_Evil一致)
			Def_Battling, #正在战斗中
			Def_BattleReady, #押注中
			) = range(5)

			# 跨服赛(跨服服务器)上传数据状态
			(
			Def_MergeRegisterState_None, #空闲
			Def_MergeRegisterState_Start, #开始上传
			Def_MergeRegisterState_Err, # 上传出错
			Def_MergeRegisterState_Success, #上传成功
			Def_MergeRegisterState_Request, #请求跨服, 比开始上传还早的一步，先通过请求，才开始上传
			) = range(5)

			# 跨服活动类型
			(
			Def_MergeAction_MergeWar, # 万国战
			Def_MergeAction_WarOfHonour, # 荣耀之战(跨服混战)
			Def_MergeAction_Boss, # 跨服boss
			Def_MergeAction_MergePK, # 跨服匹配PK
			Def_MergeAction_MergeKing, # 跨服王者争霸
			Def_MergeAction_TypeMax, # 类型数
			) = range(6)
			Def_CrossAction_PK, # 跨服匹配PK
			) = range(1)

			#角色改名结果
			(
			@@ -1345,9 +1293,7 @@
			ScoreType_NewGuySuperShow, # 击杀怪物统计
			ScoreType_GetItem, # 获得物品奖励统计
			ScoreType_RedFortReward, # 打开客户端frmRedFortReward
			ScoreType_MergeBoss, # 跨服boss界面
			ScoreType_MergePK, # 跨服匹配PK结算
			)=range(7)
			)=range(5)

			ScoreTypeName = "TScore"