From a9389ec42773e2c82ac781f1cdd769e2658c8c2e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 22 Sep 2020 18:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=B4=B9=E7=A4=BC=E5=8C=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua | 5 ++++- .../~Lua/Modules/Operating/WeekMonthGiftPackPage.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua index 58495f9551..4f76a0dce8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/MoneyUtil.lua @@ -15,7 +15,10 @@ function this.Initialize() end -- 获取相应的金额 -function this.GetMoney(rmbp) +function this.GetMoney(rmbp) + if rmbp <= 0 then + return rmbp + end if not this.RMB2O[rmbp] then LogError("表 ExchangeRate 错误: 不包含档位:"..tostring(rmbp)) return 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua index cd94ff9a64..6cc64ce0c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/WeekMonthGiftPackPage.lua @@ -80,7 +80,7 @@ function WeekMonthGiftPackPage:RefreshGiftData() --#OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift == 27 table.sort(shopData,function(a,b) if a.sortId == b.sortId then - return a.data.goodsId < b.data.goodsId + return rechargeCommodityConfig[a.data.goodsId].Price < rechargeCommodityConfig[b.data.goodsId].Price else return a.sortId > b.sortId end diff --git a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua index 9a02c01a60..03e7eba783 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pay/PayManager.lua @@ -42,7 +42,8 @@ function this.Pay(id, func) this.EventTrigger[id] = func LogError("发起购买商品的请求,商品id = "..id) --直购商品 - if AppConst.isSDKLogin then + local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, id) + if AppConst.isSDKLogin and rechargeConfig.Price > 0 then PayManager.SdkPay({ Id = id }) else NetManager.RequestBuyGiftGoods(id, function(msg)