From 70697ee6df1acd0379450b1dc7aaa3c39ff4b809 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 11 Sep 2020 18:00:53 +0900 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E5=88=87=E7=A3=8B=E5=9B=9E?= =?UTF-8?q?=E5=90=88=E7=BB=93=E6=9D=9F=E6=8C=89=E7=85=A7=E6=80=BB=E4=BC=A4?= =?UTF-8?q?=E5=AE=B3=E5=80=BC=E5=92=8C=E6=B2=BB=E7=96=97=E5=80=BC=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E8=BE=93=E8=B5=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/BattleLogic.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index f6e9966783..4f6e250d75 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -9,7 +9,7 @@ local CurCamp = 0 local CurSkillPos = {} local PosList = {} local curFrame -BattleLogic.Type = 0 --1 故事副本 2 地图探索 3 竞技场 4 秘境boss 5 解锁秘境 6 公会战 7 血战 8 兽潮 9巅峰战 +BattleLogic.Type = -1 -- 0 切磋 1 故事副本 2 地图探索 3 竞技场 4 秘境boss 5 解锁秘境 6 公会战 7 血战 8 兽潮 9巅峰战 BattleLogic.IsEnd = false BattleLogic.Result = -1 BattleLogic.Event = BattleEvent.New() @@ -310,7 +310,7 @@ function BattleLogic.Update() return end if CurRound > MaxRound then - if BattleLogic.Type==9 then + if BattleLogic.Type==9 or BattleLogic.Type== 0 then LogError("我方总输出"..allHeroDamage.."敌方总输出:"..allEnemyDamage) if allHeroDamage>allEnemyDamage then LogError("争霸赛我方胜")