diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index 88f5cf2872..64adf7169c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -135,6 +135,7 @@ end --界面关闭时调用(用于子类重写) function ArenaResultPopup:OnClose() if fun then + LogRed("抛弹竞猜结束 打开 ATM_GuessTipView") fun() fun = nil end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index 928f68e130..edd7959d7a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -716,10 +716,10 @@ end function this.GetTwoOutOfThreeInfo(type) local oldTwoOutOfThreeIndex = nil---历史记录(上次的结果 当前胜负根据战斗结果判断) 1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜 local curBattleResult = nil--当前胜负 -1 未开始 0 负 1 胜 - if type == 1 then--我的 + if type == TOP_MATCH_STAGE.CHOOSE then--我的 oldTwoOutOfThreeIndex = this.GetBaseData().process curBattleResult = this.GetBattleInfo().result - elseif type == 2 then--竞猜 + elseif type == TOP_MATCH_STAGE.ELIMINATION then--竞猜 oldTwoOutOfThreeIndex = this.GetProcess() curBattleResult = this.GetBetBattleInfo().result end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index a8f8f8da7d..2fc14be695 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -109,7 +109,7 @@ function this.battleDetailBtnClick(isShowTip) arg.red.head = betBattleInfo.enemyInfo.head arg.red.frame = betBattleInfo.enemyInfo.headFrame UIManager.OpenPanel(UIName.ArenaResultPopup, arg,function() - Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdate) + Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.OnGuessDataUpdateShowTip) end) end) end @@ -184,7 +184,7 @@ function ATM_GuessView:OnOpen(...) -- this.timer = Timer.New(_TimeUpdate, 1 , -1, true) -- this.timer:Start() -- end - this.RefreshGuessTipView() + -- this.RefreshGuessTipView() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) @@ -277,8 +277,12 @@ function this.RefreshGuessTipView() local IsBeted = myBetTarget and myBetTarget ~= 0 local isShow = ArenaTopMatchManager.GetcurIsShowDoGuessPopup() LogGreen("isShow "..tostring(isShow)) + -- if + local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(TOP_MATCH_STAGE.ELIMINATION) + local isBattleEnd = (upWinNum >= 2 or downWinNum >= 2) + LogRed("三局两胜是否结束 "..tostring(isBattleEnd)) --打开竞猜提示(处于秋后算账) - if IsBeted and isShow then + if IsBeted and isShow and isBattleEnd then local baseInfo = ArenaTopMatchManager.GetBaseData() if baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END then LogGreen("开始弹竞猜结果")