From 1373efaba81766b5c51d2c2efbc37871b6765bf4 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 6 Jan 2022 17:59:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=AE=B6=E5=9B=AD=E3=80=91?= =?UTF-8?q?=E6=91=98=E6=98=9F=E9=98=81=E7=BA=A2=E7=82=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua index 6143126f94..2bd3dfc6e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/HomeLand/HomeLandManager.lua @@ -293,7 +293,7 @@ end function this.CheckSingleEquipUpgrade(id) local bool = false local data = this.EquipData[id] - if BagManager.GetTotalItemNum(data.configData.Cost[1][1]) >= data.configData.Cost[1][2] then--所需材料够 + if data.configData.Cost and BagManager.GetTotalItemNum(data.configData.Cost[1][1]) >= data.configData.Cost[1][2] then--所需材料够 if this.BuildData[data.configData.Limit[1]].level >= data.configData.Limit[2] then--到达升级条件 bool = true end From e0c228bf3fd1f67d60b218c3485b8e8727e86eb6 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 6 Jan 2022 18:27:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D?= =?UTF-8?q?=E5=BA=93=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/GeneralBigPopup_YiJingBaoKu.lua | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 5875d2a2ae..c5de3f9c5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -137,32 +137,33 @@ function this:SetSingleData(index,item,data) end local aData = this.GetDataByRewardId(data.Id) -- LogRed(aData.rewardId..":"..tostring(aData.progress)) - -- if aData.progress >= data.InitializeNum then - -- t3 = false - -- -- 如果是当前层选中的特殊奖励 - -- if aData.progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum - -- t3 = true - -- end - -- num.text = ""..(data.InitializeNum-aData.progress).."/"..data.InitializeNum.."" - -- else - -- t3 = true - -- num.text = (data.InitializeNum - aData.progress).."/"..data.InitializeNum - -- end + if not aData then--2022/1/6 易经宝库增加层数容错 + aData = {} + aData.progress = data.InitializeNum + end + if aData.progress >= data.InitializeNum then + t3 = false + -- 如果是当前层选中的特殊奖励 + if aData.progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum + t3 = true + end + num.text = ""..(data.InitializeNum-aData.progress).."/"..data.InitializeNum.."" + else + t3 = true + num.text = (data.InitializeNum - aData.progress).."/"..data.InitializeNum + end - -- select:SetActive(t1 and t2 and t3) + select:SetActive(t1 and t2 and t3) end -- 获取数量 function this.GetDataByRewardId(rId) - LogPink("rId:"..tostring(rId)) for k, v in ipairs(ActData.allData) do - LogGreen("v.rewardId:"..tostring(v.rewardId)) if v.rewardId == rId then return v end end - LogError("rId:"..tostring(rId)) end