diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index 6eafc10aff..42cc3c58b6 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -46569,6 +46569,7 @@ RectTransform: - {fileID: 416942685} - {fileID: 1856229261} - {fileID: 2133294051} + - {fileID: 5026487658464017769} m_Father: {fileID: 3414655680617284804} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -113292,6 +113293,85 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6603444097879391476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5026487658464017769} + - component: {fileID: 3230230659227593561} + - component: {fileID: 4719824140621830368} + m_Layer: 5 + m_Name: awaitText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5026487658464017769 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603444097879391476} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1787225928} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -571.2} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3230230659227593561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603444097879391476} + m_CullTransparentMesh: 0 +--- !u!114 &4719824140621830368 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6603444097879391476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7B49\u5F85\u5176\u4ED6\u6218\u6597\u7ED3\u675F" --- !u!1 &6613781944925528379 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab index 901d30dd13..1562d3b265 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab @@ -68099,8 +68099,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -95.3, y: -11.5} - m_SizeDelta: {x: 154, y: 154} + m_AnchoredPosition: {x: -98.3, y: -4.4} + m_SizeDelta: {x: 189.2, y: 135.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2329943828632860207 CanvasRenderer: @@ -68124,13 +68124,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 52700f32f4316ad4f85ed788db41cd76, type: 3} + m_Sprite: {fileID: 21300000, guid: 78567429561ae894e8231f906dda9c93, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -78305,8 +78305,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 95.30001, y: -11.5} - m_SizeDelta: {x: 154, y: 154} + m_AnchoredPosition: {x: -98.3, y: -4.4} + m_SizeDelta: {x: 189.2, y: 135.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &-6287820732729753348 CanvasRenderer: @@ -78336,7 +78336,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: 9696cc39287858040b5db93568ea0d7f, type: 3} + m_Sprite: {fileID: 21300000, guid: 79ed37699f32a0347b2cf4eedbe3aefd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -122194,7 +122194,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6472283585429126207 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index edd7959d7a..1fa3e198b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -815,12 +815,28 @@ function this.GetTwoOutOfThreeInfo(type) return 2,0 end end +--获取当前三局两胜是够结束 +function this.GetIsBattleEndState() + local oldTwoOutOfThreeIndex = nil---历史记录(上次的结果 当前胜负根据战斗结果判断) 1 无记录 0前两场负 1 前两场胜 2 胜 3 负 4 胜负 5 负胜 + if type == TOP_MATCH_STAGE.CHOOSE then--我的 + oldTwoOutOfThreeIndex = this.GetBaseData().process + elseif type == TOP_MATCH_STAGE.ELIMINATION then--竞猜 + oldTwoOutOfThreeIndex = this.GetProcess() + end + if oldTwoOutOfThreeIndex == 0 or oldTwoOutOfThreeIndex == 1 then + return true + else + return false + end +end +--屏幕索引 没啥用了 function this.SetCurTabIndex(index) this.CurTabIndex = index end function this.GetCurTabIndex() return this.CurTabIndex end +--是否显示竞猜结果 function this.SetcurIsShowDoGuessPopup(isShow) this.curIsShowDoGuessPopup = isShow end diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index f8e2801328..c380b312fd 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -71,7 +71,8 @@ function this.InitComponent(root) -- 点击编队 this.btnBlueFormat = Util.GetGameObject(root.gameObject, "ATM_CommonPart/formatRoot/myFormat/orggroup") this.btnRedFormat = Util.GetGameObject(root.gameObject, "ATM_CommonPart/formatRoot/otherFormat/orggroup") - + --等待其他战斗结束 + this.awaitText = Util.GetGameObject(this.infoPanel, "awaitText") end function this.BindEvent() @@ -114,7 +115,8 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore) this.FreshTeam(blueData.team, true) this.FreshTeam(redData.team, false) this.RefreshTwoOutOfThreeData() - + LogGreen("ArenaTopMatchManager.GetIsBattleEndState() "..tostring( ArenaTopMatchManager.GetIsBattleEndState())) + this.awaitText:SetActive(ArenaTopMatchManager.GetIsBattleEndState()) end -- 设置显隐 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua index fd20420ff3..a0c096281e 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_EliminationView.lua @@ -256,14 +256,15 @@ end function this.Set32Group(index) this.groupInfo.text=GroupInfo[index] local data={} + LogGreen("LengthOfTable(ArenaTopMatchManager.EliminationData_32) "..LengthOfTable(ArenaTopMatchManager.EliminationData_32)) for i, v in pairs(ArenaTopMatchManager.EliminationData_32) do if v.teamId==index then - --Log(tostring(v)) table.insert(data,v) end end for i, v in pairs(data) do + LogGreen("v.roundTImes v.position "..v.roundTImes.." "..v.position) if v.roundTImes==8 then local item1= Util.GetGameObject(this.thirtyTwoPre,"Pos"..v.position.."/ItemPre (1)") local item2= Util.GetGameObject(this.thirtyTwoPre,"Pos"..v.position.."/ItemPre (2)") @@ -274,7 +275,7 @@ function this.Set32Group(index) this.SetGuessBtn(guessBtn,v.isGUess) end if v.roundTImes==9 then - LogGreen("v.position "..v.position) + -- LogGreen("v.position "..v.position) local item1= Util.GetGameObject(this.thirtyTwoPre,"Pos"..(v.position+4).."/ItemPre (1)") local item2= Util.GetGameObject(this.thirtyTwoPre,"Pos"..(v.position+4).."/ItemPre (2)") local playBackBtn=Util.GetGameObject(this.thirtyTwoPre,"Pos"..(v.position+4).."/PlayBackBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 7ca064fc1d..33e4c4aa9a 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -213,14 +213,19 @@ function this.RefreshBaseShow() LogGreen("betBattleInfo.enemyInfo.uid "..betBattleInfo.enemyInfo.uid) LogGreen("betBattleInfo.myInfo.uid "..betBattleInfo.myInfo.uid) local IsBeted = myBetTarget and myBetTarget ~= 0 - if IsBeted then + local upWinNum,downWinNum = ArenaTopMatchManager.GetTwoOutOfThreeInfo(battleStage) + local isCanGuessByBattleEndState = true + if battleStage == TOP_MATCH_STAGE.ELIMINATION then + if upWinNum ~= -1 or downWinNum ~= -1 then isCanGuessByBattleEndState = false end + end + if IsBeted or not isCanGuessByBattleEndState then local isBetRed = myBetTarget == betBattleInfo.enemyInfo.uid local isBetBlue = myBetTarget == betBattleInfo.myInfo.uid this.redBtn:GetComponent("Image").sprite = Util.LoadSprite(isBetRed and "r_jingjichang_jingcai" or "r_jingjichang_jingcai_01") this.blueBtn:GetComponent("Image").sprite = Util.LoadSprite(isBetBlue and "r_jingjichang_jingcai" or "r_jingjichang_jingcai_01") this.redGuess:SetActive(isBetRed) this.blueGuess:SetActive(isBetBlue) - else + elseif isCanGuessByBattleEndState then local baseInfo = ArenaTopMatchManager.GetBaseData() local isInGuess = baseInfo.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_GUESS local imgName = isInGuess and "r_jingjichang_jingcai" or "r_jingjichang_jingcai_01"