From 19294fab2dec5cecfe050346de4768530b4d2c06 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 6 Dec 2021 16:38:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BF=9E=E8=B4=AD=E5=A5=BD=E7=A4=BC?= =?UTF-8?q?=E3=80=91=E8=B4=AD=E4=B9=B0=E9=99=90=E8=B4=AD=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=EF=BC=8C=E6=AC=A1=E6=95=B0=E4=B8=8D=E5=87=8F=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua | 2 +- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 860fdc2682..61702b0232 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -187,7 +187,7 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) PayManager.Pay(data.otherData.GoodId, function(id) FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.GoodId) OperatingManager.SetHadBuyGoodsId({data.otherData.GoodId}) - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId) + -- OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId) self:Refresh(false,false) end) elseif data.otherData.GoodType == 2 then--商品 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index c63930c77f..210042b60b 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -336,13 +336,14 @@ local TypeUpdateFunc = { tempData.otherData.Name = rechargeConfig[configData[j].GoodId].Name tempData.otherData.Reward = rechargeConfig[configData[j].GoodId].RewardShow tempData.otherData.Price = rechargeConfig[configData[j].GoodId].Price - tempData.progress = OperatingManager.GetLeftBuyTime(5,configData[j].GoodId) + tempData.progress = rechargeConfig[configData[j].GoodId].Limit - OperatingManager.GetGoodsBuyTime(5,configData[j].GoodId) elseif configData[j].GoodType == 2 then tempData.otherData.Name = goodsConfig[configData[j].GoodId].GoodsName tempData.otherData.Reward = goodsConfig[configData[j].GoodId].Goods tempData.otherData.Price = goodsConfig[configData[j].GoodId].Price tempData.progress = goodsConfig[configData[j].GoodId].Limit - curData.rewards[i].progress end + -- LogPink("missionId:"..tostring(tempData.missionId).." progress:"..tostring(tempData.progress)) if not tempDataList[configData[j].Type] then tempDataList[configData[j].Type] = {} end