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