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

Merge branch 'dev_act' into dev_hero_2

Browse Source
This commit is contained in:
puxuan 2025-10-09 15:03:15 +08:00
commit 384734dbdf
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,6 +220,8 @@ BIReport.ITEM_GET_TYPE = {
FIRST_RECHARGE = "first_recharge", FIRST_RECHARGE = "first_recharge",
-- 特权卡 -- 特权卡
PRIVILEGE_CARD = "privilege_card", PRIVILEGE_CARD = "privilege_card",
-- 七日乐
SEVEN_DAY_GIFT = "seven_day_gift",
} }
BIReport.ADS_CLICK_TYPE = { BIReport.ADS_CLICK_TYPE = {

7
lua/app/module/activity/act_seven_day/act_seven_day_manager.lua
View File

@ -16,11 +16,11 @@ function ActSevenDayManager:onGetRewardTask(id, period)
end end
-- 一键领取处理 -- 一键领取处理
id = nil -- id = nil
local itemGetType = period == 1 and BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK or BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK_2 local itemGetType = period == 1 and BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK or BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK_2
-- self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, {id = id, period = period}, self.onGetRewardTaskSuccess, itemGetType) -- self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, {id = id, period = period}, self.onGetRewardTaskSuccess, itemGetType)
self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, {id = id}, self.onGetRewardTaskSuccess, itemGetType) self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayTaskRewardReq, {ids = {id}}, self.onGetRewardTaskSuccess, itemGetType)
end end
function ActSevenDayManager:onGetRewardTaskSuccess(result) function ActSevenDayManager:onGetRewardTaskSuccess(result)
@ -47,7 +47,7 @@ function ActSevenDayManager:onGetRewardScore(id, period)
end end
-- 一键领取处理 -- 一键领取处理
id = nil -- id = nil
local itemGetType = period == 1 and BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE or BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE_2 local itemGetType = period == 1 and BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE or BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE_2
-- self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayRewardReq, {id = id, period = period}, self.onGetRewardScoreSuccess, itemGetType) -- self:sendMessage(ProtoMsgType.FromMsgEnum.SevenDayRewardReq, {id = id, period = period}, self.onGetRewardScoreSuccess, itemGetType)
@ -87,7 +87,6 @@ BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK = "seven_day_task"
BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK_2 = "seven_day_task_2" BIReport.ITEM_GET_TYPE.SEVEN_DAY_TASK_2 = "seven_day_task_2"
BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE = "seven_day_score" BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE = "seven_day_score"
BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE_2 = "seven_day_score_2" BIReport.ITEM_GET_TYPE.SEVEN_DAY_SCORE_2 = "seven_day_score_2"
BIReport.ITEM_GET_TYPE.SEVEN_DAY_GIFT = "seven_day_gift"
local EVENT_NAME_SEVEN_DAY_OPT = "client_seven_day_opt" -- 七天乐任务 local EVENT_NAME_SEVEN_DAY_OPT = "client_seven_day_opt" -- 七天乐任务
local EVENT_NAME_SEVEN_DAY_GIFT_OPT = "client_seven_day_gift_opt" -- 七天乐礼包 local EVENT_NAME_SEVEN_DAY_GIFT_OPT = "client_seven_day_gift_opt" -- 七天乐礼包