Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local

dev_chengFeng hotfix/xma/local/1.1.52
gaoxin 2020-12-12 18:00:38 +08:00
commit 06f487a176
1 changed files with 3 additions and 3 deletions

View File

@ -4505,7 +4505,7 @@ local passivityList = {
role.Event:AddEvent(BattleEventName.RoleHit, _OnRoleHit) role.Event:AddEvent(BattleEventName.RoleHit, _OnRoleHit)
end, end,
-- -- 大闹天宫胜利次数
[225] = function(role, args) [225] = function(role, args)
--王振兴添加 --王振兴添加
local f1 = args[1] local f1 = args[1]
@ -4513,7 +4513,7 @@ local passivityList = {
local ct1 = args[3] local ct1 = args[3]
local maxNum = args[4] local maxNum = args[4]
-- 紫+橙 -- 紫+橙
local num = OutDataManager.GetOutData(role.camp, OutDataName.MisteryLiquidUsedTimes) local num = OutDataManager.GetOutData(role.camp, OutDataName.WinTimes)
num = min(maxNum, num) num = min(maxNum, num)
BattleUtil.AddProp(role, pro1, f1 * num, ct1) BattleUtil.AddProp(role, pro1, f1 * num, ct1)
@ -4762,7 +4762,7 @@ local passivityList = {
local maxNum = args[7] 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) num = min(maxNum, num)
BattleUtil.AddProp(role, pro1, f1 * num, ct1) BattleUtil.AddProp(role, pro1, f1 * num, ct1)
BattleUtil.AddProp(role, pro2, f2 * num, ct2) BattleUtil.AddProp(role, pro2, f2 * num, ct2)