战斗修改

back_recharge
lvxinran 2020-04-10 18:04:21 +08:00
parent 86f5c6a74d
commit 4320ed3650
3 changed files with 4 additions and 4 deletions

View File

@ -97,7 +97,6 @@ public class CheckFight {
LuaValue func = transCoderObj.get(LuaValue.valueOf("Execute")); LuaValue func = transCoderObj.get(LuaValue.valueOf("Execute"));
LuaValue args = new LuaTable(); LuaValue args = new LuaTable();
args.set("seed",seed); args.set("seed",seed);
args.set("maxTime",maxTime);
//todo type //todo type
args.set("type",fightType.getType()); args.set("type",fightType.getType());
LuaValue result = func.call( args,fightData,optionData); LuaValue result = func.call( args,fightData,optionData);

View File

@ -213,7 +213,7 @@ function BattleMain.Execute(args, fightData, optionData)
local errorCache local errorCache
if xpcall(function () if xpcall(function ()
Random.SetSeed(args.seed) Random.SetSeed(args.seed)
BattleLogic.Init(args.maxTime, fightData, optionData) BattleLogic.Init(fightData, optionData)
BattleLogic.Type = _type BattleLogic.Type = _type
if _type == 9 or _type == 10 then if _type == 9 or _type == 10 then
AddRecord(fightData) AddRecord(fightData)
@ -250,7 +250,8 @@ function BattleMain.Execute(args, fightData, optionData)
-- print("hp:"..resultList[i]) -- print("hp:"..resultList[i])
--end --end
--print("最终运行帧数:"..BattleLogic.CurFrame()) --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 playerDamage=0
local enemyDamage=0 local enemyDamage=0
for k,v in pairs(BattleRecord)do for k,v in pairs(BattleRecord)do

View File

@ -302,7 +302,7 @@ public class FightDataUtil {
SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay);
int KeyFrame = sCombatControl.getKeyFrame(); int KeyFrame = sCombatControl.getKeyFrame();
effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId())); effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId()));
effect.rawset(2, LuaValue.valueOf(KeyFrame)); effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f));
List<LuaValue> effectValueList = getEffectArgs(skillTargetVos.getEffectVale()); List<LuaValue> effectValueList = getEffectArgs(skillTargetVos.getEffectVale());
int size = effectValueList.size(); int size = effectValueList.size();
if (size > 0) { if (size > 0) {