Merge branch 'master_xma_local' into master_xma_test

dev_chengFeng hotfix/xma/test/1.1.46
JieLing 2020-12-01 17:20:38 +08:00
commit c82d685a3b
3 changed files with 10 additions and 11 deletions

View File

@ -1981,11 +1981,10 @@ local effectList = {
-- 检测技能伤害治疗加成
-- 治疗血量最低队友实际伤害的f2%
--之前是finaldag 改成 damage
for i = 1, LengthOfTable(arr) do
for i = 1, #arr do
if i<=num then
f2 = BattleUtil.CheckSkillDamageHeal(f2, caster, arr[i])
BattleUtil.ApplyTreat(caster, arr[i], floor(damage*f2))
end
end
end

View File

@ -5616,7 +5616,7 @@ local passivityList = {
elseif camp==1 then
list= RoleManager.Query(function(v) return v.camp ~= role.camp and v.element==ele end)
end
if not list or LengthOfTable(list)==0 then
if not list or #list == 0 then
return
end
list = BattleUtil.SortByProp(list, BattlePropList[pro],0)
@ -5638,11 +5638,11 @@ local passivityList = {
local onSkillEnd = function(skill)
if skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra then
local list= RoleManager.NoOrder(function(v) return v.camp == role.camp and v.element==ele end,true)
if not list or LengthOfTable(list)==0 then
if not list or #list ==0 then
return
end
list =BattleUtil.SortByHpFactor(list,1)
for i = 1,LengthOfTable(list) do
for i = 1, #list do
if i<=num then
if not list[i]:IsDead() then
local buff=Buff.Create(role, BuffName.Immune,round,1)
@ -5699,11 +5699,11 @@ local passivityList = {
if skill and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) then
BattleUtil.RandomAction(p1, function ()
local list= RoleManager.Query(function(v) return v.camp == role.camp and v.element==ele and not v:IsDead() end)
if not list or LengthOfTable(list)==0 then
if not list or #list ==0 then
return
end
list =BattleUtil.SortByProp(list,BattlePropList[p2],0)
for i = 1,LengthOfTable(list) do
for i = 1, #list do
if i<=num then
local buff=Buff.Create(role, BuffName.PropertyChange,r1,BattlePropList[p3],v1,ct )
list[i]:AddBuff(buff)
@ -5763,7 +5763,7 @@ local passivityList = {
elseif camp==1 then
list= RoleManager.Query(function(v) return v.camp ~= role.camp and v.element==ele end)
end
if not list or LengthOfTable(list)==0 then
if not list or #list ==0 then
return
end
for key, value in pairs(list) do
@ -5790,7 +5790,7 @@ local passivityList = {
elseif camp==1 then
list= RoleManager.Query(function(v) return v.camp ~= role.camp and v.element==ele end)
end
if not list or LengthOfTable(list)==0 then
if not list or #list ==0 then
return
end
list=BattleUtil.SortByRage(list,0)

View File

@ -2630,12 +2630,12 @@ function this.GetAllPassiveSkillIds(heroConfig, breakId, upStarId)
end
for i, v in pairs(allPassiveSkillIdcompound) do
if v > 1 then
compoundNum = compoundNum + 1
compoundNum = compoundNum + v - 1
end
end
for i, v in pairs(allOpenPassiveSkillIdcompound) do
if v > 1 then
compoundOPenNum = compoundOPenNum + 1
compoundOPenNum = compoundOPenNum + v - 1
end
end
return allPassiveSkillIds, compoundOPenNum, compoundNum, allUpStarOpenData