From b78d3e667e006d9d25a5d9a652baf51926d2852b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 21:34:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=9C=A8=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=B7=AE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DailyRecharge/DailyRechargePanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index e32d6ed0df..f82c06bbe7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -96,9 +96,9 @@ function DailyRechargePanel:RefreshPanel() else self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.dollar:SetActive(true) - local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() - remainValue = remainValue < 0 and 0 or remainValue - self.desc.text = remainValue + -- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() + -- remainValue = remainValue < 0 and 0 or remainValue + self.desc.text = actRewardConfig.Values[1][1]--remainValue self.dealText.text = Language[10436] end end From a7fea145f63cddc2e7a1d70ad9aab75625d2f8b2 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 Aug 2020 21:40:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=91=A8?= =?UTF-8?q?=E6=9C=88=E7=A4=BC=E5=8C=85=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/OperatingManager.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 15def303f9..13d7d84879 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -101,7 +101,7 @@ end -- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动 function this.HasGoodsByShowType(showType) - local list = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType) + local list = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType) if not list then return false end for _, goods in ipairs(list) do if this.GetGiftGoodsInfo(goods.Type, goods.Id) then