From e0caaf8adefcf546d276b79e66bf6eee8b620bc5 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 24 Sep 2020 16:26:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=8D=E7=8B=82=E6=AC=A2=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E5=A5=96=E5=8A=B1=E5=86=85=E5=AE=B9=E5=8F=8A=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E6=B6=89=E5=8F=8A=E8=A1=A8=E6=A0=BC=EF=BC=9ATreasureT?= =?UTF-8?q?askConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SevenDayCarnivalPanelV2.lua | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) 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()