diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 39aa6d3d96..eb1855789e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -488,7 +488,11 @@ function BattleLogic.Update() end if CurRound > MaxRound then if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛 - or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend then -- 好友切磋 + or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend + or BattleLogic.Type == BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight + or BattleLogic.Type == BATTLE_SERVER_TYPE.LINGMAIMIJING + or BattleLogic.Type == BATTLE_SERVER_TYPE.CarPersonFight + or BattleLogic.Type == BATTLE_SERVER_TYPE.NewArenaFight then -- 好友切磋 if allHeroDamage>allEnemyDamage then BattleLogic.BattleEnd(1) else diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index a389c8c874..13efedf760 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -6,7 +6,7 @@ end BATTLE_SERVER_TYPE = { - NewArenaFight = 0, --本地测试竞技场值 + NewArenaFight = 0, --本地测试竞技场值/罗浮争锋 StoryFight = 1, --故事副本 MapExploreFight = 2, -- 地图探索 ArenaFight = 3, --竞技场 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index a9a151b0c2..c55c7944c7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -398,6 +398,7 @@ function this.InitBattleData() --BattleLogic.IsOpenBattleRecord = true BattleLogic.Init(this.fightData, {uid = PlayerManager.uid, fightId = this.fightId}, this.maxRound) BattleLogic.Type = this.battleType + LogError("battle type=="..BattleLogic.Type) this.InitBattleEvent() -- this.EnemyPanel:GetComponent("RectTransform").anchoredPosition = Vector2.New(0, posY)