SnxxServerCode.git

parent: 78a2ce57 | 补丁 | 提交 | ignore whitespace

hxp

2019-10-21 21dd820440a5ca0b335a300ce466b67e54d78b01

1111 删除废弃的神仙极传奇属性条目（149~166）

4个文件已修改

	ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py

@@ -327,15 +327,9 @@
#增加%d体魄

Def_Effect_CON = 4 

#增加HP

Def_Effect_MaxHP = 6 
Def_Effect_MaxHP_ShenPin = 152 # 神品

Def_Effect_MaxHP_XianPin = 153 # 仙品

Def_Effect_MaxHP_JiPin = 154 # 极品

Def_Effect_MaxHP = 6

#增加%d伤害值（物理和魔法的最大/小）,只用到a值

Def_Effect_Atk = 7 
Def_Effect_Atk_ShenPin = 149 # 神品

Def_Effect_Atk_XianPin = 150 # 仙品

Def_Effect_Atk_JiPin = 151 # 极品

Def_Effect_Atk = 7

#增加%d防御值

Def_Effect_Def = 8 

#命中(A值为具体值)

@@ -373,15 +367,9 @@
#宠物伤害比例提升（A值万分率）

Def_Effect_PetDamPer = 25

#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替

Def_Effect_IceAtk = 26 
Def_Effect_IceAtk_ShenPin = 155 # 神品

Def_Effect_IceAtk_XianPin = 156 # 仙品

Def_Effect_IceAtk_JiPin = 157 # 极品

Def_Effect_IceAtk = 26

#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替

Def_Effect_IceDef = 27 
Def_Effect_IceDef_ShenPin = 158 # 神品

Def_Effect_IceDef_XianPin = 159 # 仙品

Def_Effect_IceDef_JiPin = 160 # 极品

Def_Effect_IceDef = 27

#无视防御几率提升

Def_Effect_IgnoreDefRate = 28 

#无视防御抗性, 受击时减少对方的无视防御属性

@@ -451,14 +439,8 @@
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

#主手基础属性值 百分比


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py

@@ -4077,9 +4077,6 @@
    

    #战斗线性

    ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],      # 最大血量

    ShareDefine.Def_Effect_MaxHP_ShenPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],      # 最大血量

    ShareDefine.Def_Effect_MaxHP_XianPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],      # 最大血量

    ShareDefine.Def_Effect_MaxHP_JiPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],      # 最大血量

    ShareDefine.Def_Effect_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],

    ShareDefine.Def_Effect_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],

    ShareDefine.Def_Effect_Miss:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],

@@ -4090,9 +4087,6 @@
    ShareDefine.Def_Effect_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],

    ShareDefine.Def_Effect_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],

    ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],

    ShareDefine.Def_Effect_Atk_ShenPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],

    ShareDefine.Def_Effect_Atk_XianPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],

    ShareDefine.Def_Effect_Atk_JiPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],

    #ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax, 

    #                             TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],

    ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],

@@ -4120,18 +4114,12 @@
    AttrName_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],

    AttrName_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceAtk_ShenPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceAtk_XianPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceAtk_JiPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],

    AttrName_FireAtk:[[TYPE_Calc_AttrFireAtk], False, TYPE_Linear],

    AttrName_PoisonAtk:[[TYPE_Calc_AttrPoisonAtk], False, TYPE_Linear],

    AttrName_ThunderAtk:[[TYPE_Calc_AttrThunderAtk], False, TYPE_Linear],

    AttrName_WindAtk:[[TYPE_Calc_AttrWindAtk], False, TYPE_Linear],

    AttrName_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceDef_ShenPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceDef_XianPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],

    ShareDefine.Def_Effect_IceDef_JiPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],

    AttrName_FireDef:[[TYPE_Calc_AttrFireDef], False, TYPE_Linear],

    AttrName_PoisonDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],

    AttrName_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],

@@ -4319,13 +4307,7 @@
   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_BaseEquipAtkAddPer_ShenPin:   [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],

   ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin:   [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],

   ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin:     [-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_BaseEquipMaxHPAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_MaxHP]],

   ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin: [-2, [ShareDefine.Def_Effect_MaxHP]],

   ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin:   [-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]],


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py

@@ -428,31 +428,19 @@
    if lingQiIpyData:

        gsValueEx += lingQiIpyData.GetLingQiAttrScore()

        

    Atk = attrDict.get(ShareDefine.Def_Effect_Atk, 0) + attrDict.get(ShareDefine.Def_Effect_Atk_ShenPin, 0) \

        + attrDict.get(ShareDefine.Def_Effect_Atk_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_Atk_JiPin, 0)

    Atk = attrDict.get(ShareDefine.Def_Effect_Atk, 0)

    MinAtk = attrDict.get(ShareDefine.Def_Effect_MinAtk, 0) + Atk

    MaxAtk = attrDict.get(ShareDefine.Def_Effect_MaxAtk, 0) + Atk

    MaxHP = attrDict.get(ShareDefine.Def_Effect_MaxHP, 0) + attrDict.get(ShareDefine.Def_Effect_MaxHP_ShenPin, 0) \

        + attrDict.get(ShareDefine.Def_Effect_MaxHP_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_MaxHP_JiPin, 0)

    MaxHP = attrDict.get(ShareDefine.Def_Effect_MaxHP, 0)

    Def = attrDict.get(ShareDefine.Def_Effect_Def, 0)

    ArmorDefPer = 0

    IceAtk = attrDict.get(ShareDefine.Def_Effect_IceAtk, 0) + attrDict.get(ShareDefine.Def_Effect_IceAtk_ShenPin, 0) \

        + attrDict.get(ShareDefine.Def_Effect_IceAtk_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_IceAtk_JiPin, 0)

    IceDef = attrDict.get(ShareDefine.Def_Effect_IceDef, 0) + attrDict.get(ShareDefine.Def_Effect_IceDef_ShenPin, 0) \

        + attrDict.get(ShareDefine.Def_Effect_IceDef_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_IceDef_JiPin, 0)

    IceAtk = attrDict.get(ShareDefine.Def_Effect_IceAtk, 0)

    IceDef = attrDict.get(ShareDefine.Def_Effect_IceDef, 0)

    FabaoHurt = attrDict.get(ShareDefine.Def_Effect_FabaoHurt, 0)

    AtkBackHP = attrDict.get(ShareDefine.Def_Effect_AtkBackHP, 0)

    

    BaseEquipMaxHPAddPer = (attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer, 0) 
                            + attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_ShenPin, 0)

                            + attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin, 0) 
                            + attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin, 0)) \

                            * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipMaxHPAddPerC())

    BaseEquipAtkAddPer = (attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer, 0)

                          + attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_ShenPin, 0)

                          + attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin, 0)

                          + attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin, 0)) \

                          * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipAtkAddPerC())

    BaseEquipMaxHPAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipMaxHPAddPerC())

    BaseEquipAtkAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipAtkAddPerC())

    AtkPer = 0#attrDict.get(ShareDefine.Def_Effect_AddAtkByPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetAtkPerC())

    DamagePer = 0#attrDict.get(ShareDefine.Def_Effect_DamagePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamagePerC())

    SuperHitRate = 0#attrDict.get(ShareDefine.Def_Effect_SuperHitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitRateC())


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py

@@ -327,15 +327,9 @@
#增加%d体魄

Def_Effect_CON = 4 

#增加HP

Def_Effect_MaxHP = 6 
Def_Effect_MaxHP_ShenPin = 152 # 神品

Def_Effect_MaxHP_XianPin = 153 # 仙品

Def_Effect_MaxHP_JiPin = 154 # 极品

Def_Effect_MaxHP = 6

#增加%d伤害值（物理和魔法的最大/小）,只用到a值

Def_Effect_Atk = 7 
Def_Effect_Atk_ShenPin = 149 # 神品

Def_Effect_Atk_XianPin = 150 # 仙品

Def_Effect_Atk_JiPin = 151 # 极品

Def_Effect_Atk = 7

#增加%d防御值

Def_Effect_Def = 8 

#命中(A值为具体值)

@@ -373,15 +367,9 @@
#宠物伤害比例提升（A值万分率）

Def_Effect_PetDamPer = 25

#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替

Def_Effect_IceAtk = 26 
Def_Effect_IceAtk_ShenPin = 155 # 神品

Def_Effect_IceAtk_XianPin = 156 # 仙品

Def_Effect_IceAtk_JiPin = 157 # 极品

Def_Effect_IceAtk = 26

#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替

Def_Effect_IceDef = 27 
Def_Effect_IceDef_ShenPin = 158 # 神品

Def_Effect_IceDef_XianPin = 159 # 仙品

Def_Effect_IceDef_JiPin = 160 # 极品

Def_Effect_IceDef = 27

#无视防御几率提升

Def_Effect_IgnoreDefRate = 28 

#无视防御抗性, 受击时减少对方的无视防御属性

@@ -451,14 +439,8 @@
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

#主手基础属性值 百分比

			@@ -327,15 +327,9 @@
			#增加%d体魄
			Def_Effect_CON = 4
			#增加HP
			Def_Effect_MaxHP = 6
			Def_Effect_MaxHP_ShenPin = 152 # 神品
			Def_Effect_MaxHP_XianPin = 153 # 仙品
			Def_Effect_MaxHP_JiPin = 154 # 极品
			Def_Effect_MaxHP = 6
			#增加%d伤害值（物理和魔法的最大/小）,只用到a值
			Def_Effect_Atk = 7
			Def_Effect_Atk_ShenPin = 149 # 神品
			Def_Effect_Atk_XianPin = 150 # 仙品
			Def_Effect_Atk_JiPin = 151 # 极品
			Def_Effect_Atk = 7
			#增加%d防御值
			Def_Effect_Def = 8
			#命中(A值为具体值)
			@@ -373,15 +367,9 @@
			#宠物伤害比例提升（A值万分率）
			Def_Effect_PetDamPer = 25
			#冰攻(A值为具体值) 真实伤害元素攻击, 无视防御, 只有元素防御可以减免伤害, 此项目用冰元素代替
			Def_Effect_IceAtk = 26
			Def_Effect_IceAtk_ShenPin = 155 # 神品
			Def_Effect_IceAtk_XianPin = 156 # 仙品
			Def_Effect_IceAtk_JiPin = 157 # 极品
			Def_Effect_IceAtk = 26
			#冰防(A值为具体值) 真实抵抗元素抵抗, 减免元素攻击造成的伤害, 此项目用冰元素代替
			Def_Effect_IceDef = 27
			Def_Effect_IceDef_ShenPin = 158 # 神品
			Def_Effect_IceDef_XianPin = 159 # 仙品
			Def_Effect_IceDef_JiPin = 160 # 极品
			Def_Effect_IceDef = 27
			#无视防御几率提升
			Def_Effect_IgnoreDefRate = 28
			#无视防御抗性, 受击时减少对方的无视防御属性
			@@ -451,14 +439,8 @@
			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
			#主手基础属性值百分比

			@@ -4077,9 +4077,6 @@

			#战斗线性
			ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_ShenPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_XianPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_JiPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
			ShareDefine.Def_Effect_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],
			ShareDefine.Def_Effect_Miss:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
			@@ -4090,9 +4087,6 @@
			ShareDefine.Def_Effect_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
			ShareDefine.Def_Effect_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_ShenPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_XianPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_JiPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			#ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			# TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			@@ -4120,18 +4114,12 @@
			AttrName_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
			AttrName_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_ShenPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_XianPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_JiPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			AttrName_FireAtk:[[TYPE_Calc_AttrFireAtk], False, TYPE_Linear],
			AttrName_PoisonAtk:[[TYPE_Calc_AttrPoisonAtk], False, TYPE_Linear],
			AttrName_ThunderAtk:[[TYPE_Calc_AttrThunderAtk], False, TYPE_Linear],
			AttrName_WindAtk:[[TYPE_Calc_AttrWindAtk], False, TYPE_Linear],
			AttrName_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_ShenPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_XianPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_JiPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			AttrName_FireDef:[[TYPE_Calc_AttrFireDef], False, TYPE_Linear],
			AttrName_PoisonDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],
			AttrName_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],
			@@ -4319,13 +4307,7 @@
			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_BaseEquipAtkAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin: [-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_BaseEquipMaxHPAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin: [-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]],

			@@ -428,31 +428,19 @@
			if lingQiIpyData:
			gsValueEx += lingQiIpyData.GetLingQiAttrScore()

			Atk = attrDict.get(ShareDefine.Def_Effect_Atk, 0) + attrDict.get(ShareDefine.Def_Effect_Atk_ShenPin, 0) \
			+ attrDict.get(ShareDefine.Def_Effect_Atk_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_Atk_JiPin, 0)
			Atk = attrDict.get(ShareDefine.Def_Effect_Atk, 0)
			MinAtk = attrDict.get(ShareDefine.Def_Effect_MinAtk, 0) + Atk
			MaxAtk = attrDict.get(ShareDefine.Def_Effect_MaxAtk, 0) + Atk
			MaxHP = attrDict.get(ShareDefine.Def_Effect_MaxHP, 0) + attrDict.get(ShareDefine.Def_Effect_MaxHP_ShenPin, 0) \
			+ attrDict.get(ShareDefine.Def_Effect_MaxHP_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_MaxHP_JiPin, 0)
			MaxHP = attrDict.get(ShareDefine.Def_Effect_MaxHP, 0)
			Def = attrDict.get(ShareDefine.Def_Effect_Def, 0)
			ArmorDefPer = 0
			IceAtk = attrDict.get(ShareDefine.Def_Effect_IceAtk, 0) + attrDict.get(ShareDefine.Def_Effect_IceAtk_ShenPin, 0) \
			+ attrDict.get(ShareDefine.Def_Effect_IceAtk_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_IceAtk_JiPin, 0)
			IceDef = attrDict.get(ShareDefine.Def_Effect_IceDef, 0) + attrDict.get(ShareDefine.Def_Effect_IceDef_ShenPin, 0) \
			+ attrDict.get(ShareDefine.Def_Effect_IceDef_XianPin, 0) + attrDict.get(ShareDefine.Def_Effect_IceDef_JiPin, 0)
			IceAtk = attrDict.get(ShareDefine.Def_Effect_IceAtk, 0)
			IceDef = attrDict.get(ShareDefine.Def_Effect_IceDef, 0)
			FabaoHurt = attrDict.get(ShareDefine.Def_Effect_FabaoHurt, 0)
			AtkBackHP = attrDict.get(ShareDefine.Def_Effect_AtkBackHP, 0)

			BaseEquipMaxHPAddPer = (attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_ShenPin, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin, 0)) \
			* (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipMaxHPAddPerC())
			BaseEquipAtkAddPer = (attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_ShenPin, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin, 0)
			+ attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin, 0)) \
			* (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipAtkAddPerC())
			BaseEquipMaxHPAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipMaxHPAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipMaxHPAddPerC())
			BaseEquipAtkAddPer = attrDict.get(ShareDefine.Def_Effect_BaseEquipAtkAddPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetBaseEquipAtkAddPerC())
			AtkPer = 0#attrDict.get(ShareDefine.Def_Effect_AddAtkByPer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetAtkPerC())
			DamagePer = 0#attrDict.get(ShareDefine.Def_Effect_DamagePer, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetDamagePerC())
			SuperHitRate = 0#attrDict.get(ShareDefine.Def_Effect_SuperHitRate, 0) * (1 if not gsParamIpyData else gsParamIpyData.GetSuperHitRateC())