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

日志上报

Browse Source
This commit is contained in:
xiekaidong 2023-08-03 14:20:16 +08:00
parent 66838d4dad
commit a47f18db07
25 changed files with 77 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lua/app/common/bi_report.lua
View File

@ -250,6 +250,13 @@ BIReport.ARENA_OPT_TYPE = {
SETTLEMENT = "Settlement", SETTLEMENT = "Settlement",
} }
BIReport.PAY_UI_SHOW_TYPE = {
LOGIN_POP = "LoginPop",
TRIGGER_POP = "TriggerPop",
CLICK_SHOW = "ClickShow",
SHOP_SHOW = "ShopShow",
}
-- b6 -- b6
local EVENT_NAME_EXIT = "client_exit" local EVENT_NAME_EXIT = "client_exit"
local EVENT_NAME_FIGHT = "client_fight" local EVENT_NAME_FIGHT = "client_fight"
@ -1391,10 +1398,11 @@ end
-- 内购相关界面展示,包括弹出/主动打开(如果是打开商城页签,钻石礼包只上报id2,章节礼包只上报首个可购买章节id) -- 内购相关界面展示,包括弹出/主动打开(如果是打开商城页签,钻石礼包只上报id2,章节礼包只上报首个可购买章节id)
-- giftType为BIReport.GIFT_TYPE -- giftType为BIReport.GIFT_TYPE
function BIReport:postPayUIShow(giftType, giftId) function BIReport:postPayUIShow(giftType, giftId, showType)
local args = { local args = {
gift_type = giftType, gift_type = giftType,
gift_id = giftId, gift_id = giftId,
show_type = showType
} }
self:report(EVENT_NAME_PAY_UI_SHOW, args) self:report(EVENT_NAME_PAY_UI_SHOW, args)
end end

4
lua/app/module/activity/activity_manager.lua
View File

@ -1,7 +1,7 @@
local ActivityManager = class("ActivityManager", BaseModule) local ActivityManager = class("ActivityManager", BaseModule)
function ActivityManager:showGoldPigUI() function ActivityManager:showGoldPigUI(showType)
UIManager:showUI("app/ui/activity/gold_pig/gold_pig_ui") UIManager:showUI("app/ui/activity/gold_pig/gold_pig_ui", {showType = showType})
end end
function ActivityManager:buyGoldPig(id) function ActivityManager:buyGoldPig(id)

4
lua/app/module/arena/arena_manager.lua
View File

@ -225,8 +225,8 @@ function ArenaManager:rspAdBoxReward(result)
end end
end end
function ArenaManager:showGiftPopUI() function ArenaManager:showGiftPopUI(showType)
UIManager:showUI("app/ui/arena/arena_pop_gift_ui") UIManager:showUI("app/ui/arena/arena_pop_gift_ui", {showType = showType})
end end
return ArenaManager return ArenaManager

18
lua/app/module/shop/shop_manager.lua
View File

@ -32,40 +32,40 @@ function ShopManager:showBoxLevelUpUI(params)
end end
-- 触发弹窗礼包 -- 触发弹窗礼包
function ShopManager:triggerGiftPopUI(actType, actId) function ShopManager:triggerGiftPopUI(actType, actId, showType)
-- 入门礼包不在通用触发条件内 -- 入门礼包不在通用触发条件内
if (actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID) then if (actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID) then
self:showGiftPopUI(actType, actId, false) self:showGiftPopUI(actType, actId, false, showType)
DataManager.ShopData:removePopUpGift(actType, actId) DataManager.ShopData:removePopUpGift(actType, actId)
else else
if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then
self:showGiftPopUI(actType, actId, false) self:showGiftPopUI(actType, actId, false, showType)
DataManager.ShopData:removePopUpGift(actType, actId) DataManager.ShopData:removePopUpGift(actType, actId)
end end
end end
end end
function ShopManager:showGiftPopUI(actType, actId, onlySelf) function ShopManager:showGiftPopUI(actType, actId, onlySelf, showType)
if GFunc.isShenhe() then if GFunc.isShenhe() then
return return
end end
if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then
UIManager:showUI("app/ui/shop/first_recharge_pop_ui") UIManager:showUI("app/ui/shop/first_recharge_pop_ui", {showType = showType})
elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then
UIManager:showUI("app/ui/shop/introduct_pop_ui") UIManager:showUI("app/ui/shop/introduct_pop_ui", {showType = showType})
else else
UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf}) UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType})
end end
end end
-- 触发金币弹窗礼包 -- 触发金币弹窗礼包
function ShopManager:triggerCoinGiftPopUI(actId) function ShopManager:triggerCoinGiftPopUI(actId)
self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId) self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId, BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP)
end end
-- 触发成长礼包 -- 触发成长礼包
function ShopManager:triggerGrowUpGiftPopUI(actId) function ShopManager:triggerGrowUpGiftPopUI(actId)
self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, actId) self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, actId, BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP)
end end
-- 购买每日特惠商品 -- 购买每日特惠商品

5
lua/app/ui/activity/gold_pig/gold_pig_ui.lua
View File

@ -8,8 +8,9 @@ function GoldPigUI:getPrefabPath()
return "assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab" return "assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab"
end end
function GoldPigUI:ctor() function GoldPigUI:ctor(params)
self.goldPigId = DataManager.GoldPigData:getId() self.goldPigId = DataManager.GoldPigData:getId()
self.showType = params.showType
end end
function GoldPigUI:onLoadRootComplete() function GoldPigUI:onLoadRootComplete()
@ -55,7 +56,7 @@ function GoldPigUI:onLoadRootComplete()
end end
end) end)
BIReport:postPayUIShow(BIReport.GIFT_TYPE.GOLD_PIG) BIReport:postPayUIShow(BIReport.GIFT_TYPE.GOLD_PIG, self.goldPigId, self.showType)
self.timeTx = uiMap["gold_pig_ui.bg.time_bg.time_tx"] self.timeTx = uiMap["gold_pig_ui.bg.time_bg.time_tx"]
local isFull = DataManager.GoldPigData:getIsFull() local isFull = DataManager.GoldPigData:getIsFull()

3
lua/app/ui/arena/arena_pop_gift_ui.lua
View File

@ -14,6 +14,7 @@ function GiftPopUI:ctor(params)
self.actType = PayManager.PURCHARSE_TYPE.ACT_GIFT self.actType = PayManager.PURCHARSE_TYPE.ACT_GIFT
self.actId = DataManager.ArenaData:getGiftId() self.actId = DataManager.ArenaData:getGiftId()
self.showType = params.showType
DataManager.ArenaData:cleaShowPopGift() DataManager.ArenaData:cleaShowPopGift()
end end
@ -103,7 +104,7 @@ function GiftPopUI:refresh()
-- 上报 -- 上报
local giftType = PayManager:getGiftType(self.actType, self.actId) local giftType = PayManager:getGiftType(self.actType, self.actId)
BIReport:postPayUIShow(giftType, self.actId) BIReport:postPayUIShow(giftType, self.actId, self.showType)
self:updateTime() self:updateTime()
end end

2
lua/app/ui/arena/bounty_main_ui.lua
View File

@ -63,7 +63,7 @@ function BountyMainUI:onLoadRootComplete()
end, 1) end, 1)
self:updateTime() self:updateTime()
BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_BOUNTY) BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_BOUNTY, nil, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function BountyMainUI:initTitle() function BountyMainUI:initTitle()

2
lua/app/ui/bounty/bounty_main_ui.lua
View File

@ -63,7 +63,7 @@ function BountyMainUI:onLoadRootComplete()
end, 1) end, 1)
self:updateTime() self:updateTime()
BIReport:postPayUIShow(BIReport.GIFT_TYPE.BOUNTY) BIReport:postPayUIShow(BIReport.GIFT_TYPE.BOUNTY, nil, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function BountyMainUI:initTitle() function BountyMainUI:initTitle()

2
lua/app/ui/fund/growth_fund_ui.lua
View File

@ -69,7 +69,7 @@ function GrowthFundUI:onLoadRootComplete()
self:initPayBtns() self:initPayBtns()
self:initRewards() self:initRewards()
self:bindData() self:bindData()
BIReport:postPayUIShow(BIReport.GIFT_TYPE.GROWTH_FUND) BIReport:postPayUIShow(BIReport.GIFT_TYPE.GROWTH_FUND, nil, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function GrowthFundUI:initTitle() function GrowthFundUI:initTitle()

2
lua/app/ui/main_city/cell/side_bar_arena_gift_cell.lua
View File

@ -18,7 +18,7 @@ function SideBarArenaGiftCell:getSpineName()
end end
function SideBarArenaGiftCell:onClick() function SideBarArenaGiftCell:onClick()
ModuleManager.ArenaManager:showGiftPopUI() ModuleManager.ArenaManager:showGiftPopUI(BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function SideBarArenaGiftCell:getIsShowRedPoint() function SideBarArenaGiftCell:getIsShowRedPoint()

2
lua/app/ui/main_city/cell/side_bar_armor_gift_cell.lua
View File

@ -13,7 +13,7 @@ end
function SideBarArmorGiftCell:onClick() function SideBarArmorGiftCell:onClick()
local gift = DataManager.ShopData:getGift(GIFT_TYPE) local gift = DataManager.ShopData:getGift(GIFT_TYPE)
if gift then if gift then
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
end end

2
lua/app/ui/main_city/cell/side_bar_beginner_gift_cell.lua
View File

@ -14,7 +14,7 @@ function SideBarBeginnerGiftCell:getSpineName()
end end
function SideBarBeginnerGiftCell:onClick() function SideBarBeginnerGiftCell:onClick()
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function SideBarBeginnerGiftCell:getIsShowRedPoint() function SideBarBeginnerGiftCell:getIsShowRedPoint()

2
lua/app/ui/main_city/cell/side_bar_first_recharge_cell.lua
View File

@ -18,7 +18,7 @@ function SideBarFirstRechargeCell:getIsShowRedPoint()
end end
function SideBarFirstRechargeCell:onClick() function SideBarFirstRechargeCell:onClick()
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.FIRST_RECHARGE_ID, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
return SideBarFirstRechargeCell return SideBarFirstRechargeCell

2
lua/app/ui/main_city/cell/side_bar_gold_pig_cell.lua
View File

@ -14,7 +14,7 @@ function SideBarGoldPigCell:getSpineName()
end end
function SideBarGoldPigCell:onClick() function SideBarGoldPigCell:onClick()
ModuleManager.ActivityManager:showGoldPigUI() ModuleManager.ActivityManager:showGoldPigUI(BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function SideBarGoldPigCell:onRefresh() function SideBarGoldPigCell:onRefresh()

2
lua/app/ui/main_city/cell/side_bar_grow_up_gift_cell.lua
View File

@ -12,7 +12,7 @@ end
function SideBarGrowUpGiftCell:onClick() function SideBarGrowUpGiftCell:onClick()
local gift = DataManager.ShopData:getGrowUpGift() local gift = DataManager.ShopData:getGrowUpGift()
if gift then if gift then
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, gift.current_grow_up_id, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, gift.current_grow_up_id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
end end

2
lua/app/ui/main_city/cell/side_bar_introduct_gift_cell.lua
View File

@ -14,7 +14,7 @@ function SideBarIntroductGiftCell:getSpineName()
end end
function SideBarIntroductGiftCell:onClick() function SideBarIntroductGiftCell:onClick()
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.INTRODUCT_GIFT_ID, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, GConst.ShopConst.INTRODUCT_GIFT_ID, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function SideBarIntroductGiftCell:getIsShowRedPoint() function SideBarIntroductGiftCell:getIsShowRedPoint()

2
lua/app/ui/main_city/cell/side_bar_weapon_gift_cell.lua
View File

@ -13,7 +13,7 @@ end
function SideBarWeaponGiftCell:onClick() function SideBarWeaponGiftCell:onClick()
local gift = DataManager.ShopData:getGift(GIFT_TYPE) local gift = DataManager.ShopData:getGift(GIFT_TYPE)
if gift then if gift then
ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true) ModuleManager.ShopManager:showGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, gift.id, true, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
end end

7
lua/app/ui/main_city/component/main_comp.lua
View File

@ -85,7 +85,12 @@ function MainComp:refreshModule(selectModule)
if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.ARENA then if self.curModuleType == GConst.MainCityConst.MAIN_MODULE.ARENA then
if DataManager.ArenaData:needShowPopGift() and DataManager.ArenaData:getGiftId() then if DataManager.ArenaData:needShowPopGift() and DataManager.ArenaData:getGiftId() then
ModuleManager.ArenaManager:showGiftPopUI() local showType = BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP
local mainUI = UIManager:getUIByIndex(UIManager.UI_PATH.MAINCITY_UI)
if mainUI and mainUI.isFirstEnter then
showType = BIReport.PAY_UI_SHOW_TYPE.LOGIN_POP
end
ModuleManager.ArenaManager:showGiftPopUI(showType)
end end
elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DUNGEON then
if DataManager.TutorialData:getIsInTutorial() then if DataManager.TutorialData:getIsInTutorial() then

20
lua/app/ui/main_city/main_city_ui.lua
View File

@ -1020,7 +1020,11 @@ function MainCityUI:checkMainPop()
-- 金猪满了后下次进主城要弹出来 -- 金猪满了后下次进主城要弹出来
if DataManager.GoldPigData:getPopFlag() then if DataManager.GoldPigData:getPopFlag() then
DataManager.GoldPigData:markPop() DataManager.GoldPigData:markPop()
ModuleManager.ActivityManager:showGoldPigUI() local showType = BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP
if self.isFirstEnter then
showType = BIReport.PAY_UI_SHOW_TYPE.LOGIN_POP
end
ModuleManager.ActivityManager:showGoldPigUI(showType)
end end
end end
@ -1077,6 +1081,10 @@ end
-- 检查礼包(首充(作废)/入门/章节/新手/助力/成长/金币顺序) -- 检查礼包(首充(作废)/入门/章节/新手/助力/成长/金币顺序)
function MainCityUI:checkGift() function MainCityUI:checkGift()
local showType = BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP
if self.isFirstEnter then
showType = BIReport.PAY_UI_SHOW_TYPE.LOGIN_POP
end
-- 审核模式不弹礼包 -- 审核模式不弹礼包
if GFunc.isShenhe() then if GFunc.isShenhe() then
return return
@ -1143,7 +1151,7 @@ function MainCityUI:checkGift()
-- end -- end
-- 入门礼包 -- 入门礼包
if introductGiftIds and #introductGiftIds > 0 then if introductGiftIds and #introductGiftIds > 0 then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, introductGiftIds[1]) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, introductGiftIds[1], showType)
return true return true
end end
---- 试玩弹窗在章节礼包前 ---- 试玩弹窗在章节礼包前
@ -1154,22 +1162,22 @@ function MainCityUI:checkGift()
end end
-- 章节礼包 -- 章节礼包
if chapterPopUpGifts and #chapterPopUpGifts > 0 then if chapterPopUpGifts and #chapterPopUpGifts > 0 then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT, chapterPopUpGifts[1]) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT, chapterPopUpGifts[1], showType)
return true return true
end end
-- 新手礼包 -- 新手礼包
if beginnerGiftIds and #beginnerGiftIds > 0 then if beginnerGiftIds and #beginnerGiftIds > 0 then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, beginnerGiftIds[1]) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, beginnerGiftIds[1], showType)
return true return true
end end
-- 助力礼包 -- 助力礼包
if levelUpGiftIds and #levelUpGiftIds then if levelUpGiftIds and #levelUpGiftIds then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, levelUpGiftIds[1]) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, levelUpGiftIds[1], showType)
return true return true
end end
-- 成长礼包 -- 成长礼包
if growUpPopUpGifts and #growUpPopUpGifts > 0 then if growUpPopUpGifts and #growUpPopUpGifts > 0 then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, growUpPopUpGifts[1]) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, growUpPopUpGifts[1], showType)
return true return true
end end
end end

2
lua/app/ui/shop/cell/arena_gift_sell_cell.lua
View File

@ -98,7 +98,7 @@ end
function ArenaGiftSellCell:onClickGift(id) function ArenaGiftSellCell:onClickGift(id)
-- PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT) -- PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT)
ModuleManager.ArenaManager:showGiftPopUI() ModuleManager.ArenaManager:showGiftPopUI(BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
return ArenaGiftSellCell return ArenaGiftSellCell

5
lua/app/ui/shop/first_recharge_pop_ui.lua
View File

@ -1,7 +1,8 @@
local FirstRechargePopUI = class("FirstRechargePopUI", BaseUI) local FirstRechargePopUI = class("FirstRechargePopUI", BaseUI)
local MAX_ITEM_NUM = 3 local MAX_ITEM_NUM = 3
function FirstRechargePopUI:ctor() function FirstRechargePopUI:ctor(params)
self.showType = params.showType
end end
function FirstRechargePopUI:isFullScreen() function FirstRechargePopUI:isFullScreen()
@ -49,7 +50,7 @@ function FirstRechargePopUI:onLoadRootComplete()
self:refresh() self:refresh()
-- 上报 -- 上报
BIReport:postPayUIShow(BIReport.GIFT_TYPE.FIRST_RECHARGE, GConst.ShopConst.FIRST_RECHARGE_ID) BIReport:postPayUIShow(BIReport.GIFT_TYPE.FIRST_RECHARGE, GConst.ShopConst.FIRST_RECHARGE_ID, self.showType)
end end
function FirstRechargePopUI:_bind() function FirstRechargePopUI:_bind()

3
lua/app/ui/shop/gift_pop_ui.lua
View File

@ -47,6 +47,7 @@ function GiftPopUI:ctor(params)
self.actType = params.type self.actType = params.type
self.actId = params.id self.actId = params.id
self.onlySelf = params.onlySelf -- 有此标记时 关闭直接关闭界面 self.onlySelf = params.onlySelf -- 有此标记时 关闭直接关闭界面
self.showType = params.showType
self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量 self.buyCount = DataManager.ShopData:getGiftBoughtNum(self.actType, self.actId) -- 触发时该礼包的购买数量
end end
@ -178,7 +179,7 @@ function GiftPopUI:refresh(needCheck)
-- 上报 -- 上报
local giftType = PayManager:getGiftType(self.actType, self.actId) local giftType = PayManager:getGiftType(self.actType, self.actId)
BIReport:postPayUIShow(giftType, self.actId) BIReport:postPayUIShow(giftType, self.actId, self.showType)
self:updateTime() self:updateTime()
end end

5
lua/app/ui/shop/introduct_pop_ui.lua
View File

@ -1,7 +1,8 @@
local IntroductPopUI = class("IntroductPopUI", BaseUI) local IntroductPopUI = class("IntroductPopUI", BaseUI)
local MAX_ITEM_NUM = 3 local MAX_ITEM_NUM = 3
function IntroductPopUI:ctor() function IntroductPopUI:ctor(params)
self.showType = params.showType
end end
function IntroductPopUI:isFullScreen() function IntroductPopUI:isFullScreen()
@ -52,7 +53,7 @@ function IntroductPopUI:onLoadRootComplete()
self:refresh() self:refresh()
-- 上报 -- 上报
BIReport:postPayUIShow(BIReport.GIFT_TYPE.INTRODUCTORY_GIFT, GConst.ShopConst.INTRODUCT_GIFT_ID) BIReport:postPayUIShow(BIReport.GIFT_TYPE.INTRODUCTORY_GIFT, GConst.ShopConst.INTRODUCT_GIFT_ID, self.showType)
end end
function IntroductPopUI:_bind() function IntroductPopUI:_bind()

18
lua/app/ui/shop/shop_comp.lua
View File

@ -214,40 +214,40 @@ function ShopComp:postEnterPage()
-- 章节 -- 章节
local actIdList = DataManager.ShopData:getActChapterStoreCanBuyActIds() local actIdList = DataManager.ShopData:getActChapterStoreCanBuyActIds()
if actIdList and #actIdList > 0 then if actIdList and #actIdList > 0 then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.ACT_CHAPTER_STORE, actIdList[1]) -- 约定上报第一个付费项 BIReport:postPayUIShow(BIReport.GIFT_TYPE.ACT_CHAPTER_STORE, actIdList[1], BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW) -- 约定上报第一个付费项
end end
-- 新手 -- 新手
if not DataManager.ShopData:getBeginnerGiftHasBuy() then if not DataManager.ShopData:getBeginnerGiftHasBuy() then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.BEGINNER_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID) BIReport:postPayUIShow(BIReport.GIFT_TYPE.BEGINNER_GIFT, GConst.ShopConst.BEGINNER_GIFT_ID, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
-- 助力 -- 助力
local actIdList = DataManager.ShopData:getLevelUpGiftActIds() local actIdList = DataManager.ShopData:getLevelUpGiftActIds()
if actIdList and #actIdList > 0 then if actIdList and #actIdList > 0 then
for _, id in ipairs(actIdList) do for _, id in ipairs(actIdList) do
BIReport:postPayUIShow(BIReport.GIFT_TYPE.LEVEL_UP_GIFT, id) BIReport:postPayUIShow(BIReport.GIFT_TYPE.LEVEL_UP_GIFT, id, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
end end
-- 成长 -- 成长
local act = DataManager.ShopData:getGrowUpGift() local act = DataManager.ShopData:getGrowUpGift()
if act then if act then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.GROW_UP_GIFT_NEW, act.current_grow_up_id) BIReport:postPayUIShow(BIReport.GIFT_TYPE.GROW_UP_GIFT_NEW, act.current_grow_up_id, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
-- 金币 -- 金币
local actId = DataManager.ShopData:getValidCoinGiftId() local actId = DataManager.ShopData:getValidCoinGiftId()
if actId and actId > 0 then if actId and actId > 0 then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.COIN_GIFT, actId) BIReport:postPayUIShow(BIReport.GIFT_TYPE.COIN_GIFT, actId, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
-- 竞技场 -- 竞技场
local actId = DataManager.ArenaData:getGiftId() local actId = DataManager.ArenaData:getGiftId()
if actId and actId > 0 then if actId and actId > 0 then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_GIFT, actId) BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_GIFT, actId, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
-- 武器副本 -- 武器副本
local actIdInfo = DataManager.ShopData:getGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT) local actIdInfo = DataManager.ShopData:getGift(PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT)
if actIdInfo then if actIdInfo then
local actGiftId = actIdInfo.id local actGiftId = actIdInfo.id
if actGiftId and actGiftId > 0 then if actGiftId and actGiftId > 0 then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.WEAPON_GIFT, actGiftId) BIReport:postPayUIShow(BIReport.GIFT_TYPE.WEAPON_GIFT, actGiftId, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
end end
-- 防具副本 -- 防具副本
@ -255,12 +255,12 @@ function ShopComp:postEnterPage()
if actIdInfo then if actIdInfo then
local actGiftId = actIdInfo.id local actGiftId = actIdInfo.id
if actGiftId and actGiftId > 0 then if actGiftId and actGiftId > 0 then
BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARMOR_GIFT, actGiftId) BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARMOR_GIFT, actGiftId, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW)
end end
end end
else else
-- 找到所有的钻石项目 -- 找到所有的钻石项目
BIReport:postPayUIShow(BIReport.GIFT_TYPE.MALL_TREASURE, 2) -- 约定上报第一个付费项 BIReport:postPayUIShow(BIReport.GIFT_TYPE.MALL_TREASURE, 2, BIReport.PAY_UI_SHOW_TYPE.SHOP_SHOW) -- 约定上报第一个付费项
end end
end end

2
lua/app/userdata/shop/shop_data.lua
View File

@ -889,7 +889,7 @@ function ShopData:checkPopGift(actGiftType)
for _, actId in ipairs(gifts) do for _, actId in ipairs(gifts) do
local cfgInfo = self:getActGiftConfig()[actId] local cfgInfo = self:getActGiftConfig()[actId]
if cfgInfo and cfgInfo.type == actGiftType then if cfgInfo and cfgInfo.type == actGiftType then
ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId) ModuleManager.ShopManager:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId, BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP)
end end
end end
end end