diff --git a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab index dc26c5e594..a3a2ac6de9 100644 --- a/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/JumpServer/JumpServerHightLadderPanel.prefab @@ -1403,8 +1403,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: 137, y: 1.9} - m_SizeDelta: {x: 602.86, y: 201.33} + m_AnchoredPosition: {x: 255.7, y: 1.9} + m_SizeDelta: {x: 864.6, y: 201.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8627966088746689758 CanvasRenderer: @@ -4851,8 +4851,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: 137, y: 1.9} - m_SizeDelta: {x: 602.86, y: 201.33} + m_AnchoredPosition: {x: 255.70001, y: 1.9} + m_SizeDelta: {x: 864.6, y: 201.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1780904953495839689 CanvasRenderer: @@ -5373,8 +5373,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: 137, y: 1.9} - m_SizeDelta: {x: 602.86, y: 201.33} + m_AnchoredPosition: {x: 255.70001, y: 1.9} + m_SizeDelta: {x: 864.6, y: 201.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2151655759273255593 CanvasRenderer: @@ -9086,8 +9086,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: 137, y: 1.9} - m_SizeDelta: {x: 602.86, y: 201.33} + m_AnchoredPosition: {x: 255.70001, y: 1.9} + m_SizeDelta: {x: 864.6, y: 201.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7174524862990147623 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 413de7e8ce..5078da411b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1312,7 +1312,8 @@ FUNCTION_OPEN_TYPE = { POKEMON=79,--灵兽山 XiaoYaoYou = 80, -- 逍遥游 RoleAwake = 81, -- 神将觉醒 - JumpServer = 82, -- 跨服玩法 + JumpServer_HightLadder = 82, -- 跨服天梯玩法 + JumpServer = 85, -- 跨服玩法 } TaskGetBtnIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua index 829d30b15c..13f8d62a6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerHightLadderPanel.lua @@ -56,7 +56,7 @@ function JumpServerHightLadderPanel:BindEvent() UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[15]) end) Util.AddClick(this.rewardSortBtn,function() - UIManager.OpenPanel(UIName.JumpServerHightLadderRewardSortPanel,FUNCTION_OPEN_TYPE.JumpServer) + UIManager.OpenPanel(UIName.JumpServerHightLadderRewardSortPanel,FUNCTION_OPEN_TYPE.JumpServer_HightLadder) end) Util.AddClick(this.recordBtn,function() UIManager.OpenPanel(UIName.JumpServerHightLadderRecordPopup) @@ -65,7 +65,7 @@ function JumpServerHightLadderPanel:BindEvent() JumpManager.GoJump(3005) end) Util.AddClick(this.formationBtn,function() - -- if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer) then + -- if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) then -- PopupTipPanel.ShowTip(Language[10082]) -- return -- end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index 7ca93e91ed..63b0499414 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -172,23 +172,25 @@ function this.CheckJumpServerhightLadderMainCityRedPoint() end --剩余免费挑战次数红点 function this.JumpServerHightLadderMianFeiNumRedPoint() - local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer) + local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) if not isOpen then return false end if not this.GetHightLadderDataEnterable() then return false end - if this.GetCanBattleCount() > 0 then - LogPink("跨服天梯剩余免费挑战次数红点true") - return true + if stage == 2 then + if this.GetCanBattleCount() > 0 then + LogPink("跨服天梯剩余免费挑战次数红点true") + return true + end end LogPink("跨服天梯剩余免费挑战次数红点false") return false end --跨服天梯可以膜拜红点 function this.JumpServerHightLadderWorshipRedPoint() - local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer) + local isOpen = ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) if not isOpen then return false end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua index 1eca8dfc44..72403fd1b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerPanel.lua @@ -147,7 +147,7 @@ end function this.BtnClick(id) if id == JumpServer_Type.HightLadder then - if ActTimeCtrlManager.SingleFuncState(id) == false then --如果未解锁 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.JumpServer_HightLadder) == false then --如果未解锁 PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(JumpServer_Type.HightLadder)) return end