From 324c93e93fd4619ebf0a54010f1a99a1b18839f1 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sun, 25 Apr 2021 19:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8313=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/Passivity.lua | 33 ++++++------------- .../Modules/Battle/Logic/Role/RoleLogic.lua | 12 ++----- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 0644b114db..145f2a6144 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -6836,37 +6836,24 @@ local passivityList = { -- 根据生命百分比添加被动 血量百分比[a],被动id[b],...(后面没有的不配) -- a[float],b[int],c[float],d[int],e[float],f[int],g[float],h[int] [313] = function(role, args) - local p1 = args[1] - local pass1 = args[2] - local p2 = args[3] - local pass2 = args[4] - local p3 =args[5] - local pass3 = args[6] - local p4 =args[7] - local pass4 = args[8] - --已经添加过的被动id local passTable={} - if pass1 and p1 then - table.insert(passTable,{pass1,p1}) - end - if pass2 and p2 then - table.insert(passTable, {pass2,p2}) - end - if pass3 and p3 then - table.insert(passTable,{pass3,p3}) - end - if pass4 and p4 then - table.insert(passTable,{pass4,p4}) + for i = 1, #args do + if i%2==0 then + table.insert(passTable,{args[i],args[i-1]}) + end end local len=BattleUtil.LengthOfTable(passTable) local addIds={} + if BattleUtil.LengthOfTable(addIds)>= len then + return + end -- 释放技能后 local onRoleBeDamaged = function(caster, damage) local ft = role:GetRoleData(RoleDataName.Hp)/role:GetRoleData(RoleDataName.MaxHp) for key, value in pairs(passTable) do - if ft