puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-06-14 16:19:10 +08:00
commit fa1f00dcb4
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/app/common/pay_manager.lua
View File

@ -167,7 +167,6 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, notSho
local biPayGetInfo = {} local biPayGetInfo = {}
table.foreach(msgData.gift, function(i, gift) table.foreach(msgData.gift, function(i, gift)
DataManager.PlayerData:addPayCount()
local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.act_type] local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.act_type]
local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id] local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id]
local rechargeId = cfgInfo.recharge_id local rechargeId = cfgInfo.recharge_id
@ -194,7 +193,7 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, notSho
local data = {} local data = {}
data.pay_money = DataManager.PlayerData:getTotalPayAmount() data.pay_money = DataManager.PlayerData:getTotalPayAmount()
data.pay_count = DataManager.PlayerData:getPayCount() data.pay_count = DataManager.PlayerData:getPayCount()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-- 支付验证成功后消耗此订单 -- 支付验证成功后消耗此订单
if purchaseToken then if purchaseToken then

4
lua/app/common/sdk_manager.lua
View File

@ -260,7 +260,7 @@ function SDKManager:initAdsListener()
DataManager.PlayerData:addAdCount() DataManager.PlayerData:addAdCount()
local data = {} local data = {}
data.ads_num = DataManager.PlayerData:getAdCount() data.ads_num = DataManager.PlayerData:getAdCount()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end end
self:adRewradAd() self:adRewradAd()
self.adCallback() self.adCallback()
@ -336,7 +336,7 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
DataManager.PlayerData:addAdCount() DataManager.PlayerData:addAdCount()
local data = {} local data = {}
data.ads_num = DataManager.PlayerData:getAdCount() data.ads_num = DataManager.PlayerData:getAdCount()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end end
self:adRewradAd() self:adRewradAd()
if adCallback then if adCallback then

17
lua/app/userdata/player/player_data.lua
View File

@ -1,4 +1,5 @@
local PlayerData = class("PlayerData", BaseData) local PlayerData = class("PlayerData", BaseData)
local RECHARGE_CFG = ConfigManager:getConfig("recharge")
function PlayerData:ctor() function PlayerData:ctor()
self.data.dirty = false self.data.dirty = false
@ -10,12 +11,21 @@ end
function PlayerData:init(data) function PlayerData:init(data)
local basicInfo = data.basic_info or GConst.EMPTY_TABLE local basicInfo = data.basic_info or GConst.EMPTY_TABLE
local stat = data.stat or GConst.EMPTY_TABLE
self.data.level = basicInfo.level or 1 self.data.level = basicInfo.level or 1
self.data.exp = basicInfo.exp or 0 self.data.exp = basicInfo.exp or 0
self.lvUpNeedExp = self:getNextExp(self.data.level) self.lvUpNeedExp = self:getNextExp(self.data.level)
self.data.payAmount = basicInfo.pay_amount or 0 self.data.payAmount = 0
self.data.payCount = basicInfo.pay_count or 0 self.data.payCount = 0
self.data.adCount = basicInfo.ad_count or 0 self.data.adCount = stat.ad_count or 0
if stat.pay_counts then
for id, count in pairs(stat.pay_counts) do
if RECHARGE_CFG[id] then
self.data.payAmount = self.data.payAmount + (RECHARGE_CFG[id].price or 0)
self.data.payCount = self.data.payCount + count
end
end
end
local energyLimit = data.energy_limit or GConst.EMPTY_TABLE local energyLimit = data.energy_limit or GConst.EMPTY_TABLE
self.data.vitGemCount = energyLimit.diamond_count or 0 self.data.vitGemCount = energyLimit.diamond_count or 0
@ -158,6 +168,7 @@ end
function PlayerData:addPayment(rechargeId) function PlayerData:addPayment(rechargeId)
local cfg = ConfigManager:getConfig("recharge")[rechargeId] local cfg = ConfigManager:getConfig("recharge")[rechargeId]
self.data.payAmount = self.data.payAmount + cfg.price self.data.payAmount = self.data.payAmount + cfg.price
self.data.payCount = self.data.payCount + 1
end end
function PlayerData:getPayCount() function PlayerData:getPayCount()