Merge branch 'master_develop' into master_local_test

JieLing 2020-07-25 21:13:03 +08:00
commit 83525682c6
2 changed files with 8 additions and 2 deletions

View File

@ -84,6 +84,9 @@ function ATM_GuessView:BindEvent()
end)
end
function this.battleDetailBtnClick(isShowTip)
if UIManager.IsOpen(UIName.DoGuessPopup) then
UIManager.ClosePanel(UIName.DoGuessPopup)
end
local betBattleInfo = ArenaTopMatchManager.GetBetBattleInfo()
if betBattleInfo.result == -1 then
return

View File

@ -109,6 +109,9 @@ end
--刷新排名信息
function this.RefreshRankInfo()
for i = 1, #itemList do
Util.GetGameObject(itemList[i],"Name"):GetComponent("Text").text = ""
end
local isActive = ArenaTopMatchManager.IsTopMatchActive()
battleStage = ArenaTopMatchManager.GetBaseData().battleStage
battleTurn = ArenaTopMatchManager.GetBaseData().battleTurn
@ -226,9 +229,9 @@ function this.SetItemData(...)
else
if this.playerHead[root] then
this.playerHead[root] = nil
end
end
info.enabled=true
name.text=""
-- name.text=""
end
end