From dbb563fbe525d4f183601fcc4e772fea7bed8341 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Fri, 24 Jul 2020 10:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E7=AC=AC=E4=B8=89=E5=9C=BA?= =?UTF-8?q?=E6=88=98=E6=96=97=E5=8A=A8=E7=94=BB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua | 2 ++ .../~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua | 1 + .../~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua | 4 ++++ .../~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua | 4 ++++ 4 files changed, 11 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index ccccf354c9..5bfd49bbb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -907,6 +907,7 @@ function this.GetTwoOutOfThreeInfo(type) LogGreen(" return 2,0") return 2,0 end + return 0,0 end --获取当前三局两胜是否结束 function this.GetIsBattleEndState(type) @@ -915,6 +916,7 @@ function this.GetIsBattleEndState(type) oldTwoOutOfThreeIndex = this.GetBaseData().process elseif type == 2 then--竞猜 oldTwoOutOfThreeIndex = this.GetProcess() + LogPink("oldTwoOutOfThreeIndex "..oldTwoOutOfThreeIndex) end local baseData = ArenaTopMatchManager.GetBaseData() -- 没开启或者开启没参赛都属于未参赛 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index f9d3292bf6..a6cfeb81bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -128,6 +128,7 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore,batt this.RefreshTwoOutOfThreeData() this.awaitText:SetActive(ArenaTopMatchManager.GetIsBattleEndState(this.panelType)) + LogPink("ArenaTopMatchManager.GetIsBattleEndState(this.panelType) "..tostring(ArenaTopMatchManager.GetIsBattleEndState(this.panelType))) if this.panelType == 1 then this.awaitText.transform.localPosition = Vector3.New(0,785,0) elseif this.panelType == 2 then diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 7c0abe77b4..58503c178f 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -89,6 +89,10 @@ function this.battleDetailBtnClick(isShowTip) Log(Language[10168]) return end + if ArenaTopMatchManager.GetIsBattleEndState(2) then + LogPink(" `````````` 第三场 竞技战斗动画拦截住了 ") + return + end local nameStr = betBattleInfo.myInfo.name.."|"..betBattleInfo.enemyInfo.name ArenaTopMatchManager.RequestReplayRecord(betBattleInfo.result, betBattleInfo.fightData, nameStr, function() diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 32322c6614..04fc46dd85 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -123,6 +123,10 @@ function this.battleDetailBtnClick() Log(Language[10168]) return end + if ArenaTopMatchManager.GetIsBattleEndState(1) then + LogPink(" `````````` 第三场 我的战斗动画拦截住了 ") + return + end local nameStr = battleInfo.myInfo.name.."|"..battleInfo.enemyInfo.name ArenaTopMatchManager.RequestReplayRecord(battleInfo.result, battleInfo.fightData, nameStr, function()