From 4bb74a24f07918099186bb3769115047c6a04514 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 17 May 2024 18:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E5=AF=B9=E5=A1=94=E5=BC=80=E6=88=98?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=B5=E5=AE=B9=E5=88=A4=E6=96=AD=EF=BC=8C?= =?UTF-8?q?=E7=9B=B8=E5=90=8C=E8=8B=B1=E9=9B=84=E5=88=A4=E6=96=AD=20?= =?UTF-8?q?=E5=90=8Cbt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 793fc3a5bc7b4bb3954aa35c14b2e8f81b2f0b97) --- .../WorldArena/GodsWayBattleInfoPanel.lua | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua index 7c2e374e64..0688e5a07d 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayBattleInfoPanel.lua @@ -264,8 +264,7 @@ function WorldArenaBattleInfoPanel:BindEvent() self:ClosePanel() return end - -- 动画中不能再执行 - state=2 + if isAnim then LogError("正在播放动画") return @@ -274,11 +273,24 @@ function WorldArenaBattleInfoPanel:BindEvent() PopupTipPanel.ShowTip("编队为空,无法挑战") return end - + local teamNum=0 + if curType==1 then + teamNum=2 + elseif curType==2 then + teamNum=3 + end + for i=1,teamNum do + if not leftAllTeam[i] or #leftAllTeam[i]==0 then + PopupTipPanel.ShowTip("编队为空,无法挑战") + return + end + end if isSame then PopupTipPanel.ShowTip("检测到多个阵容使用相同神将,无法开战") return end + -- 动画中不能再执行 + state=2 floor=GodsWayTowerManager.GetTowerFloorByType(curType) NetManager.RequestDuoDuiChallenge(curType,floor+1,1,function(msg) resultList=msg.result