diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua index ee563f3f5e..95efd64d15 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua @@ -349,7 +349,7 @@ function this.SetChampionHead(head, fightResult, defInfo, attackInfo) local lv = Util.GetGameObject(head, "lvRoot/lv"):GetComponent("Text") -- - if not fightResult then + if not fightResult or fightResult and fightResult == -1 then headImg.color = Color.New(1,1,1,0) lvRoot:SetActive(false) return diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index fbfc8c6e3c..f5b76ea3e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -86,11 +86,12 @@ end function this.battleDetailBtnClick(isShowTip) local betBattleInfo = ArenaTopMatchManager.GetBetBattleInfo() if betBattleInfo.result == -1 then - Log(Language[10168]) return end if ArenaTopMatchManager.GetIsBattleEndState(2) then - LogPink(" `````````` 第三场 竞技战斗动画拦截住了 ") + return + end + if UIManager.IsOpen(UIName.BattlePanel) then return end local nameStr = betBattleInfo.myInfo.name.."|"..betBattleInfo.enemyInfo.name @@ -252,15 +253,15 @@ end -- 刷新赔率显示 function this.RefreshBetRateShow() - local betRateInfo = ArenaTopMatchManager.GetBetRateInfo() - -- 避免除数为0的错误 - if betRateInfo.redCoins <= 0 then betRateInfo.redCoins = 1 end - if betRateInfo.blueCoins <= 0 then betRateInfo.blueCoins = 1 end + -- local betRateInfo = ArenaTopMatchManager.GetBetRateInfo() + -- -- 避免除数为0的错误 + -- if betRateInfo.redCoins <= 0 then betRateInfo.redCoins = 1 end + -- if betRateInfo.blueCoins <= 0 then betRateInfo.blueCoins = 1 end -- - local allCoin = betRateInfo.redCoins + betRateInfo.blueCoins + -- local allCoin = betRateInfo.redCoins + betRateInfo.blueCoins -- 下注比例 - local redRate = betRateInfo.redCoins/allCoin - local blueRate = betRateInfo.blueCoins/allCoin + local redRate = 0.5--betRateInfo.redCoins/allCoin + local blueRate = 0.5--betRateInfo.blueCoins/allCoin this.redProgress.transform.localScale = Vector3.New(redRate, 1, 1) this.blueProgress.transform.localScale = Vector3.New(blueRate, 1, 1) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 04fc46dd85..e5214a68a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -120,11 +120,12 @@ function this.battleDetailBtnClick() return end if battleInfo.result == -1 then - Log(Language[10168]) return end if ArenaTopMatchManager.GetIsBattleEndState(1) then - LogPink(" `````````` 第三场 我的战斗动画拦截住了 ") + return + end + if UIManager.IsOpen(UIName.BattlePanel) then return end local nameStr = battleInfo.myInfo.name.."|"..battleInfo.enemyInfo.name