Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
1e02099200
|
@ -943,6 +943,26 @@ local effectList = {
|
||||||
BattleLogic.BuffMgr:ClearBuff(target, function (buff)
|
BattleLogic.BuffMgr:ClearBuff(target, function (buff)
|
||||||
return buff.isDeBuff == true
|
return buff.isDeBuff == true
|
||||||
end)
|
end)
|
||||||
|
elseif ct == 5 then --持续伤害
|
||||||
|
BattleLogic.BuffMgr:ClearBuff(target, function (buff)
|
||||||
|
return buff.type == BuffName.DOT
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
end,
|
||||||
|
--造成目标当前生命[a]%的真实伤害,为我方角色回复此技能所有由此效果带来的伤害,平均分配给我方生命最低的[b]个角色。
|
||||||
|
--a[float],b[int]
|
||||||
|
[56] = function(caster, target, args, interval)
|
||||||
|
local f1 = args[1]
|
||||||
|
local i1 = args[2]
|
||||||
|
casterBulletEffect(caster, target, interval)
|
||||||
|
BattleLogic.WaitForTrigger(interval, function ()
|
||||||
|
local damage = BattleUtil.ApplyDamage(caster, target, floor(caster:GetRoleData(RoleDataName.Hp) * f1))
|
||||||
|
local arr = BattleUtil.ChooseTarget(caster, 10110)
|
||||||
|
local count = math.min(#arr, i1)
|
||||||
|
local heal = floor(damage / count)
|
||||||
|
for i=1, count do
|
||||||
|
BattleUtil.CalTreat(caster, arr[i], heal)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end,
|
end,
|
||||||
|
|
|
@ -835,11 +835,11 @@ public class ItemUtil {
|
||||||
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId());
|
||||||
if (scHero.getNatural() >= 3) {
|
if (scHero.getNatural() >= 3) {
|
||||||
String message = "";
|
String message = "";
|
||||||
String quality = HeroLogic.getInstance().getQuality(scHero.getNatural());
|
// String quality = HeroLogic.getInstance().getQuality(scHero.getNatural());
|
||||||
if (reason == BIReason.COMPOS_HERO_REWARD) {
|
if (reason == BIReason.COMPOS_HERO_REWARD) {
|
||||||
message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_synthesize_content", new Object[]{playerInfoManager.getNickName(), quality, scHero.getNatural()});
|
message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_synthesize_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()});
|
||||||
} else if (reason == BIReason.HERO_RANDOM) {
|
} else if (reason == BIReason.HERO_RANDOM) {
|
||||||
message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_recruit_content", new Object[]{playerInfoManager.getNickName(), quality, scHero.getNatural()});
|
message = SErrorCodeEerverConfig.getI18NMessage("lamp_lottery_recruit_content", new Object[]{playerInfoManager.getNickName(), scHero.getNatural(), scHero.getReadingName()});
|
||||||
}
|
}
|
||||||
if (!message.isEmpty()){
|
if (!message.isEmpty()){
|
||||||
ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0);
|
ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0);
|
||||||
|
|
Loading…
Reference in New Issue