From 95e84791cd34a345b40b31a7b9a39eb1eccbfc9f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 15 Jul 2020 12:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E6=95=B0=E6=8D=AE=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/util/FightDataUtil.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 c2a433a15..fcebb6da1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -286,11 +286,19 @@ public class FightDataUtil { // cd+=Integer.parseInt(args[0]); // } skill.rawset(1, LuaValue.valueOf(skillId)); + int skillDisplay =sSkillLogicVo.getSkillDisplay(); + SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); + int KeyFrame = sCombatControl.getKeyFrame(); + int SkillDuration = sCombatControl.getSkillDuration(); + int SkillNumber = sCombatControl.getSkillNumber(); + skill.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); + skill.rawset(3, LuaValue.valueOf(SkillDuration/1000f)); + skill.rawset(4, LuaValue.valueOf(SkillNumber)); List effectList = getEffect(sSkillLogicVo); int size = effectList.size(); if (size > 0) { for (int i = 0; i < size; i++) { - skill.rawset(i + 2, effectList.get(i)); + skill.rawset(i + 5, effectList.get(i)); } } } @@ -301,20 +309,12 @@ public class FightDataUtil { List effectList = new ArrayList<>(); for (SkillTargetVo skillTargetVos : sSkillLogicVo.getSkillTargetVoList()) { LuaValue effect = new LuaTable(); - 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 + 5, effectValueList.get(i)); + effect.rawset(i + 2, effectValueList.get(i)); } } effectList.add(effect);