From 453de72c0bee2db268645b1c64d6663f53860f5d Mon Sep 17 00:00:00 2001 From: vurtne14 Date: Sat, 8 Aug 2026 09:45:40 +0800 Subject: [PATCH] 1 --- .../~Lua/Modules/DynamicActivity/ActivityMainPanel.lua | 2 +- .../~Lua/Modules/Recharge/View/EveryDayGiftNew.lua | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 12547e4cc6..b5ceec7478 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -127,7 +127,7 @@ function ActivityMainPanel:OnOpen(_activityType, _index, change) self:CheckActOpen(_index) end for index = 1, #tabs do - if _CurPageIndex < 1 then + if _CurPageIndex < 1 then self:CheckActOpen(tabs[index].Sort) else break diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 139211073a..90cfb4b899 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -500,12 +500,14 @@ function EveryDayGiftNew:RefreshOneKeyShow() -- 计算总价 local ori = 0 for i = 1, #self.shopData do - ori = ori + self.shopData[i].data.finalNum + ori = ori + self.shopData[i].data.finalNum*self.shopData[i].data.limitNum end -- 计算现价 local now = 0 LogError("onKeyPackId===================" .. onKeyPackId) - now = now + MoneyUtil.GetMoney(ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, onKeyPackId).Price) + local recharge = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, onKeyPackId) + + now = now + MoneyUtil.GetMoney(recharge.Price) if ori == now then self.extarOneKeyprice2.text = Language[10700] .. string.format(MoneyUtil.GetMoneyUnitName(), ori) self.extarOneKeyprice1.text = Language[10830] .. string.format(MoneyUtil.GetMoneyUnitName(), now)