diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index 1810e5f516..f03d4e3fd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -457,16 +457,27 @@ function this.SingleItemDataShow(go, data) --Util.GetGameObject(go, "current/redPoint"):SetActive(curServerTask.state == 1) Util.GetGameObject(go, "current/finished"):SetActive(curServerTask.state == 2) Util.GetGameObject(go, "current/buyBtn"):SetActive(false) - jumpBtn:SetActive(curServerTask.state == 0) Util.GetGameObject(go, "current/progress"):SetActive(not curServerTask.state == 2) Util.AddOnceClick(dealBtn, function() NetManager.TakeMissionRewardRequest(TaskTypeDef.SevenDayCarnival, curServerTask.missionId, function(respond) UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1) end) end) - Util.AddOnceClick(jumpBtn, function() - JumpManager.GoJump(data.Jump[1]) - end) + -- 判断是否需要跳转 + if curServerTask.state == 0 then + jumpBtn:SetActive(true) + local isJump = data.Jump and data.Jump[1] and data.Jump[1] ~= 0 + local btnText = Util.GetGameObject(jumpBtn, "Text"):GetComponent("Text") + btnText.text = isJump and Language[10023] or Language[10366] + Util.SetGray(jumpBtn, not isJump) + Util.AddOnceClick(jumpBtn, function() + if isJump then + JumpManager.GoJump(data.Jump[1]) + end + end) + else + jumpBtn:SetActive(false) + end end --界面关闭时调用(用于子类重写) function SevenDayCarnivalPanelV2:OnClose()