From 3fed23cbe05f36c68fd9721e4db6128534e52abc Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 28 Jan 2021 09:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E9=99=90=E6=97=B6=E5=95=86=E5=B8=82=20=E5=A5=87?= =?UTF-8?q?=E7=8F=8D=E5=AE=9D=E9=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua | 4 ++-- .../~Lua/Modules/DynamicActivity/XianShiShangShi.lua | 3 ++- .../~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index 3cfaf2f016..292505f74a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -276,8 +276,8 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 [49] = 5, [50] = 6, [51] = 6, - [22] = 7, - [33] = 8, + [52] = 7, + [53] = 8, [54] = 15, } local curActivityCount = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 65ed521b33..fcbf82fadc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -114,15 +114,16 @@ function this.SingleDataShow(pre,value) --local goodData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, value.Id) local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, value.Id) or 0 local shows = shopItemData.RewardShow - buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then price.text = string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(shopItemData.Price))--shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) + buyInfo:GetComponent("Text").text =Language[10535].. shopItemData.Limit-boughtNum..Language[10054] else price.text = Language[10526] btnBuy:GetComponent("Button").enabled = false Util.SetGray(btnBuy, true) + buyInfo:GetComponent("Text").text = "" end --滚动条复用重设itemview if itemsGrid[pre] then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 9a6d954e4d..11a46f1eea 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -117,15 +117,16 @@ function this.SingleDataShow(pre,value) --local goodData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, value.Id) local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, value.Id) or 0 local shows = shopItemData.RewardShow - buyInfo:GetComponent("Text").text =Language[11454].. shopItemData.Limit-boughtNum.."/".. shopItemData.Limit..Language[10054] ..")" if shopItemData.Limit - boughtNum > 0 then price.text = string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(shopItemData.Price))--shopItemData.Price..MoneyUtil.GetMoneyUnitName() btnBuy:GetComponent("Button").enabled = true Util.SetGray(btnBuy, false) + buyInfo:GetComponent("Text").text =Language[10535].. shopItemData.Limit-boughtNum..Language[10054] else price.text = Language[10526] btnBuy:GetComponent("Button").enabled = false Util.SetGray(btnBuy, true) + buyInfo:GetComponent("Text").text = "" end --滚动条复用重设itemview if itemsGrid[pre] then