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

Merge branch 'master' into dev_20230712

Browse Source
This commit is contained in:
xiekaidong 2023-07-12 09:48:18 +08:00
commit f527141d7b
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -487,7 +487,7 @@ function BIReport:postFightBegin(battleType, wave, chapterId, maxChapter, startT
event_type = BIReport.FIGHT_OPT_TYPE.START, event_type = BIReport.FIGHT_OPT_TYPE.START,
wave_id = wave, wave_id = wave,
chapter_id = chapterId, chapter_id = chapterId,
max_chapter = maxChapter, fight_max_chapter = maxChapter,
start_times = startTimes, start_times = startTimes,
} }
args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr() args.formation, args.famation_level = DataManager.FormationData:getStageFormationBIStr()
@ -982,7 +982,7 @@ function BIReport:postBountyLevelUp(bountyType, level, exp, season)
local args = { local args = {
event_type = BIReport.BOUNTY_OPT_TYPE.BOUNTY_LEVEL_UP, event_type = BIReport.BOUNTY_OPT_TYPE.BOUNTY_LEVEL_UP,
season = season, season = season,
bounty_level_id = level, level = level,
exp = exp, exp = exp,
bounty_type = bountyType, bounty_type = bountyType,
} }
@ -996,7 +996,7 @@ function BIReport:postBountyReward(bountyType, level, exp, season, rewardLevelId
level = level, level = level,
exp = exp, exp = exp,
bounty_type = bountyType, bounty_type = bountyType,
level_id = rewardLevelId, bounty_level_id = rewardLevelId,
is_pro = isPro, is_pro = isPro,
} }
self:report(EVENT_NAME_BOUNTY_OPT, args) self:report(EVENT_NAME_BOUNTY_OPT, args)
@ -1006,7 +1006,7 @@ function BIReport:postArenaBountyLevelUp(bountyType, level, exp, season)
local args = { local args = {
event_type = BIReport.BOUNTY_OPT_TYPE.ARENA_BOUNTY_LEVEL_UP, event_type = BIReport.BOUNTY_OPT_TYPE.ARENA_BOUNTY_LEVEL_UP,
season = season, season = season,
bounty_level_id = level, level = level,
exp = exp, exp = exp,
bounty_type = bountyType, bounty_type = bountyType,
} }
@ -1020,7 +1020,7 @@ function BIReport:postArenaBountyReward(bountyType, level, exp, season, rewardLe
level = level, level = level,
exp = exp, exp = exp,
bounty_type = bountyType, bounty_type = bountyType,
level_id = rewardLevelId, bounty_level_id = rewardLevelId,
is_pro = isPro, is_pro = isPro,
} }
self:report(EVENT_NAME_BOUNTY_OPT, args) self:report(EVENT_NAME_BOUNTY_OPT, args)

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

@ -4,7 +4,7 @@ PayManager.PURCHARSE_TYPE = {
ACT_GIFT = 1, ACT_GIFT = 1,
ACT_GOLD_PIG = 2, ACT_GOLD_PIG = 2,
CHAPTER_GIFT = 3, CHAPTER_GIFT = 3,
GROW_UP_GIFT = 4,-- 自0.4.0废弃 GROW_UP_GIFT = 4,-- 已废弃
MALL_TREASURE = 5, MALL_TREASURE = 5,
GROW_UP_GIFT_NEW = 6, GROW_UP_GIFT_NEW = 6,
} }

4
lua/app/game.lua
View File

@ -519,6 +519,10 @@ if NOT_PUBLISH then
battleController.battleUI:initGridCell() battleController.battleUI:initGridCell()
end end
end end
if Input.GetKeyDown(KeyCode.LeftArrow) and Input.GetKey(KeyCode.F) then
ModuleManager.LoginManager:reloginOnReconnectRefuse()
end
end end
Game._releaseOnApplicationFocus = Game.onApplicationFocus Game._releaseOnApplicationFocus = Game.onApplicationFocus

2
lua/app/module/chapter/chapter_manager.lua
View File

@ -118,7 +118,7 @@ function ChapterManager:endFightFinish(result)
local newMaxChapter = DataManager.ChapterData:getNewChapterId() local newMaxChapter = DataManager.ChapterData:getNewChapterId()
if maxChapter ~= newMaxChapter then if maxChapter ~= newMaxChapter then
local data = {} local data = {}
data.max_chapter = newMaxChapter data.max_chapter = DataManager.ChapterData:getMaxChapterId()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
-- 标记可弹出新手礼包 -- 标记可弹出新手礼包
if maxChapter == 1 then if maxChapter == 1 then

2
lua/app/module/login/login_manager.lua
View File

@ -154,7 +154,7 @@ function LoginManager:loginFinish(data)
DataManager:initWithServerData(data) DataManager:initWithServerData(data)
local data = {} local data = {}
data.max_chapter = DataManager.ChapterData:getNewChapterId() data.max_chapter = DataManager.ChapterData:getMaxChapterId()
data.ads_num = DataManager.PlayerData:getAdCount() data.ads_num = DataManager.PlayerData:getAdCount()
data.pay_money = DataManager.PlayerData:getTotalPayAmount() data.pay_money = DataManager.PlayerData:getTotalPayAmount()
data.pay_count = DataManager.PlayerData:getPayCount() data.pay_count = DataManager.PlayerData:getPayCount()