SnxxServerCode.git

			@@ -68,7 +68,7 @@
			Def_BuffValue_Count = 3 # buff记录的value个数

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 133
			Def_Calc_AllAttrType_MAX = 127
			#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
			TYPE_Calc_AttrList = (
			#基础属性
			@@ -188,12 +188,6 @@
			TYPE_Calc_BaseDefAddPer, # 基础防御百分比
			TYPE_Calc_BaseHitAddPer, # 基础命中百分比
			TYPE_Calc_BaseMissAddPer, # 基础闪避百分比
			TYPE_Calc_HorcruxBasePer, # 魂器基础百分比
			TYPE_Calc_EquipBaseAddPer, # 装备基础百分比 105
			TYPE_Calc_WeaponAtkAddPer, # 武器基础攻击百分比
			TYPE_Calc_RelicsAtkAddPer, # 圣器基础攻击百分比
			TYPE_Calc_ArmorMaxHPAddPer, # 防具基础生命百分比
			TYPE_Calc_ArmorDefAddPer, # 防具基础防御百分比
			TYPE_Calc_GodWeaponMaxHPPer, # 神兵生命百分比 110
			TYPE_Calc_GodWeaponAtkPer, # 神兵攻击百分比
			TYPE_Calc_StoneMaxHPPer, # 宝石生命百分比
			@@ -403,9 +397,11 @@
			ShareDefine.retBelt:[Def_ItemType_retBelt],
			ShareDefine.retTrousers:[Def_ItemType_retTrousers],
			ShareDefine.retShoes:[Def_ItemType_retShoes],
			ShareDefine.retGlove:[Def_ItemType_retGlove],
			ShareDefine.retNeck:[Def_ItemType_retNeck],
			ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
			ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
			ShareDefine.retJade:[Def_ItemType_retJade],
			ShareDefine.retWing:[Def_ItemType_retWing],
			ShareDefine.retGuard1:[Def_ItemType_retGuard1],
			ShareDefine.retGuard2:[Def_ItemType_retGuard2],
			@@ -577,6 +573,7 @@
			Def_Skill_Effect_AbsorbShield = 801 # A值记录吸收伤害值，B值记录吸收值上限为xx%血量上限值 C值为释放的爆炸技能ID 如麒麟盾
			Def_Skill_Effect_AbsorbShieldXMZJ = 802 # 须弥真界神兵技能吸收伤害百分比
			Def_Skill_Effect_BoomSeedHurt = 804 # BUFF种子单层伤害
			Def_Skill_Effect_StoreBlood = 809 # 将期间受到的伤害总值，用于最后回血，不影响伤害
			Def_Skill_Effect_AttackReplace = 1009 #攻击计算，野外小怪伤害替换1010 (2018-03-07增加精英怪)
			Def_Skill_Effect_Attack = 1010 #攻击计算
			Def_Skill_Effect_LayerCnt = 1011 # BUFF层级数量 A值层数，B值层数处理方式0递增1递减
			@@ -636,7 +633,7 @@


			#---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
			Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
			Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ, Def_Skill_Effect_StoreBlood]
			#-------------------------------------------------------------------------

			#基础属性效果ID
			@@ -794,9 +791,6 @@
			Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
			#装备类型
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)

			#武器类型
			Def_WeaponItemType = [Def_ItemType_retWeapon, Def_ItemType_retWeapon2]

			#神兽装备类型
			Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)
			@@ -2384,18 +2378,6 @@
			#数据中的装备位置和程序中的装备位置对照表
			#参考 ShareDefine.RoleEquipType

			#武器装备栏位置列表
			Def_WeaponRetList = [ShareDefine.retWeapon, ShareDefine.retWeapon2]

			#仙器, 装备栏位置列表
			Def_FairyCanList = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]


			#攻击类装备, 装备栏位置列表
			Def_AttackEquipRetList = [ShareDefine.retWeapon]
			#防御类装备, 装备栏位置列表
			Def_DefenceEquipRetList = [ShareDefine.retClothes]

			# 可操作强化洗练等功能的公共装备部位索引
			Pack_EquipPart_CanPlusStar = {
			IPY_GameWorld.rptEquip:[
			@@ -2412,19 +2394,18 @@
			ShareDefine.retFairyCan2, #11 仙器2
			ShareDefine.retJade, #12 玉佩
			],

			}

			## 基础装备位 - 武器
			BaseEquipPlace_Weapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2]
			## 基础装备位 - 防具
			BaseEquipPlace_Armor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retBelt, ShareDefine.retTrousers, ShareDefine.retShoes]
			## 基础装备位 - 圣器
			BaseEquipPlace_Relics = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
			BaseEquipPlaceList = BaseEquipPlace_Weapon + BaseEquipPlace_Armor + BaseEquipPlace_Relics

			#玩家当前可装备的装备类型
			Type_Equip_CanTake = ShareDefine.RoleEquipType
			## 装备位 - 基础攻击类
			EquipPlace_BaseWeapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2, ShareDefine.retBelt, ShareDefine.retGlove]
			## 装备位 - 基础防具类
			EquipPlace_BaseArmor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retTrousers, ShareDefine.retShoes]
			## 装备位 - 仙器
			EquipPlace_Relics = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
			## 装备位 - 特殊
			EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
			## 装备位 - 所有基础
			EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor

			#装备物品位置,不需要重刷属性
			EquipItemNoRefreshState = [
			@@ -2440,17 +2421,7 @@
			ShareDefine.retGuard1, #14 守护1
			ShareDefine.retHorse, #19 坐骑
			]
			#套装装备部位列表
			Def_SuitEquipPlaceList = [
			ShareDefine.retWeapon, #1 主手
			ShareDefine.retWeapon2, #2 副手
			ShareDefine.retHat, #3 帽子
			ShareDefine.retClothes, #4 衣服
			ShareDefine.retBelt, #5 腰带
			ShareDefine.retTrousers, #6 裤子
			ShareDefine.retShoes, #7 鞋子
			ShareDefine.retGlove, #8 手套
			]

			#---------------------------------------------------------------------
			#特殊物品光环，永久存在
			Def_SuperBuffList = [
			@@ -3047,13 +3018,16 @@
			Def_PlayerState_LoseBlood2, # 职业2持续掉血状态 14
			Def_PlayerState_LoseBlood3, # 职业3持续掉血状态 15
			Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
			) = range(17)
			Def_PlayerState_BeInAir, # 浮空（做法同眩晕类） 17
			) = range(18)

			#---SetDict 含NPC字典KEY，不存于数据库---
			Def_GameObjKey_InheritOwner = "InheritOwner" # 类暴风雪计算时用主人属性

			#---SetDict 玩家字典KEY，不存于数据库---
			# key的长度不能超过29个字节
			Def_PlayerKey_AddBuffLayer = "addBuffLayer" # buff当前层数
			Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
			Def_PlayerKey_Zhansha = "zhansha" # 斩杀标志
			Def_PlayerKey_ZhuxianRate = "ZXRate" # 诛仙一击的概率
			Def_PlayerKey_ZhuxianHurtPer = "ZXHurtPer" # 诛仙一击的伤害%
			@@ -3205,6 +3179,7 @@
			Def_PlayerKey_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
			Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
			Def_PlayerKey_LastHurtNPCObjID = "LastHurtNPCObjID" # 最后攻击的NPCObjID
			Def_PlayerKey_LastAttackerObjID = "LastAttackerObjID" # 被攻击者记录的最近攻击玩家ID
			Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
			Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
			Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
			@@ -3226,12 +3201,6 @@
			Def_PlayerKey_BaseDefAddPer = "BaseDefAddPer" # 基础防御百分比
			Def_PlayerKey_BaseHitAddPer = "BaseHitAddPer" # 基础命中百分比
			Def_PlayerKey_BaseMissAddPer = "BaseMissAddPer" # 基础闪避百分比
			Def_PlayerKey_HorcruxBasePer = "HorcruxBasePer" # 魂器基础百分比
			Def_PlayerKey_EquipBaseAddPer = "EquipBaseAddPer" # 装备基础百分比
			Def_PlayerKey_WeaponAtkAddPer = "WeaponAtkAddPer" # 武器基础攻击百分比
			Def_PlayerKey_RelicsAtkAddPer = "RelicsAtkAddPer" # 圣器基础攻击百分比
			Def_PlayerKey_ArmorMaxHPAddPer = "ArmorMaxHPAddPer" # 防具基础生命百分比
			Def_PlayerKey_ArmorDefAddPer = "ArmorDefAddPer" # 防具基础防御百分比
			Def_PlayerKey_GodWeaponMaxHPPer = "GodWeaponMaxHPPer" # 神兵生命百分比
			Def_PlayerKey_GodWeaponAtkPer = "GodWeaponAtkPer" # 神兵攻击百分比
			Def_PlayerKey_StoneMaxHPPer = "StoneMaxHPPer" # 宝石生命百分比
			@@ -3256,9 +3225,6 @@
			Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性，参数为(功能索引, 物品效果id)
			Def_PlayerKey_FruitFightPowerEx = "FruitFightPowerEx_%s" # 属性果实增加的附加战力，参数为(功能索引)
			Def_PlayerKey_FamilyLVLeave = "FamilyLVLeave" # 离开的最后一个家族的等级

			Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
			Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]

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

			@@ -4315,13 +4281,6 @@
			ShareDefine.Def_Effect_BaseDefAddPer:[[TYPE_Calc_BaseDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_BaseHitAddPer:[[TYPE_Calc_BaseHitAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_BaseMissAddPer:[[TYPE_Calc_BaseMissAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_HorcruxBasePer:[[TYPE_Calc_HorcruxBasePer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_EquipBaseAddPer:[[TYPE_Calc_WeaponAtkAddPer, TYPE_Calc_RelicsAtkAddPer,
			TYPE_Calc_ArmorMaxHPAddPer, TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_WeaponAtkAddPer:[[TYPE_Calc_WeaponAtkAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_RelicsAtkAddPer:[[TYPE_Calc_RelicsAtkAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_ArmorMaxHPAddPer:[[TYPE_Calc_ArmorMaxHPAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_ArmorDefAddPer:[[TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_GodWeaponMaxHPPer:[[TYPE_Calc_GodWeaponMaxHPPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_GodWeaponAtkPer:[[TYPE_Calc_GodWeaponAtkPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_StoneMaxHPPer:[[TYPE_Calc_StoneMaxHPPer], False, TYPE_NoLinear],
			@@ -4342,14 +4301,6 @@
			TYPE_Calc_BaseDefAddPer:[TYPE_Calc_AttrDEF],
			TYPE_Calc_BaseHitAddPer:[TYPE_Calc_AttrHit],
			TYPE_Calc_BaseMissAddPer:[TYPE_Calc_AttrMiss],
			TYPE_Calc_HorcruxBasePer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
			TYPE_Calc_EquipBaseAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
			TYPE_Calc_WeaponAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_RelicsAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_ArmorMaxHPAddPer:[TYPE_Calc_AttrMaxHP],
			TYPE_Calc_ArmorDefAddPer:[TYPE_Calc_AttrDEF],
			TYPE_Calc_GodWeaponMaxHPPer:[TYPE_Calc_AttrMaxHP],
			TYPE_Calc_GodWeaponAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_StoneMaxHPPer:[TYPE_Calc_AttrMaxHP],
			@@ -4364,6 +4315,27 @@
			TYPE_Calc_AttrMaxHP],
			TYPE_Calc_PlusBaseAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			}

			# 对装备基础属性加成配置 {属性ID:[影响部位信息, [影响的计算属性列表]], ...}
			# 影响部位信息: 大于0-指定部位; -1-所有部位; -2-基础部位
			EquipBassAttrAddInfoSet = {
			ShareDefine.Def_Effect_EquipBaseAddPer: [-1, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_BaseEquipAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_WeaponAddPer: [ShareDefine.retWeapon, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_Weapon2AddPer: [ShareDefine.retWeapon2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BeltAddPer: [ShareDefine.retBelt, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_GloveAddPer: [ShareDefine.retGlove, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_ClothesAddPer: [ShareDefine.retClothes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_HatAddPer: [ShareDefine.retHat, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_TrousersAddPer: [ShareDefine.retTrousers, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_ShoesAddPer: [ShareDefine.retShoes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_FairyCanAddPer: [ShareDefine.retFairyCan, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_FairyCan2AddPer: [ShareDefine.retFairyCan2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_NeckAddPer: [ShareDefine.retNeck, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_JadeAddPer: [ShareDefine.retJade, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			}

			#属性线性索引
			CalcAttrIndexList = (
			@@ -4384,14 +4356,14 @@
			#刷属性功能分类索引
			CalcAttrFuncList = (
			Def_CalcAttrFunc_RoleBase, # 角色基础 0
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4
			Def_CalcAttrFunc_PlusBase, # 装备位强化基础 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
			Def_CalcAttrFunc_Stone, # 装备宝石 7
			Def_CalcAttrFunc_Suit, # 套装 8
			Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
			Def_CalcAttrFunc_Wing, # 翅膀 9
			Def_CalcAttrFunc_Wash, # 洗练 10
			Def_CalcAttrFunc_Pet, # 灵宠 11
			@@ -4400,10 +4372,10 @@
			Def_CalcAttrFunc_GodWeapon, # 神兵 14
			Def_CalcAttrFunc_Dienstgrad, # 称号 15
			Def_CalcAttrFunc_Rune, # 符印 16
			Def_CalcAttrFunc_Horcrux, # 魂器 17
			Def_CalcAttrFunc_17, #
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
			Def_CalcAttrFunc_Success, # 成就属性 21
			Def_CalcAttrFunc_VIP, # VIP属性 22
			Def_CalcAttrFunc_Stove, # 炼丹炉 23
			@@ -4426,10 +4398,25 @@
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44
			) = range(45)

			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43 - 废弃
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44 - 废弃
			Def_CalcAttrFunc_45,
			Def_CalcAttrFunc_Equip1, # 境界装备1阶 46
			Def_CalcAttrFunc_Equip2, # 境界装备2阶 47
			Def_CalcAttrFunc_Equip3, # 境界装备3阶 48
			Def_CalcAttrFunc_Equip4, # 境界装备4阶 49
			Def_CalcAttrFunc_Equip5, # 境界装备5阶 50
			Def_CalcAttrFunc_Equip6, # 境界装备6阶 51
			Def_CalcAttrFunc_Equip7, # 境界装备7阶 52
			Def_CalcAttrFunc_Equip8, # 境界装备8阶 53
			Def_CalcAttrFunc_Equip9, # 境界装备9阶 54
			Def_CalcAttrFunc_Equip10, # 境界装备10阶 55
			Def_CalcAttrFunc_Equip11, # 境界装备11阶 56
			Def_CalcAttrFunc_Equip12, # 境界装备12阶 57
			Def_CalcAttrFunc_Equip13, # 境界装备13阶 58
			Def_CalcAttrFunc_Equip14, # 境界装备14阶 59
			Def_CalcAttrFunc_Equip15, # 境界装备15阶 60
			) = range(61)

			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
			@@ -4444,13 +4431,9 @@
			#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
			MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
			# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipBaseWeapon, Def_CalcAttrFunc_EquipBaseRelics,
			# Def_CalcAttrFunc_EquipBaseArmor, Def_CalcAttrFunc_Equip,
			# Def_CalcAttrFunc_EquipOutOfPrint, Def_CalcAttrFunc_EquipAllStars],
			ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipAllStars],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_PlusBase, Def_CalcAttrFunc_PlusEx],
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
			ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
			ShareDefine.Def_MFPType_Suit:[Def_CalcAttrFunc_Suit],
			ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
			ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign],
			@@ -4461,7 +4444,6 @@
			ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
			ShareDefine.Def_MFPType_Dienstgrad:[Def_CalcAttrFunc_Dienstgrad],
			ShareDefine.Def_MFPType_Rune:[Def_CalcAttrFunc_Rune],
			ShareDefine.Def_MFPType_Horcrux:[Def_CalcAttrFunc_Horcrux],
			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],
			@@ -4472,7 +4454,22 @@
			ShareDefine.Def_MFPType_Coat:[Def_CalcAttrFunc_Coat],
			# 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
			ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
			ShareDefine.Def_MFPType_ZhuXian:[Def_CalcAttrFunc_ZXEquipSuit, Def_CalcAttrFunc_ZXEquipStone],
			#ShareDefine.Def_MFPType_ZhuXian:[Def_CalcAttrFunc_ZXEquipSuit, Def_CalcAttrFunc_ZXEquipStone],
			ShareDefine.Def_MFPType_Equip1:[Def_CalcAttrFunc_Equip1],
			ShareDefine.Def_MFPType_Equip2:[Def_CalcAttrFunc_Equip2],
			ShareDefine.Def_MFPType_Equip3:[Def_CalcAttrFunc_Equip3],
			ShareDefine.Def_MFPType_Equip4:[Def_CalcAttrFunc_Equip4],
			ShareDefine.Def_MFPType_Equip5:[Def_CalcAttrFunc_Equip5],
			ShareDefine.Def_MFPType_Equip6:[Def_CalcAttrFunc_Equip6],
			ShareDefine.Def_MFPType_Equip7:[Def_CalcAttrFunc_Equip7],
			ShareDefine.Def_MFPType_Equip8:[Def_CalcAttrFunc_Equip8],
			ShareDefine.Def_MFPType_Equip9:[Def_CalcAttrFunc_Equip9],
			ShareDefine.Def_MFPType_Equip10:[Def_CalcAttrFunc_Equip10],
			ShareDefine.Def_MFPType_Equip11:[Def_CalcAttrFunc_Equip11],
			ShareDefine.Def_MFPType_Equip12:[Def_CalcAttrFunc_Equip12],
			ShareDefine.Def_MFPType_Equip13:[Def_CalcAttrFunc_Equip13],
			ShareDefine.Def_MFPType_Equip14:[Def_CalcAttrFunc_Equip14],
			ShareDefine.Def_MFPType_Equip15:[Def_CalcAttrFunc_Equip15],
			ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			}

			@@ -4545,7 +4542,10 @@
			TriggerType_BeLuckyHit, # 被会心一击触发技能 64
			TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
			TriggerType_ZhongjiZhansha, # 终极斩杀 66
			) = range(1, 67)
			TriggerType_SuperHitSubLayer, # 暴击减层 67
			TriggerType_SuperHitSkipCD, # 暴击无冷却 68
			TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
			) = range(1, 70)


			# NPC功能类型定义