diff --git a/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java b/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java index 03ebc0a0e..97ffde094 100644 --- a/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java +++ b/fightmanager/src/main/java/com/ljsd/fight/CheckFight.java @@ -97,7 +97,6 @@ public class CheckFight { LuaValue func = transCoderObj.get(LuaValue.valueOf("Execute")); LuaValue args = new LuaTable(); args.set("seed",seed); - args.set("maxTime",maxTime); //todo type args.set("type",fightType.getType()); LuaValue result = func.call( args,fightData,optionData); diff --git a/luafight/BattleMain.lua b/luafight/BattleMain.lua index 513ebce9f..00c87a744 100644 --- a/luafight/BattleMain.lua +++ b/luafight/BattleMain.lua @@ -213,7 +213,7 @@ function BattleMain.Execute(args, fightData, optionData) local errorCache if xpcall(function () Random.SetSeed(args.seed) - BattleLogic.Init(args.maxTime, fightData, optionData) + BattleLogic.Init(fightData, optionData) BattleLogic.Type = _type if _type == 9 or _type == 10 then AddRecord(fightData) @@ -250,7 +250,8 @@ function BattleMain.Execute(args, fightData, optionData) -- print("hp:"..resultList[i]) --end --print("最终运行帧数:"..BattleLogic.CurFrame()) - if BattleLogic.CurFrame() > BattleLogic.GameFrameRate * args.maxTime and _type == 9 then + local curRound, maxRound = BattleLogic.GetCurRound() + if curRound > maxRound and _type == 9 then local playerDamage=0 local enemyDamage=0 for k,v in pairs(BattleRecord)do 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 3187087d4..bb80bf1a7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -302,7 +302,7 @@ public class FightDataUtil { SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); int KeyFrame = sCombatControl.getKeyFrame(); effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId())); - effect.rawset(2, LuaValue.valueOf(KeyFrame)); + effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); List effectValueList = getEffectArgs(skillTargetVos.getEffectVale()); int size = effectValueList.size(); if (size > 0) {