Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng
jiaoyangna 2020-10-26 15:06:24 +08:00
commit 942849cdcf
1 changed files with 6 additions and 5 deletions

View File

@ -1802,11 +1802,12 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
end
--计算装备异妖 特殊百分比加成 (在英雄自身、装备、异妖 绝对值属性算完之后 最后计算百分比加成)
if curProConfig and allAddProVal[k] > 0 and curProConfig.TargetPropertyId > 0 then
allAddProVal[curProConfig.TargetPropertyId] =
math.floor(
allAddProVal[curProConfig.TargetPropertyId] +
allAddProVal[curProConfig.TargetPropertyId] * allAddProVal[k] / 10000
)
if k ~= 69 and k ~= 70 then
allAddProVal[curProConfig.TargetPropertyId] =
propertyConfig[curProConfig.TargetPropertyId].Style == 1 and
math.floor(allAddProVal[curProConfig.TargetPropertyId] + allAddProVal[curProConfig.TargetPropertyId] * allAddProVal[k] / 10000)
or allAddProVal[curProConfig.TargetPropertyId] + allAddProVal[curProConfig.TargetPropertyId] * allAddProVal[k] / 10000
end
end
--战斗里面 PropertyConfig里Style字段,2类型的统一需要除以100在战斗里面
if curProConfig and allAddProVal[k] > 0 and isWar and curProConfig.Style == 2 then