SnxxServerCode.git

			@@ -262,8 +262,13 @@
			Def_ItemID_RealmPoint = 24 # 直接给修行点
			Def_ItemID_BossReborn = 21 # 直接给boss复活点
			Def_ItemID_Ysog = 4306 # 直接给符印融合石
			Def_ItemID_SoulDust = 700 # 直接给魂尘
			Def_ItemID_SoulSplinters = 701 # 直接给聚魂碎片
			Def_ItemID_SoulCore = 702 # 直接给核心环
			Def_ItemID_Honor = 2141 # 直接给荣誉
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
			Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog]
			Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
			Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor]
			#---------------------------------------------------------------------
			#写死的物品类型都放这边
			Def_ItemType_All = -1 #所有类型
			@@ -428,9 +433,12 @@
			Def_Effect_AddMagicWeaponUpExp = 236 # 增加法宝升星经验 A值法宝ID B值X经验
			Def_Effect_ChatBubbleBox = 237 # 激活聊天气泡框，A值气泡框ID
			Def_Effect_ItemGiveRealmPoint = 238 #使用道具给予修行点
			Def_Effect_ItemGiveSoulDust = 239 # 使用道具给予魂尘
			Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
			Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
			Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
			Def_Effect_ItemGiveHonorPoint = 1922 #使用道具给予荣誉积分
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			Def_Effect_ItemGiveRuneSplinters = 1926 #使用道具给予符印碎片
			Def_Effect_SuiteMark = 2838 #用于标示套装装备，过滤等使用
			@@ -1707,8 +1715,6 @@
			Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制配个大的数值)

			#-------------------------------#副本相关#------------------------
			# 跨服中转地图ID
			Def_MergeTransMapID = 12075
			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			#PK周赛
			@@ -1794,7 +1800,7 @@
			# 副本中玩家下线就被踢出
			Def_DisconnectExit_FBID = []
			#会有阵营的地图
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar]
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossRealmPK]

			# 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
			Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]
			@@ -2164,9 +2170,6 @@
			1000 * 60 * 10, #玩家称号时效
			400, #吸血
			400, #吸蓝
			1000 * 5, # 恢复跨服PK连胜次数请求间隔
			1000 * 5, # 跨服PK领奖间隔
			1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
			1000 * 3, # 仓库整理间隔
			1000 * 15, # 渡劫鼓舞间隔
			1000 * 1, # vip体验时效
			@@ -2240,9 +2243,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体验时效
			@@ -3209,6 +3209,8 @@
			Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
			Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]

			Def_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中

			Def_PDict_QueryTechLVUPState = "QueryTechLVUPState" # 查询科技等级提升状态

			Def_PDict_PKStateTick = "PKStateTick" # PK状态tick，只要有一方发起攻击，双方均进入PK状态
			@@ -3263,8 +3265,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)

			@@ -3281,7 +3283,6 @@
			Def_PDict_OnDayEx = "OnDayEx" # 特殊时间点凌晨X点过天
			Def_PDict_OnWeekEx = "OnWeekEx" # 特殊时间点凌晨X点过周
			Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
			Def_Player_Dict_ServerGroupID = "ServerGroupID" # 合服/混服时所属游戏服务器组ID
			Def_Player_Dict_PlayerFromPID = "PlayerFromPID" # pid
			Def_Player_Dict_Account_Type = "account_type" # account_type
			Def_Player_Dict_TencentPF = "tencentPF" # 腾讯平台来源pf
			@@ -3623,9 +3624,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" # 封魔坛是否曾经可以双倍
			@@ -3819,22 +3817,6 @@
			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" # 当前总积分
			Def_PDict_CrossPK_OnDayScore = "CrossPK_OnDayScore" # 今天过天时的积分
			@@ -3843,7 +3825,18 @@
			Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
			Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 跨当前连胜次数
			Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
			Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
			Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
			Def_PDict_CrossPK_DayPKCountAwardState = "CrossPK_DayPKCountAwardState" # 每日匹配次数奖励记录，二进制位存储是否已领取，按匹配次数升序排序索引代表奖励位
			Def_PDict_CrossPK_DayWinCountAwardState = "CrossPK_DayWinCountAwardState" # 每日胜利次数奖励记录，二进制位存储是否已领取，按胜利次数升序排序索引代表奖励位
			Def_PDict_CrossPK_DanLVAwardState = "CrossPK_DanLVAwardState" # 段位达标奖励记录，二进制位存储是否已领取，按段位代表奖励位
			Def_PDict_CrossPK_SeasonAwardState = "CrossPK_SeasonAwardState" # 赛季结算奖励是否已领取，优先排名奖励，未上榜可领段位奖励
			Def_PDict_CrossPK_ZoneID = "CrossPK_ZoneID" # 玩家上次参与的赛区ID
			Def_PDict_CrossPK_SeasonID = "CrossPK_SeasonID" # 玩家上次参与的赛季ID
			Def_PDict_CrossPK_SeasonDanLV = "CrossPK_SeasonDanLV_%s" # 历史赛季段位，参数，赛季ID
			Def_PDict_CrossPK_SeasonScore = "CrossPK_SeasonScore_%s" # 历史赛季积分，参数，赛季ID
			Def_PDict_CrossPK_SeasonOrder = "CrossPK_SeasonOrder_%s" # 历史赛季名次，参数，赛季ID
			Def_PDict_CrossPK_SeasonAwardLV = "CrossPK_SeasonAwardLV_%s" # 历史赛季奖励等级（一般是段位等级，排行奖励的在最高段位等级基础上增加），参数，赛季ID

			#自动战斗设置记录
			Def_PDict_AutoFightSetting = "AFSetting_%s_%s"
			@@ -3874,6 +3867,7 @@
			Def_PDict_MagicWeaponExp = "MagicWeaponExp_%s" #法宝经验参数法宝ID
			Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s_%s" #法宝激活状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s_%s" #法宝点击状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s_%s" #法宝佩戴状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponRefineLV = "MagicWeaponRefineLV_%s" #法宝精炼等级参数法宝ID
			Def_PDict_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录参数ID
			Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级参数法宝ID
			@@ -4326,11 +4320,12 @@
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			) = range(40)
			Def_CalcAttrFunc_MagicWeapon4 # 王者法宝40
			) = range(41)


			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3,
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
			Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP, Def_CalcAttrFunc_PetSoul, Def_CalcAttrFunc_HorseSoul,
			Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_MagicWeaponSoul
			]
			@@ -4363,6 +4358,7 @@
			ShareDefine.Def_MFPType_MagicWeapon1:[Def_CalcAttrFunc_MagicWeapon1],
			ShareDefine.Def_MFPType_MagicWeapon2:[Def_CalcAttrFunc_MagicWeapon2],
			ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
			ShareDefine.Def_MFPType_MagicWeapon4:[Def_CalcAttrFunc_MagicWeapon4],
			ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
			ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
			ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
			@@ -4494,50 +4490,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礼包的老号处理;
			@@ -4593,6 +4545,7 @@
			Def_Cost_GodWeapon, # 神兵
			Def_Cost_FBHelpBattle, # 副本助战
			Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
			Def_Cost_CrossRealmPK, # 跨服PK
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4600,10 +4553,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, # 购买摆摊物品
			@@ -4613,7 +4562,7 @@
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 60)
			) = range(2000, 2000 + 57)

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

			@@ -4659,10 +4608,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",
			@@ -4701,6 +4646,7 @@
			Def_Cost_GodWeapon:"GodWeapon",
			Def_Cost_FBHelpBattle:"FBHelpBattle",
			Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
			Def_Cost_CrossRealmPK:"CrossRealmPK",
			}
			## -----------------------------------------------------

			@@ -4996,7 +4942,7 @@
			VIPPrivilege_FamilyGoldPack, #23 仙盟钻石红包
			VIPPrivilege_BoursePwd, #24 集市上架使用密码
			VIPPrivilege_25, #25 封魔坛购买次数 - 副本总表统一处理
			VIPPrivilege_BoursePwd, #26 VIP被动技能孔——VIP4专属被动技能孔
			VIPPrivilege_26, #26 VIP被动技能孔——VIP4专属被动技能孔
			VIPPrivilege_BOSSHomeKillLimit, #27 BOSS之家疲劳值上限
			VIPPrivilege_FMTDouble, #28 封魔坛双倍击杀
			VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理