SnxxServerCode.git

			@@ -167,6 +167,10 @@
			Def_Notify_WorldKey_FamilyBossOpenCount = "FamilyBossOpenCount" # 仙盟boss开启次数

			Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据
			Def_Notify_WorldKey_FamilyPartyAddFamilyActivity = "FamilyPartyAddFamilyActivity" # 仙盟宴会地图成员增加仙盟活跃令

			Def_Notify_WorldKey_AddFamilyAuctionItem = "AddFamilyAuctionItem" # 添加仙盟拍品
			Def_Notify_WorldKey_AddSystemAuctionItem = "AddSystemAuctionItem" # 添加系统拍品

			Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
			Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
			@@ -270,8 +274,10 @@
			Def_ViewExpType_Sit , #打坐获取经验 3
			Def_ViewExpType_KillNPCSuper, #杀怪获得经验暴击 4
			Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
			Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
			) = range(0, 7)
			Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
			Def_ViewExpType_SysEx, #系统给经验-不需要展示倍率用来区别于类型0 7
			Def_ViewExpType_LYZS, #烈焰战神特殊特效
			) = range(0, 9)


			#物品相关操作类型
			@@ -306,6 +312,7 @@
			Def_SkillID_AutoTruck = 62220 # 自动运镖buff

			#---写死的物品属性效果ID---
			Def_Effect_FreePoint = 200 # 自由灵根，注意此属性ID不能在刷属性中加，只能在某个功能中一次性处理
			Def_Effect_Metal = 201 # 金
			Def_Effect_Wood = 202 # ľ
			Def_Effect_Water = 203 # ˮ
			@@ -321,8 +328,14 @@
			Def_Effect_CON = 4
			#增加HP
			Def_Effect_MaxHP = 6
			Def_Effect_MaxHP_ShenPin = 152 # 神品
			Def_Effect_MaxHP_XianPin = 153 # 仙品
			Def_Effect_MaxHP_JiPin = 154 # 极品
			#增加%d伤害值（物理和魔法的最大/小）,只用到a值
			Def_Effect_Atk = 7
			Def_Effect_Atk_ShenPin = 149 # 神品
			Def_Effect_Atk_XianPin = 150 # 仙品
			Def_Effect_Atk_JiPin = 151 # 极品
			#增加%d防御值
			Def_Effect_Def = 8
			#命中(A值为具体值)
			@@ -361,8 +374,14 @@
			Def_Effect_PetDamPer = 25
			#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
			Def_Effect_IceAtk = 26
			Def_Effect_IceAtk_ShenPin = 155 # 神品
			Def_Effect_IceAtk_XianPin = 156 # 仙品
			Def_Effect_IceAtk_JiPin = 157 # 极品
			#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
			Def_Effect_IceDef = 27
			Def_Effect_IceDef_ShenPin = 158 # 神品
			Def_Effect_IceDef_XianPin = 159 # 仙品
			Def_Effect_IceDef_JiPin = 160 # 极品
			#无视防御几率提升
			Def_Effect_IgnoreDefRate = 28
			#无视防御抗性, 受击时减少对方的无视防御属性
			@@ -432,8 +451,14 @@
			Def_Effect_IceDefPer = 62
			#基础装备生命百分比
			Def_Effect_BaseEquipMaxHPAddPer = 63
			Def_Effect_BaseEquipMaxHPAddPer_ShenPin = 164 # 神品
			Def_Effect_BaseEquipMaxHPAddPer_XianPin = 165 # 仙品
			Def_Effect_BaseEquipMaxHPAddPer_JiPin = 166 # 极品
			#基础装备攻击百分比
			Def_Effect_BaseEquipAtkAddPer = 65
			Def_Effect_BaseEquipAtkAddPer_ShenPin = 161 # 神品
			Def_Effect_BaseEquipAtkAddPer_XianPin = 162 # 仙品
			Def_Effect_BaseEquipAtkAddPer_JiPin = 163 # 极品
			#防具防御百分比 - 废弃
			Def_Effect_ArmorDefAddPer = 66
			#主手基础属性值百分比
			@@ -502,34 +527,6 @@
			Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
			Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免

			Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
			Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
			Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
			Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
			Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
			Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比

			Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
			Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
			Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
			Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
			Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
			Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
			Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7

			Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
			Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
			Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
			Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
			Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
			Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
			Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7

			Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
			Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
			Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
			Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比

			Def_Effect_Luck = 120 # 气运
			Def_Effect_LuckPer = 133 # 气运百分率

			@@ -545,6 +542,10 @@
			Def_Effect_FinalHurtPer = 142 # 最终伤害万分率
			Def_Effect_FinalHurtReducePer = 143 # 最终伤害减少万分
			Def_Effect_YinjiTime = 144 # 每X毫秒自动消失一个印记
			Def_Effect_TheFBSkillsCD = 145 # 减少指定技能组CD XX%
			Def_Effect_BurnValue = 146 # 灼烧固定伤害
			Def_Effect_BurnTimePer = 147 # 延长灼烧时间百分比
			Def_Effect_SubSpeedPer = 148 # 减移动速度百分比

			#增加%d物理伤害值,其中a值为伤害值
			Def_Effect_AddAtk = 1005
			@@ -552,8 +553,6 @@
			Def_Effect_AddMAtk = 20020
			#增加内防
			Def_Effect_MagicDef = 20001
			#暴击率抗性(A值为万分率, 永恒为具体数值)
			Def_Effect_SuperHitRateReduce = 20030
			#减技能CD（A值固定值）
			Def_Effect_ReduceSkillCD = 20031
			# 卓越一击倍数(a值为万分率，直接加上)
			@@ -638,11 +637,12 @@
			Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
			Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)

			Def_BT_ZhuXianTower, #诛仙塔榜
			Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)
			Def_BT_Campaign_LingGen, #灵根总点(开服活动榜)
			Def_BT_Campaign_StarLV, #升星等级(开服活动榜) 25

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

			#职业对应战力排行榜类型
			JobFightPowerBillboardDict = {
			@@ -654,7 +654,7 @@
			#排行榜Value1存储境界信息的榜单列表
			BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin,
			Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
			Def_BT_FBHelpBattle, Def_BT_ZhuXianTower,
			Def_BT_FBHelpBattle,
			]

			##---比率---
			@@ -991,10 +991,8 @@
			rptPet, # 宠物背包(用物品存储宠物的数据) 31
			rptDogzItem, # 神兽物品背包 32
			rptDogzEquip, # 神兽装备背包 33
			rptZhuXianItem, # 诛仙物品背包 34
			rptZhuXianEquip, # 诛仙装备背包 35
			rptMax, # 最大背包类型数量，放在最后一个
			) = range(28, 28 + 9) #C++定义的枚举到２７
			) = range(28, 28 + 7) #C++定义的枚举到２７

			#虚拟背包类型, 从255递减
			Def_VPack_TypeList = (
			@@ -1166,7 +1164,9 @@
			Def_Campaign_Type_GodWeaponLV, # 神兵等级排行 8
			Def_Campaign_Type_Recharge, # 累计充值排行 9
			Def_Campaign_Type_PetLV, # 灵宠等级排行 10
			) = range(1, 1 + 10)
			Def_Campaign_Type_LingGen, # 灵根点数排行 11
			Def_Campaign_Type_StarLV, # 升星等级排行 12
			) = range(1, 1 + 12)

			# 活动类型对应的奖励排行榜{活动类型:排行榜, ...}
			Def_Campaign_Billboard_Dict = {
			@@ -1180,6 +1180,8 @@
			Def_Campaign_Type_GodWeaponLV:Def_BT_Campaign_GodWeaponLV,
			Def_Campaign_Type_Recharge:Def_BT_Campaign_Recharge,
			Def_Campaign_Type_PetLV:Def_BT_Campaign_PetLV,
			Def_Campaign_Type_LingGen:Def_BT_Campaign_LingGen,
			Def_Campaign_Type_StarLV:Def_BT_Campaign_StarLV,
			}

			#队伍最大人数
			@@ -1228,6 +1230,7 @@
			ClientServerMsg_GMCMD = "GMCMD" # GM命令
			ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
			ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
			ClientServerMsg_PKRobotOver = "PKRobotOver" # 跨服PK机器人结算
			ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
			ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
			ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
			@@ -1270,13 +1273,13 @@
			Def_IudetMapLoaction = 15 # 物品记录地图坐标[mapid, posx, posy]
			Def_IudetLegendAttrID = 17 # 物品传奇属性ID列表
			Def_IudetLegendAttrValue = 19 # 物品传奇属性值列表
			Def_IudetOutOfPrintAttrID = 21 # 物品绝版属性ID列表
			Def_IudetOutOfPrintAttrValue = 23 # 物品绝版属性值列表
			Def_IudetPartSuiteLV = 25 # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
			Def_IudetWingMaterialItemID = 27 # 翅膀精炼材料ID列表
			Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
			Def_IudetDogzEquipPlus = 31 # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
			Def_IudetItemDecompound = 33 # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
			Def_IudetLiantaiItemID = 35 # 合成该莲台的所有莲台ID [itemID, itemID, ...]
			Def_IudetAddSkillID = 37 # 可添加的技能ID列表 [skillID, skillID, ...]

			Def_IudetItemColor = 16 # 物品颜色，如果该值没有就取物品
			Def_IudetItemCount = 18 # 物品个数，支持20亿，目前仅特殊转化物品会用到
			@@ -1301,6 +1304,8 @@
			Def_IudetPet_QualityLV = 206 # 品质
			Def_IudetPet_Exp = 208 # 经验
			Def_IudetPet_Skill = 201 # 技能列表

			Def_IudetHorsePetSkinIndex = 210 # 骑宠觉醒外观索引
			# ----------------------------------------------------

			# 宠物物品数据状态
			@@ -1339,7 +1344,7 @@
			Def_MFPType_Plus, # 强化 2
			Def_MFPType_Stone, # 宝石 3
			Def_MFPType_LingGen, # 灵根 4
			Def_MFPType_Wing, # 翅膀 5
			Def_MFPType_LingQi, # 灵器 5
			Def_MFPType_Wash, # 洗练 6
			Def_MFPType_Pet, # 灵宠 7
			Def_MFPType_Horse, # 坐骑 8
			@@ -1438,7 +1443,7 @@
			DailyActionID_EquipPlus, # 强化
			DailyActionID_FieldFight, # 野外挂机
			DailyActionID_OfflineFight, # 脱机挂机
			DailyActionID_RefineStove, # 炼丹材料消耗 6
			DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
			DailyActionID_Dice, # 我要太极
			DailyActionID_Pray, # 祈愿
			DailyActionID_WorldBOSS, # 世界BOSS
			@@ -1455,10 +1460,13 @@
			DailyActionID_HelpBattleCheckIn, # 助战登记 20
			DailyActionID_CrossReamPK, # 跨服PK 21
			DailyActionID_FamilyBoss1, # 仙盟BOSS 22
			DailyActionID_FamilyBoss2, # 废弃 23
			DailyActionID_SkyTower, # 天星塔 23
			DailyActionID_HorsePetBoss, # 骑宠BOSS 24
			DailyActionID_FairyDomain, # 缥缈仙域 25
			) = range(1, 25 + 1)
			DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
			DailyActionID_LeiFaBoss, # 雷罚boss 27
			DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
			) = range(1, 28 + 1)



			@@ -1690,28 +1698,6 @@
			dogzetClaw, # 神兽兽爪
			dogzetScute, # 神兽鳞甲
			) = range(101, 101 + 5)

			# 诛仙装备位定义
			ZhuXianEquipPlace = (
			zxetCloak, # 诛仙披风 121
			zxetMask, # 诛仙面具 122
			zxetGlove, # 诛仙手套 123
			zxetGlove2, # 诛仙手套 124
			zxetRuyi, # 诛仙如意 125
			zxetPendant, # 诛仙吊坠 126
			zxetRing, # 诛仙戒指 127
			zxetRing2, # 诛仙戒指 128
			zxetWeapon1, # 诛仙剑1 129
			zxetWeapon2, # 诛仙剑2 130
			zxetWeapon3, # 诛仙剑3 131
			zxetWeapon4, # 诛仙剑4 132
			) = range(121, 121 + 12)

			# 共享通用装备位，可装备同一类型装备
			ShareEquipPlace = [
			[zxetGlove, zxetGlove2],
			[zxetRing, zxetRing2],
			]

			# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)
			EnterFBAskResult = (