From 46b8e5252477de1637eb9fd26be1369763a11655 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 9 Nov 2020 16:01:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D=E5=BA=93?= =?UTF-8?q?=E3=80=91=E5=85=A8=E9=83=A8=E9=A2=86=E5=AE=8C=E5=90=8E=20?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=9C=80=E7=BB=88=E5=A5=96=E5=8A=B1=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=A5=96=E6=B1=A0=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit cfeabacca5df3645e1cf4f6e68558f15a3bfb025) --- .../~Lua/Modules/DynamicActivity/YiJingBaoKu.lua | 9 ++++++++- .../View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 170107a783..0faf833548 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -121,11 +121,18 @@ function YiJingBaoKu:Refresh() YiJingBaoKu:TimeCountDown()--时间 YiJingBaoKu:AddBackToFrontClick()--增加背面的带点击事件 trigger = true - this.refrashBtn:SetActive(ActData.selectId ~= 0) this.addBtn:GetComponent("Button").enabled = ActData.selectId == 0 this.name.text = "第"..NumToSimplenessFont[ActData.curLevel].."层" this.tip2.text = "点击格子挖取宝物" + local t1 = true + for i = 1, #ActData.finalCardDatas do + if ActData.selectId == ActData.finalCardDatas[i].rewardId then + t1 = false + end + end + this.refrashBtn:SetActive((ActData.selectId ~= 0) and t1) + end function YiJingBaoKu:SetCardData() diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua index 17930e8c9d..98f4066735 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua @@ -60,7 +60,7 @@ function this:OnShow(_parent,...) end finalReward:OnOpen(false, BlessingConfig[ActData.selectId].Reward, 1.1, false, false, false, sortingOrder) - -- + --检查是否已经全部领完了 local t1 = false for i = 1, #ActData.finalCardDatas do if ActData.selectId == ActData.finalCardDatas[i].rewardId then