Update - 1.12.0.120
EN: 1.12.0.120 CN: 1.12.0.120 JP: 1.12.0.124 KR: 1.12.0.124
This commit is contained in:
@@ -199,9 +199,11 @@ function MallPackageDetailCtrl:OnBtnClick_Buy()
|
||||
if nCurrencyType == GameEnum.currencyType.Cash then
|
||||
PlayerData.Mall:BuyPackage(self.sId, mapCfg.StatisticalGroup)
|
||||
else
|
||||
local bShowConfirm = false
|
||||
if nCurrencyType == GameEnum.currencyType.Item then
|
||||
local nHas = 0
|
||||
if mapCfg.CurrencyItemId == AllEnum.CoinItemId.FREESTONE or mapCfg.CurrencyItemId == AllEnum.CoinItemId.STONE then
|
||||
bShowConfirm = true
|
||||
nHas = PlayerData.Coin:GetCoinCount(AllEnum.CoinItemId.FREESTONE) + PlayerData.Coin:GetCoinCount(AllEnum.CoinItemId.STONE)
|
||||
else
|
||||
nHas = PlayerData.Coin:GetCoinCount(mapCfg.CurrencyItemId)
|
||||
@@ -220,7 +222,19 @@ function MallPackageDetailCtrl:OnBtnClick_Buy()
|
||||
return
|
||||
end
|
||||
end
|
||||
PlayerData.Mall:SendMallPackageOrderReq(self.sId)
|
||||
if bShowConfirm then
|
||||
local msg = {
|
||||
nType = AllEnum.MessageBox.Confirm,
|
||||
sContent = orderedFormat(ConfigTable.GetUIText("Mall_Package_Buy_Confirm") or "", mapCfg.CurrencyItemQty, mapCfg.CurrencyItemId, mapCfg.DetailName),
|
||||
callbackConfirm = function()
|
||||
PlayerData.Mall:SendMallPackageOrderReq(self.sId)
|
||||
end,
|
||||
bBlur = false
|
||||
}
|
||||
EventManager.Hit(EventId.OpenMessageBox, msg)
|
||||
else
|
||||
PlayerData.Mall:SendMallPackageOrderReq(self.sId)
|
||||
end
|
||||
end
|
||||
end
|
||||
function MallPackageDetailCtrl:OnBtnClick_Disable()
|
||||
|
||||
@@ -248,10 +248,26 @@ function MallRecommendCtrl:SetTimer()
|
||||
end
|
||||
function MallRecommendCtrl:RefreshRecommend(tbList)
|
||||
self.tbRecommendConfig = {}
|
||||
local forEachMap = function(mapData)
|
||||
local tempMapBySort = {}
|
||||
local nCurTime = CS.ClientManager.Instance.serverTimeStamp
|
||||
ForEachTableLine(DataTable.MallRecommendGroup, function(mapData)
|
||||
if mapData.StartTime == "" or mapData.EndTime == "" then
|
||||
return
|
||||
end
|
||||
local nStartTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(mapData.StartTime)
|
||||
local nEndTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(mapData.EndTime)
|
||||
if nStartTime > nCurTime or nEndTime < nCurTime then
|
||||
return
|
||||
end
|
||||
local sortValue = mapData.Sort
|
||||
if tempMapBySort[sortValue] == nil or mapData.Id > tempMapBySort[sortValue].Id then
|
||||
tempMapBySort[sortValue] = mapData
|
||||
self:SetNextRefreshTime(nEndTime - nCurTime)
|
||||
end
|
||||
end)
|
||||
for _, mapData in pairs(tempMapBySort) do
|
||||
table.insert(self.tbRecommendConfig, mapData)
|
||||
end
|
||||
ForEachTableLine(DataTable.MallRecommendGroup, forEachMap)
|
||||
table.sort(self.tbRecommendConfig, function(a, b)
|
||||
return a.Sort < b.Sort
|
||||
end)
|
||||
|
||||
Reference in New Issue
Block a user