From 17ad018a43f4819dc3b31fa963838553a42adaf7 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Wed, 14 Jun 2023 16:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/pay_manager.lua | 3 +-- lua/app/common/sdk_manager.lua | 4 ++-- lua/app/proto/proto_msg_type.lua | 6 ++++++ lua/app/userdata/player/player_data.lua | 17 ++++++++++++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lua/app/common/pay_manager.lua b/lua/app/common/pay_manager.lua index 528c3f58..92715d64 100644 --- a/lua/app/common/pay_manager.lua +++ b/lua/app/common/pay_manager.lua @@ -152,7 +152,6 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, notSho local biPayGetInfo = {} table.foreach(msgData.gift, function(i, gift) - DataManager.PlayerData:addPayCount() local cfgName = PayManager.PURCHARSE_TYPE_CONFIG[gift.act_type] local cfgInfo = ConfigManager:getConfig(cfgName)[gift.id] local rechargeId = cfgInfo.recharge_id @@ -178,7 +177,7 @@ function PayManager:requestRewards(purchaseToken, orderId, originOrderId, notSho local data = {} data.pay_money = DataManager.PlayerData:getTotalPayAmount() data.pay_count = DataManager.PlayerData:getPayCount() - CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) + CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) -- 支付验证成功后消耗此订单 if purchaseToken then diff --git a/lua/app/common/sdk_manager.lua b/lua/app/common/sdk_manager.lua index 1273d723..0c4cfdba 100644 --- a/lua/app/common/sdk_manager.lua +++ b/lua/app/common/sdk_manager.lua @@ -248,7 +248,7 @@ function SDKManager:initAdsListener() DataManager.PlayerData:addAdCount() local data = {} data.ads_num = DataManager.PlayerData:getAdCount() - CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) + CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) end self:adRewradAd() self.adCallback() @@ -324,7 +324,7 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback) DataManager.PlayerData:addAdCount() local data = {} data.ads_num = DataManager.PlayerData:getAdCount() - CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserAdd(data) + CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) end self:adRewradAd() if adCallback then diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 5839563d..3627a3ec 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -57,6 +57,8 @@ local ProtoMsgType = { [1901321540] = "PipedReq", [2095612947] = "ChangeNameReq", [2095614780] = "ChangeNameRsp", + [2105154645] = "CDKeyUseReq", + [2105156478] = "CDKeyUseRsp", [2118851896] = "HeroUpgradeReq", [2118853729] = "HeroUpgradeRsp", [2285872137] = "ChapterBoxRewardReq", @@ -187,6 +189,8 @@ local ProtoMsgType = { PipedReq = 1901321540, ChangeNameReq = 2095612947, ChangeNameRsp = 2095614780, + CDKeyUseReq = 2105154645, + CDKeyUseRsp = 2105156478, HeroUpgradeReq = 2118851896, HeroUpgradeRsp = 2118853729, ChapterBoxRewardReq = 2285872137, @@ -317,6 +321,8 @@ local ProtoMsgType = { PipedReq = "PipedReq", ChangeNameReq = "ChangeNameReq", ChangeNameRsp = "ChangeNameRsp", + CDKeyUseReq = "CDKeyUseReq", + CDKeyUseRsp = "CDKeyUseRsp", HeroUpgradeReq = "HeroUpgradeReq", HeroUpgradeRsp = "HeroUpgradeRsp", ChapterBoxRewardReq = "ChapterBoxRewardReq", diff --git a/lua/app/userdata/player/player_data.lua b/lua/app/userdata/player/player_data.lua index 3aa2e7a9..f566afcf 100644 --- a/lua/app/userdata/player/player_data.lua +++ b/lua/app/userdata/player/player_data.lua @@ -1,4 +1,5 @@ local PlayerData = class("PlayerData", BaseData) +local RECHARGE_CFG = ConfigManager:getConfig("recharge") function PlayerData:ctor() self.data.dirty = false @@ -10,12 +11,21 @@ end function PlayerData:init(data) 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.exp = basicInfo.exp or 0 self.lvUpNeedExp = self:getNextExp(self.data.level) - self.data.payAmount = basicInfo.pay_amount or 0 - self.data.payCount = basicInfo.pay_count or 0 - self.data.adCount = basicInfo.ad_count or 0 + self.data.payAmount = 0 + self.data.payCount = 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 self.data.vitGemCount = energyLimit.diamond_count or 0 @@ -158,6 +168,7 @@ end function PlayerData:addPayment(rechargeId) local cfg = ConfigManager:getConfig("recharge")[rechargeId] self.data.payAmount = self.data.payAmount + cfg.price + self.data.payCount = self.data.payCount + 1 end function PlayerData:getPayCount()