SnxxServerCode.git

			@@ -1714,8 +1714,6 @@
			Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制配个大的数值)

			#-------------------------------#副本相关#------------------------
			# 跨服中转地图ID
			Def_MergeTransMapID = 12075
			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			#PK周赛
			@@ -2171,9 +2169,6 @@
			1000 * 60 * 10, #玩家称号时效
			400, #吸血
			400, #吸蓝
			1000 * 5, # 恢复跨服PK连胜次数请求间隔
			1000 * 5, # 跨服PK领奖间隔
			1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
			1000 * 3, # 仓库整理间隔
			1000 * 15, # 渡劫鼓舞间隔
			1000 * 1, # vip体验时效
			@@ -2247,9 +2242,6 @@
			TYPE_Player_Tick_Dienstgrad, #玩家称号时效
			TYPE_Player_Tick_SuckBlood, #吸血
			TYPE_Player_Tick_SuckMagic, #吸蓝
			TYPE_Player_Tick_RecoverMergePKWin, #恢复跨服PK连胜次数请求间隔
			TYPE_Player_Tick_MergePKAward, #跨服PK领奖间隔
			TYPE_Player_Tick_MergeKingSupport, #跨服王者争霸竞猜积分奖励间隔
			TYPE_Player_Tick_WareHouseSort, # 仓库整理间隔
			TYPE_Player_Tick_DuJieInspire, # 渡劫鼓舞间隔
			TYPE_Player_Tick_VIPExperience, #vip体验时效
			@@ -3270,8 +3262,8 @@
			Def_PDictType_Reincarnation, # 转生
			Def_PDictType_GreatMaster, # 大师
			Def_PDictType_BloodElf, # Ѫħ
			Def_PDictType_MergePK, # 跨服匹配PK
			Def_PDictType_MergeKing, # 跨服王者争霸
			Def_PDictType_28,
			Def_PDictType_29,
			Def_PDictType_QQ, # QQ相关
			) = range(31)

			@@ -3630,9 +3622,6 @@
			Def_Player_Dict_ArrestTaskAwardRecord = "ArrestTaskAwardRecord" # 悬赏任务积分奖励领取记录
			Def_Player_Dict_ArrestTaskFinishCnt = "ArrestTaskFinishCnt" # 悬赏任务今日完成个数

			#跨服boss
			Def_PDict_MergeBoss_FirstJoinAwardRecord = "MergeBossFstAward" # 首次参与跨服boss奖励状态 0-不可领；1-可领；2-已领

			#封魔坛
			Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
			Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
			@@ -3825,22 +3814,6 @@
			Def_PDict_Master_Exp = "Master_Exp" # 当前大师经验
			Def_PDict_Master_ExpPoint = "Master_ExpPoint" # 当前大师经验点
			Def_PDict_Master_FreeSkillPoint = "Master_FreeSkillPoint" # 当前剩余大师技能点

			# 跨服匹配PK Def_PDictType_MergePK
			Def_PDict_MergePK_ID = "PD_%s" # 跨服PK玩家ID值, 参数(世界key)
			Def_PDict_MergePK_Cnt = "PD_MergePK_Cnt" # 跨服PK, 今日已PK次数
			Def_PDict_MergePK_BuyCnt = "PD_MergePK_BuyCnt" # 跨服PK, 今日已购买PK次数
			Def_PDict_MergePK_UnUsedBuyCnt = "PD_MergePK_UnUsedBuyCnt" # 跨服PK, 未使用的购买PK次数，永久保存
			Def_PDict_MergePK_WinsReward = "PD_MergePK_WinsReward" # 连胜奖励领取状态
			Def_PDict_MergePK_ScoreReward = "PD_MergePK_ScoreReward" # 积分奖励领取状态
			Def_PDict_MergePK_FirstWinCntReward = "PD_MergePK_FWinCntReward" # 首次胜利奖励领取状态, 领奖状态不重置, 赛季次数重新计算

			# 跨服王者争霸 Def_PDictType_MergeKing
			Def_PDict_MergeKing_ID = "PD_%s" # 跨服王者争霸玩家ID值, 参数(世界key)
			Def_PDict_MergeKing_ServerHonourAward = "PD_MergePK_ServerHonourAward" # 跨服王者争霸玩家全服荣耀奖励领取记录
			Def_PDict_MergeKing_RankAward = "PD_MergePK_RankAward" # 跨服王者争霸玩家晋级排名奖励领取记录
			Def_PDict_MergeKing_SupportAward = "PD_MergePK_SupportAward" # 跨服王者争霸玩家竞猜积分奖励领取记录
			Def_PDict_MergeKing_Worship = "PD_MergePK_Worship" # 跨服王者争霸玩家每日膜拜记录

			# 跨服竞技场
			Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分
			@@ -4514,50 +4487,6 @@
			ShareDefine.PlayerJob_Max : TYPE_CHAPLAIN, #魔剑对应魔剑系
			}

			#跨服服务器广播类型, 与GameServer一致
			(
			Def_PreeSetPlayer, #添加跨服预选赛参赛人员 0
			Def_PreeSetBattleInfo, #添加跨服预选赛对战表1
			Def_PreeBattleIDOver, #每场跨服预选赛的结果2
			Def_SetPlayer, #添加参赛人员3
			Def_SetBattleInfo, #添加跨服预选赛对战表4
			Def_BattleIDOver, #每场跨服预选赛的结果5
			Def_PlayerChange, #人员表信息变更6
			Def_EliminationReword, #万国淘汰赛参数奖励7
			Def_MergeServerOpenActionDay, #万国开启的活动到现在的天数8
			Def_MergeServerOpenActionState, #万国开启的活动状态9
			Def_MergeWarStartTime, #万国活动激活时间10
			Def_MergeDictKeyValue, #跨服GameWorld字典key值11
			Def_MergeBossKilled, #跨服boss单boss击杀结果12
			Def_MergeBossResult, #跨服boss结果13
			Def_MergePKMatchResult, #跨服PK匹配信息14
			Def_MergePKReadyOKRoomList, #跨服PK已准备好的房间列表15
			Def_MergePKSyncBillboard, #跨服PK同步排行榜16
			Def_MergePKLuckyItem, #跨服PK同步排行榜17
			Def_MergePKActionState, #跨服PK活动状态变更18
			Def_MergePKTopPlayerView, #跨服PK活动高手榜玩家展示信息19
			Def_RecoverMergePKWinCost, #跨服PK恢复连胜扣费信息20
			Def_MergeWorldNotify, #跨服全服广播21
			Def_MergeLoudspeaker, #跨服全服喇叭22
			Def_MergePKKing, #跨服王者争霸23
			Def_MergePKUnNotifyOverInfo, #跨服PK未同步的PK结果24
			Def_MergeOnLinePlayer, #跨服在线玩家25
			Def_Merge26, #26
			Def_MergePlayerEvent, #跨服玩家事件27
			Def_MaxType,
			) = range(29)

			#子服务器发送信息到跨服服务器, 与GameServer一致
			(
			Def_RequestMergePKMatch, #跨服PK匹配请求0
			Def_CancelMergePKMatch, #跨服PK取消匹配1
			Def_MergePKPrepareOK, #跨服PK准备完毕2
			Def_SendGMCMD, #发送GM命令3
			Def_RecoverMergePKWin, #跨服PK恢复连胜4
			Def_SendMergeLoudspeaker, #发送跨服喇叭5
			Def_ClientServerInitOK, #跨服子服启动成功6
			) = range(7)

			#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
			(
			Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
			@@ -4621,10 +4550,6 @@
			Def_Cost_FinishTruck, # 完成镖车
			Def_Cost_RefreshTimeShop, # 刷新神秘商店
			Def_Cost_OpenNoble, # 开通贵族
			Def_Cost_BuyMergePKCnt, # 购买跨服PK次数
			Def_Cost_RecoverMergePKWin, # 恢复跨服PK连胜
			Def_Cost_MergeKingSupport, # Ѻע
			Def_Cost_MergeKingBribe, # 贿赂
			Def_Cost_HighLadder, # 天梯竞技场
			Def_Cost_Reincarnation, # 转生
			Def_Cost_BuyStallItem, # 购买摆摊物品
			@@ -4634,7 +4559,7 @@
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 61)
			) = range(2000, 2000 + 57)

			Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key

			@@ -4680,10 +4605,6 @@
			Def_Cost_RefreshArrestTask:"RefreshArrestTask",
			Def_Cost_RefreshTimeShop:"RefreshTimeShop",
			Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
			Def_Cost_BuyMergePKCnt:"BuyMergePKCnt",
			Def_Cost_RecoverMergePKWin:"RecoverMergePKWin",
			Def_Cost_MergeKingSupport:"MergeKingSupport",
			Def_Cost_MergeKingBribe:"MergeKingBribe",
			Def_Cost_GM:"GM",
			Def_Cost_BourseBuy:"BourseBuy",
			Def_Cost_BourseCharge:"BourseCharge",