From 9f4d3cd182065deabd9ae09036147cf054895d8d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 12 Dec 2020 17:58:37 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=20=E5=A4=A7=E9=97=B9?= =?UTF-8?q?=E5=A4=A9=E5=AE=AB=E5=9C=A3=E7=89=A9=E7=9B=B8=E5=85=B3=E8=A2=AB?= =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=88=90=E5=92=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=9C=8D=E4=B8=80=E6=A0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 6 +++--- 1 file changed, 3 insertions(+), 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 6fb42189e2..b82c193200 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4505,7 +4505,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.RoleHit, _OnRoleHit) end, - -- + -- 大闹天宫胜利次数 [225] = function(role, args) --王振兴添加 local f1 = args[1] @@ -4513,7 +4513,7 @@ local passivityList = { local ct1 = args[3] local maxNum = args[4] -- 紫+橙 - local num = OutDataManager.GetOutData(role.camp, OutDataName.MisteryLiquidUsedTimes) + local num = OutDataManager.GetOutData(role.camp, OutDataName.WinTimes) num = min(maxNum, num) BattleUtil.AddProp(role, pro1, f1 * num, ct1) @@ -4762,7 +4762,7 @@ local passivityList = { local maxNum = args[7] -- 紫+橙 - local num = OutDataManager.GetOutData(role.camp, OutDataName.PerpleGloryItemNum) + OutDataManager.GetOutData(role.camp, OutDataName.OrangeGloryItemNum) + local num = OutDataManager.GetOutData(role.camp, OutDataName.OrangeGloryItemNum) + OutDataManager.GetOutData(role.camp, OutDataName.RedGloryItemNum) num = min(maxNum, num) BattleUtil.AddProp(role, pro1, f1 * num, ct1) BattleUtil.AddProp(role, pro2, f2 * num, ct2)