巅峰赛 修改
parent
7d724437ee
commit
f3048c9904
|
@ -56536,7 +56536,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -58751,7 +58751,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -59129,7 +59129,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -59320,7 +59320,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -59760,7 +59760,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -87487,7 +87487,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -99903,7 +99903,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -110135,7 +110135,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -129154,7 +129154,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 2c583211fbf175c449dab3c5b327b9c5, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 048cdcd08f5e14d4c8ca93fdc5a015a0, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
|
@ -4,7 +4,7 @@ local commonInfo = require("Modules/ArenaTopMatch/View/ATM_CommonInfo")
|
|||
local matchPanel=require("Modules/ArenaTopMatch/ArenaTopMatchPanel")
|
||||
local GUESS_COIN = ArenaTopMatchManager.GetGuessCoinID()
|
||||
local battleStage=0
|
||||
|
||||
local isCanGuessByBattleEndState = true
|
||||
--初始化组件(用于子类重写)
|
||||
function ATM_GuessView:InitComponent()
|
||||
this.guessPanel = Util.GetGameObject(this.transform, "guessbox")
|
||||
|
@ -52,7 +52,7 @@ local function _CheckGuess()
|
|||
return false
|
||||
end
|
||||
|
||||
if baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS then
|
||||
if baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS and isCanGuessByBattleEndState then
|
||||
return true
|
||||
end
|
||||
PopupTipPanel.ShowTip(Language[10116])
|
||||
|
@ -214,7 +214,7 @@ function this.RefreshBaseShow()
|
|||
LogGreen("betBattleInfo.myInfo.uid "..betBattleInfo.myInfo.uid)
|
||||
local IsBeted = myBetTarget and myBetTarget ~= 0
|
||||
local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(battleStage)
|
||||
local isCanGuessByBattleEndState = true
|
||||
isCanGuessByBattleEndState = true
|
||||
if battleStage == TOP_MATCH_STAGE.ELIMINATION then
|
||||
if upWinNum ~= -1 or downWinNum ~= -1 then isCanGuessByBattleEndState = false end
|
||||
end
|
||||
|
|
|
@ -105,7 +105,7 @@ function this.StateChange(isOpen)
|
|||
end
|
||||
end
|
||||
|
||||
this.containPanel:SetActive(not isOpen or not isJoin or isOver or baseData.loser)
|
||||
this.containPanel:SetActive(not isOpen or not isJoin or baseData.loser)-- or isOver
|
||||
this.btnRecord:SetActive(isOpen and isJoin)
|
||||
this.btnTeamRank:SetActive(isOpen and isJoin)
|
||||
this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END)
|
||||
|
|
Loading…
Reference in New Issue