From a32cad16a08f0ad7e23d897680a16484f0ddde45 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 29 Aug 2019 11:03:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?0.93=E5=90=8C=E6=AD=A5=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/Base/Effect.lua | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/luafight/Modules/Battle/Logic/Base/Effect.lua b/luafight/Modules/Battle/Logic/Base/Effect.lua index f81862756..66786574f 100644 --- a/luafight/Modules/Battle/Logic/Base/Effect.lua +++ b/luafight/Modules/Battle/Logic/Base/Effect.lua @@ -943,6 +943,26 @@ local effectList = { BattleLogic.BuffMgr:ClearBuff(target, function (buff) return buff.isDeBuff == true 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, From ca28591b484c2b259cc079f633738002f0381c3b Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 29 Aug 2019 11:08:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=A6=96=E7=81=B5?= =?UTF-8?q?=E5=B8=88=E8=B5=84=E8=B4=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/ItemUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 64f4649bd..2cc6f2a4b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -835,11 +835,11 @@ public class ItemUtil { SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); if (scHero.getNatural() >= 3) { String message = ""; - String quality = HeroLogic.getInstance().getQuality(scHero.getNatural()); +// String quality = HeroLogic.getInstance().getQuality(scHero.getNatural()); 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) { - 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()){ ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,hero.getTemplateId(),0,0,0,0,0);