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

gaoxin 2020-10-26 14:57:05 +08:00
commit 1dc2b96916
1 changed files with 6 additions and 4 deletions

View File

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