From deb08dbaf744f55ac9bf89d354bedc4968e1258c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 14 Jul 2020 17:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=20=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/util/FightDataUtil.java | 6 +++++- tablemanager/src/main/java/config/SCombatControl.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index 2082d7612..c2a433a15 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -304,13 +304,17 @@ public class FightDataUtil { int skillDisplay =sSkillLogicVo.getSkillDisplay(); SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); int KeyFrame = sCombatControl.getKeyFrame(); + int SkillDuration = sCombatControl.getSkillDuration(); + int SkillNumber = sCombatControl.getSkillNumber(); effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId())); effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); + effect.rawset(3, LuaValue.valueOf(SkillDuration/1000f)); + effect.rawset(4, LuaValue.valueOf(SkillNumber)); List effectValueList = getEffectArgs(skillTargetVos.getEffectVale()); int size = effectValueList.size(); if (size > 0) { for (int i = 0; i < size; i++) { - effect.rawset(i + 3, effectValueList.get(i)); + effect.rawset(i + 5, effectValueList.get(i)); } } effectList.add(effect); diff --git a/tablemanager/src/main/java/config/SCombatControl.java b/tablemanager/src/main/java/config/SCombatControl.java index b9c6ef3e2..7de2b12e7 100644 --- a/tablemanager/src/main/java/config/SCombatControl.java +++ b/tablemanager/src/main/java/config/SCombatControl.java @@ -12,7 +12,10 @@ public class SCombatControl implements BaseConfig { private int keyFrame; - + private int skillDuration; + + private int skillNumber; + @Override public void init() throws Exception { @@ -27,5 +30,11 @@ public class SCombatControl implements BaseConfig { return keyFrame; } + public int getSkillDuration() { + return skillDuration; + } + public int getSkillNumber() { + return skillNumber; + } } \ No newline at end of file