diff --git a/conf/BattleMain.lua b/conf/BattleMain.lua index f3ac4f98e..1ea152578 100644 --- a/conf/BattleMain.lua +++ b/conf/BattleMain.lua @@ -212,7 +212,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) @@ -249,7 +249,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