Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
57617faa49
|
|
@ -4398,7 +4398,7 @@ local passivityList = {
|
|||
end,
|
||||
|
||||
--
|
||||
[225] = function()
|
||||
[225] = function(role, args)
|
||||
--王振兴添加
|
||||
local f1 = args[1]
|
||||
local pro1 = args[2]
|
||||
|
|
@ -4410,8 +4410,6 @@ local passivityList = {
|
|||
num = min(maxNum, num)
|
||||
BattleUtil.AddProp(role, pro1, f1 * num, ct1)
|
||||
|
||||
|
||||
|
||||
end,
|
||||
|
||||
-- 斩杀生命低于[a]的敌人
|
||||
|
|
|
|||
|
|
@ -1717,7 +1717,7 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
|
|||
end
|
||||
end
|
||||
--目前没有 王振兴加 最后计算个属性的乘减算
|
||||
if LengthOfTable(curHeroData.MLSproList)>0 then
|
||||
if curHeroData.MLSproList and LengthOfTable(curHeroData.MLSproList)>0 then
|
||||
for k, v in pairs(curHeroData.MLSproList) do
|
||||
local mlsPro=curHeroData.MLSproList[k]
|
||||
if allAddProVal[mlsPro.proId] then
|
||||
|
|
|
|||
Loading…
Reference in New Issue