Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
ZhangBiao 2021-01-08 17:42:08 +08:00
commit 9d4ece5fcd
2 changed files with 13 additions and 2 deletions

View File

@ -428,8 +428,8 @@ function this.IsActivityTypeOpen(type)
local globalActConfigs = ConfigManager.GetAllConfigsDataByKey(ConfigName.GlobalActivity, "Type", type)
local activityId = nil
table.walk(globalActConfigs, function(actConfigInfo)
if this.mission and this.mission[actConfigInfo.Id] and (this.mission[actConfigInfo.Id].endTime - GetTimeStamp() > 0) then
activityId = actConfigInfo.Id
if this.mission and this.mission[actConfigInfo.Id] then
activityId = actConfigInfo.Id
end
end)
return activityId

View File

@ -2328,6 +2328,17 @@ local effectList = {
end
BattleUtil.SeckillHP(skill,caster,target,pro)
end,
-- 造成目标[a]*[b]%的直接伤害(不会被分摊机制分摊)
-- a[属性],b[float]
[124] = function(caster, target, args, interval, skill)
local pro = args[1]
local f1 = args[2]
BattleLogic.WaitForTrigger(interval, function ()
local damage = BattleUtil.ErrorCorrection(f1 * target:GetRoleData(BattlePropList[pro]))
BattleUtil.FinalDamage(skill, caster, target, damage, nil, 0, nil, true)
end)
end,
}