This commit is contained in:
puxuan 2025-10-20 15:28:40 +08:00
parent 812233e7d0
commit 372da3ab0d
9 changed files with 311 additions and 306 deletions

View File

@ -135,6 +135,7 @@ ModuleManager.MODULE_KEY = {
CARD_AD = "card_ad", CARD_AD = "card_ad",
DUNGEON_GOLD = "dungeon_gold", -- 金币副本 DUNGEON_GOLD = "dungeon_gold", -- 金币副本
DUNGEON_RES = "dungeon_res", -- 材料副本 DUNGEON_RES = "dungeon_res", -- 材料副本
AD_CARD = "card_ad",
} }
local _moduleMgrs = {} local _moduleMgrs = {}

View File

@ -923,10 +923,9 @@ local LocalizationGlobalConst =
ADS_DESC_10 = "ADS_DESC_10", ADS_DESC_10 = "ADS_DESC_10",
ADS_DESC_11 = "ADS_DESC_11", ADS_DESC_11 = "ADS_DESC_11",
ADS_DESC_12 = "ADS_DESC_12", ADS_DESC_12 = "ADS_DESC_12",
ADS_DESC_13 = "ADS_DESC_13",
ADS_DESC_14 = "ADS_DESC_14", ADS_DESC_14 = "ADS_DESC_14",
ADS_DESC_15 = "ADS_DESC_15", IDLE_DESC_8 = "IDLE_DESC_8",
ADS_DESC_16 = "ADS_DESC_16", IDLE_DESC_9 = "IDLE_DESC_9",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

View File

@ -923,10 +923,9 @@ local localization_global =
["ADS_DESC_10"] = "放弃复活", ["ADS_DESC_10"] = "放弃复活",
["ADS_DESC_11"] = "刷新齿轮", ["ADS_DESC_11"] = "刷新齿轮",
["ADS_DESC_12"] = "是否观看广告,免费刷新齿轮?", ["ADS_DESC_12"] = "是否观看广告,免费刷新齿轮?",
["ADS_DESC_13"] = "是否观看广告?",
["ADS_DESC_14"] = "双倍奖励", ["ADS_DESC_14"] = "双倍奖励",
["ADS_DESC_15"] = "免广告卡", ["IDLE_DESC_8"] = "月卡特权",
["ADS_DESC_16"] = "免广告永久有效", ["IDLE_DESC_9"] = "激活月卡后每日快速挂机次数无上限",
} }
return localization_global return localization_global

View File

@ -1357,7 +1357,7 @@ function GFunc.setAdsSprite(img, isGrey)
if not img then if not img then
return return
end end
local skip = false -- DataManager.MallActData:skipAd() local skip = DataManager.PrivilegeCardData:getIsSkipAd()
local icon = nil local icon = nil
if isGrey then if isGrey then
icon = skip and "common_ad_6" or "common_ad_5" icon = skip and "common_ad_6" or "common_ad_5"
@ -1368,7 +1368,7 @@ function GFunc.setAdsSprite(img, isGrey)
end end
function GFunc.getAdSprite() function GFunc.getAdSprite()
local skip = false --DataManager.MallActData:skipAd() local skip = DataManager.PrivilegeCardData:getIsSkipAd()
return skip and "common_ad_4" or "common_ad_3" return skip and "common_ad_4" or "common_ad_3"
end end
@ -1431,7 +1431,7 @@ function GFunc.expandImgToFitTx(imgObj, txObj, spacing)
end end
function GFunc.formatAdImg(adImg) function GFunc.formatAdImg(adImg)
if DataManager.MonthlyData:skipAd() then if DataManager.PrivilegeCardData:getIsSkipAd() then
adImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_ad_1") adImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_ad_1")
else else
adImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_ad") adImg:setSprite(GConst.ATLAS_PATH.COMMON, "common_ad")

View File

@ -383,6 +383,7 @@ local BUFF_NAME = {
BLUE_REFRESH_WEIGHT = "blue_refresh_weight", BLUE_REFRESH_WEIGHT = "blue_refresh_weight",
PURPLE_REFRESH_WEIGHT = "purple_refresh_weight", PURPLE_REFRESH_WEIGHT = "purple_refresh_weight",
ATTR_MONSTER_DMG_ADD = "attr_monster_dmg_add", ATTR_MONSTER_DMG_ADD = "attr_monster_dmg_add",
ATTR_BOSS_DMG_ADD = "attr_boss_dmg_add",
HPP_RED_ADD = "hpp_red_add", HPP_RED_ADD = "hpp_red_add",
HPP_YELLOW_ADD = "hpp_yellow_add", HPP_YELLOW_ADD = "hpp_yellow_add",
HPP_GREEN_ADD = "hpp_green_add", HPP_GREEN_ADD = "hpp_green_add",

View File

@ -37,13 +37,13 @@ function PrivilegeCardManager:buyMonthlyCard()
end end
function PrivilegeCardManager:buyChallengeCard() function PrivilegeCardManager:buyChallengeCard()
local canBuyCard = DataManager.PrivilegeCardData:checkCanBuyChallengeCard() -- local canBuyCard = DataManager.PrivilegeCardData:checkCanBuyChallengeCard()
if canBuyCard then -- if canBuyCard then
local giftId = GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD -- local giftId = GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD
PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT, true) -- PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT, true)
else -- else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_17)) -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_17))
end -- end
end end
function PrivilegeCardManager:buyAdCard() function PrivilegeCardManager:buyAdCard()
@ -57,21 +57,21 @@ function PrivilegeCardManager:buyAdCard()
end end
function PrivilegeCardManager:buyLifetimeCard() function PrivilegeCardManager:buyLifetimeCard()
local canBuyCard = DataManager.PrivilegeCardData:checkCanBuyLifetimeCard() -- local canBuyCard = DataManager.PrivilegeCardData:checkCanBuyLifetimeCard()
if canBuyCard then -- if canBuyCard then
local giftId = GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD -- local giftId = GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD
PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT, true) -- PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT, true)
else -- else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_17)) -- GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.MONTHLY_CARD_17))
end -- end
end end
function PrivilegeCardManager:getPurchaseCardDailyReward(id) function PrivilegeCardManager:getPurchaseCardDailyReward(id)
local itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_ALL_CARD_DAILY_REWARD local itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_ALL_CARD_DAILY_REWARD
if id == GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD then if id == GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD then
itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_MONTHLY_CARD_DAILY_REWARD itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_MONTHLY_CARD_DAILY_REWARD
elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then -- elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then
itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_LIFETIME_CARD_DAILY_REWARD -- itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_LIFETIME_CARD_DAILY_REWARD
elseif id == 0 then elseif id == 0 then
itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_ALL_CARD_DAILY_REWARD itemGetType = BIReport.ITEM_GET_TYPE.PRIVILEGE_ALL_CARD_DAILY_REWARD
else else

View File

@ -81,16 +81,18 @@ function IdleDropUI:onLoadRootComplete()
self.adTimesTx = uiMap["idle_drop_ui.bg.ad_times_tx"] self.adTimesTx = uiMap["idle_drop_ui.bg.ad_times_tx"]
self.quickTimesTx = uiMap["idle_drop_ui.bg.quick_times_tx"] self.quickTimesTx = uiMap["idle_drop_ui.bg.quick_times_tx"]
self.adBtn:addClickListener(function() self.adBtn:addClickListener(function()
SDKManager:showFullScreenAds(BIReport.ADS_CLICK_TYPE.IDLE_QUICK_DROP, function()
ModuleManager.IdleManager:getIdleQuickRewrad(true) ModuleManager.IdleManager:getIdleQuickRewrad(true)
end) end)
end)
self.privilegeBtn = uiMap["idle_drop_ui.bg.privilege_btn"] self.privilegeBtn = uiMap["idle_drop_ui.bg.privilege_btn"]
self.privilegeBtn:addClickListener(function() self.privilegeBtn:addClickListener(function()
ModuleManager.PrivilegeCardManager:showPrivilegeUI() ModuleManager.PrivilegeCardManager:showPrivilegeUI()
end) end)
uiMap["idle_drop_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC)) uiMap["idle_drop_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_CLOSE_DESC))
uiMap["idle_drop_ui.bg.bg1.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3)) uiMap["idle_drop_ui.bg.bg1.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DESC_8))
uiMap["idle_drop_ui.bg.bg1.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DROP_DESC_3)) uiMap["idle_drop_ui.bg.bg1.desc_tx_1"]:setText(I18N:getGlobalText(I18N.GlobalConst.IDLE_DESC_9))
self.fightRoot = self.uiMap["idle_drop_ui.bg.fight_root"] self.fightRoot = self.uiMap["idle_drop_ui.bg.fight_root"]
@ -212,6 +214,8 @@ end
function IdleDropUI:onRefresh() function IdleDropUI:onRefresh()
self:refreshRewards() self:refreshRewards()
self:refreshBtns() self:refreshBtns()
GFunc.setAdsSprite(self.adBtnImg)
end end
function IdleDropUI:refreshRewards() function IdleDropUI:refreshRewards()

View File

@ -94,11 +94,11 @@ function MonthlyCardComp:refresh()
end end
if rewards and rewards[1] then if rewards and rewards[1] then
local num = count*rewards[1].num local num = count*rewards[1].num
self.rewadCell1:showRewardNum(GFunc.num2Str(num)) self.rewadCell1:setNumTx(GFunc.num2Str(num))
end end
if rewards and rewards[2] then if rewards and rewards[2] then
local num = count*rewards[2].num local num = count*rewards[2].num
self.rewadCell12:showRewardNum(GFunc.num2Str(num)) self.rewadCell12:setNumTx(GFunc.num2Str(num))
end end
self.rewadCell1:showFrameAnimation() self.rewadCell1:showFrameAnimation()
self.rewadCell1:addClickListener(function() self.rewadCell1:addClickListener(function()
@ -126,12 +126,12 @@ function MonthlyCardComp:refresh()
if rewards and rewards[1] then if rewards and rewards[1] then
local num = count*rewards[1].num local num = count*rewards[1].num
self.rewadCell1:refreshByConfig(rewards[1], false, false) self.rewadCell1:refreshByConfig(rewards[1], false, false)
self.rewadCell1:showRewardNum(GFunc.num2Str(num)) self.rewadCell1:setNumTx(GFunc.num2Str(num))
end end
if rewards and rewards[2] then if rewards and rewards[2] then
local num = count*rewards[2].num local num = count*rewards[2].num
self.rewadCell12:refreshByConfig(rewards[2], false, false) self.rewadCell12:refreshByConfig(rewards[2], false, false)
self.rewadCell12:showRewardNum(GFunc.num2Str(num)) self.rewadCell12:setNumTx(GFunc.num2Str(num))
end end
self.rewadCell1:showFrameAnimation() self.rewadCell1:showFrameAnimation()
self.rewadCell1:addClickListener(function() self.rewadCell1:addClickListener(function()

View File

@ -25,9 +25,9 @@ function PrivilegeCardData:init(data)
if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD) then if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD) then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = (self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward or 0) + 1 self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = (self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward or 0) + 1
end end
if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) then -- if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = (self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0) + 1 -- self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = (self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0) + 1
end -- end
self:setDirty() self:setDirty()
end) end)
end end
@ -49,14 +49,14 @@ function PrivilegeCardData:getIsOpen(cardId)
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD_CARD, true) then if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.AD_CARD, true) then
return false return false
end end
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.LIFETIME_CARD, true) then -- if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.LIFETIME_CARD, true) then
return false -- return false
end -- end
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then
if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.CHALLEGE_CARD, true) then -- if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.CHALLEGE_CARD, true) then
return false -- return false
end -- end
end end
else else
local isOpen = false local isOpen = false
@ -81,17 +81,17 @@ function PrivilegeCardData:onClaimedPurchaseCardDailyReward(id)
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD] then if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD] then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = 0 self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = 0
end end
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then -- if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = 0 -- self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = 0
end -- end
elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD then elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD then
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD] then if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD] then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = 0 self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.MONTHLY_CARD].reward = 0
end end
elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then -- elseif id == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then -- if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then
self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = 0 -- self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward = 0
end -- end
end end
self:setDirty() self:setDirty()
end end
@ -109,14 +109,14 @@ function PrivilegeCardData:checkCanBuyMonthlyCard()
end end
function PrivilegeCardData:getIsChallengeCardOpen() function PrivilegeCardData:getIsChallengeCardOpen()
return self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD) -- return self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD)
end end
function PrivilegeCardData:checkCanBuyChallengeCard() function PrivilegeCardData:checkCanBuyChallengeCard()
if self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD) then -- if self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD) then
local remainTime = self:getCardRemainTime(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD) -- local remainTime = self:getCardRemainTime(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD)
return remainTime <= 0 -- return remainTime <= 0
end -- end
return false return false
end end
@ -144,41 +144,42 @@ function PrivilegeCardData:checkCanBuyAdCard()
end end
function PrivilegeCardData:getIsLifetimeCardOpen() function PrivilegeCardData:getIsLifetimeCardOpen()
return self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) -- return self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD)
end end
function PrivilegeCardData:checkCanBuyLifetimeCard() function PrivilegeCardData:checkCanBuyLifetimeCard()
if self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) then -- if self:getIsOpen(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) then
local data = self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] -- local data = self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD]
if data == nil then -- if data == nil then
return true -- return true
end -- end
if data.expire_at == nil then -- if data.expire_at == nil then
return true -- return true
end -- end
if data.expire_at >= 0 then -- if data.expire_at >= 0 then
local remainTime = Time:getDayBeginTimeStamp(data.expire_at) - Time:getServerTime() -- local remainTime = Time:getDayBeginTimeStamp(data.expire_at) - Time:getServerTime()
if remainTime <= 0 then -- if remainTime <= 0 then
return true -- return true
end -- end
end -- end
end -- end
return false return false
end end
function PrivilegeCardData:getIsLifetimeCardActive() function PrivilegeCardData:getIsLifetimeCardActive()
return self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD) -- return self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD)
end end
function PrivilegeCardData:getIsSkipAd() function PrivilegeCardData:getIsSkipAd()
if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.AD_CARD) then
return true return true
end -- if self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.AD_CARD) then
return false -- return true
-- end
-- return false
end end
function PrivilegeCardData:getIsChallegeCardActive() function PrivilegeCardData:getIsChallegeCardActive()
return self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD) -- return self:getIsCardActive(GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD)
end end
function PrivilegeCardData:getIsMonthlyCardActive() function PrivilegeCardData:getIsMonthlyCardActive()
@ -194,14 +195,14 @@ function PrivilegeCardData:getIsCardActive(cardId)
if data and data.expire_at < 0 then if data and data.expire_at < 0 then
return true return true
end end
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then
local data = self.cardData[cardId] -- local data = self.cardData[cardId]
if data and data.expire_at < 0 then -- if data and data.expire_at < 0 then
return true -- return true
end -- end
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then
local remainTime = self:getCardRemainTime(cardId) -- local remainTime = self:getCardRemainTime(cardId)
return remainTime > 0 -- return remainTime > 0
end end
return false return false
end end
@ -249,29 +250,29 @@ function PrivilegeCardData:onGiftBuySuccess(cardId)
UIManager:refreshAllAdImg() UIManager:refreshAllAdImg()
-- 局内事件 -- 局内事件
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.NO_AD_ACTIVE) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.NO_AD_ACTIVE)
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD then
if not self:getIsCardActive(cardId) then -- if not self:getIsCardActive(cardId) then
self.cardData[cardId] = self.cardData[cardId] or {} -- self.cardData[cardId] = self.cardData[cardId] or {}
self.cardData[cardId].expire_at = -1 -- self.cardData[cardId].expire_at = -1
local rewardCount = self.cardData[cardId].reward or 0 -- local rewardCount = self.cardData[cardId].reward or 0
if rewardCount <= 0 then -- if rewardCount <= 0 then
rewardCount = 1 -- rewardCount = 1
else -- else
rewardCount = rewardCount + 1 -- rewardCount = rewardCount + 1
end -- end
self.cardData[cardId].reward = rewardCount -- self.cardData[cardId].reward = rewardCount
end -- end
elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then -- elseif cardId == GConst.ShopConst.PRIVILEGE_CARD_ID.CHALLEGE_CARD then
if self:getIsCardActive(cardId) then -- if self:getIsCardActive(cardId) then
self.cardData[cardId].expire_at = self.cardData[cardId].expire_at + self:getMonthlyCardOneTurnDays() * 86400 -- self.cardData[cardId].expire_at = self.cardData[cardId].expire_at + self:getMonthlyCardOneTurnDays() * 86400
else -- else
self.cardData[cardId] = self.cardData[cardId] or {} -- self.cardData[cardId] = self.cardData[cardId] or {}
self.cardData[cardId].expire_at = Time:getServerTime() + self:getMonthlyCardOneTurnDays() * 86400 -- self.cardData[cardId].expire_at = Time:getServerTime() + self:getMonthlyCardOneTurnDays() * 86400
end -- end
-- 购买成功添加体力 -- -- 购买成功添加体力
local recoveryCfg = ConfigManager:getConfig("recovery")[GConst.ItemConst.ITEM_ID_VIT] -- local recoveryCfg = ConfigManager:getConfig("recovery")[GConst.ItemConst.ITEM_ID_VIT]
local addVit = recoveryCfg and recoveryCfg.monthly_card or 0 -- local addVit = recoveryCfg and recoveryCfg.monthly_card or 0
DataManager.BagData.ItemData:addItemReward({type = GConst.REWARD_TYPE.ITEM, id = GConst.ItemConst.ITEM_ID_VIT, num = addVit}, BIReport.ITEM_GET_TYPE.PRIVILEGE_CHALLENGE_CARD) -- DataManager.BagData.ItemData:addItemReward({type = GConst.REWARD_TYPE.ITEM, id = GConst.ItemConst.ITEM_ID_VIT, num = addVit}, BIReport.ITEM_GET_TYPE.PRIVILEGE_CHALLENGE_CARD)
end end
self:setDirty() self:setDirty()
@ -328,17 +329,17 @@ end
-- 终身卡 -- 终身卡
function PrivilegeCardData:getIsClaimedLifetimeCardDailyReward() function PrivilegeCardData:getIsClaimedLifetimeCardDailyReward()
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then -- if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then
local count = self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0 -- local count = self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0
return count <= 0 -- return count <= 0
end -- end
return false return false
end end
function PrivilegeCardData:getUnclaimedLifetimeCardDailyRewardCount() function PrivilegeCardData:getUnclaimedLifetimeCardDailyRewardCount()
if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then -- if self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD] then
return self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0 -- return self.cardData[GConst.ShopConst.PRIVILEGE_CARD_ID.LIFETIME_CARD].reward or 0
end -- end
return 0 return 0
end end