Merge branch 'master' into dev_20230712

lua/app/common/bi_report.lua

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

lua/app/common/pay_manager.lua

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

lua/app/game.lua

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

lua/app/module/chapter/chapter_manager.lua

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

lua/app/module/login/login_manager.lua

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