From 2ca77d75ef9c90d074900c46466f4a0ddb7f04bd Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 18:40:21 +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=E4=BF=AE=E6=9C=8D=E9=80=89=E4=B8=AD=E5=A4=A7=E5=A5=96?= =?UTF-8?q?=E5=90=8E=E6=AC=A1=E6=95=B0=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/GeneralBigPopup_YiJingBaoKu.lua | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index b636697c29..431c116a52 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -136,17 +136,18 @@ function this:SetSingleData(index,item,data) limit2.text = Language[10262]..data.FloorLimit..Language[10762] t2 = false end - -- LogRed(ActData.allData[index].rewardId..":"..tostring(ActData.allData[index].progress)) - if ActData.allData[index].progress >= data.InitializeNum then + local aData = this.GetDataByRewardId(data.Id) + -- LogRed(aData.rewardId..":"..tostring(aData.progress)) + if aData.progress >= data.InitializeNum then t3 = false -- 如果是当前层选中的特殊奖励 - if ActData.allData[index].progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum + if aData.progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum t3 = true end - num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" + num.text = ""..(data.InitializeNum-aData.progress).."/"..data.InitializeNum.."" else t3 = true - num.text = (data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum + num.text = (data.InitializeNum - aData.progress).."/"..data.InitializeNum end num.gameObject:SetActive(t1 and t2) @@ -154,6 +155,16 @@ function this:SetSingleData(index,item,data) end +-- 获取数量 +function this.GetDataByRewardId(rId) + for k, v in ipairs(ActData.allData) do + if v.rewardId == rId then + return v + end + end +end + + function this:OnClose() end