From 0769659e72c65c98379e0c167d11890cdb573d27 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 11 Nov 2021 14:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BA=91?= =?UTF-8?q?=E6=B8=B8=E5=95=86=E4=BA=BA=E5=A2=9E=E5=8A=A0=E7=99=BD=E9=87=91?= =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=88=86=E8=A7=A3=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 1 + .../~Lua/Modules/NewActivity/ItemUpstarPre.lua | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 23d9b7e3b1..212916352b 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -19,6 +19,7 @@ local TypeUpdateFunc = { curData.rewards[i].otherData.needItems = configData[j].NeedItems curData.rewards[i].otherData.count = configData[j].Count curData.rewards[i].otherData.composeType = configData[j].ComposeType + curData.rewards[i].otherData.IsShowItem = configData[j].IsShowItem == 1 and true or false curData.rewards[i].otherData.selectId = 0 end end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua index a1bbba08ad..6b200b4814 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua @@ -92,11 +92,11 @@ end function ItemUpstarPre:SetMask() if self.data.otherData.selectId == 0 then self.btnMaskNeedAdd:SetActive(true) - self.btnMaskGet:SetActive(true) + self.btnMaskGet:SetActive(not self.data.otherData.IsShowItem) Util.GetGameObject(self.itemList[1].gameObject,"effects"):SetActive(false) Util.GetGameObject(self.itemList[1].gameObject,"item/icon"):SetActive(false) Util.GetGameObject(self.itemList[3].gameObject,"effects"):SetActive(false) - Util.GetGameObject(self.itemList[3].gameObject,"item/icon"):SetActive(false) + Util.GetGameObject(self.itemList[3].gameObject,"item/icon"):SetActive(self.data.otherData.IsShowItem) else self.btnMaskNeedAdd:SetActive(false) self.btnMaskGet:SetActive(false)