From 7d9a5551518883e3b3369d4b85a7700035aacac1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 25 Jul 2020 19:24:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A2=AB=E5=8A=A8225?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 40fdab73ad..2c37f9cb4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -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]的敌人 From 3b11c5737a451d9dbba1eb3d8d08c75485bbf17b Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 12 Sep 2020 14:42:55 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 24e755a1d2..75427bde4d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -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