From d4c7cf71b0877401a1dd1ad94ff8eb8e039830aa Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Tue, 12 Sep 2023 19:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B=E6=96=AD?=
 =?UTF-8?q?=E7=BA=BF=E7=BB=AD=E5=85=B3=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/common/bi_report.lua          | 8 ++++++++
 lua/app/ui/main_city/main_city_ui.lua | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua
index 039da2d7..f334cf9c 100644
--- a/lua/app/common/bi_report.lua
+++ b/lua/app/common/bi_report.lua
@@ -272,6 +272,7 @@ BIReport.DIALY_CHALLENGE_OPT_TYPE = {
 BIReport.MISCELLANEOUS_OPT_TYPE = {
 	EVALUATE_OPEN = "EvaluateOpen",
 	EVALUATE_CLOSE = "EvaluateClose",
+	BATTLE_SNAP_SHOP_OPEN = "BattleSnapShopOpen",
 }
 
 BIReport.ARENA_OPT_TYPE = {
@@ -1663,6 +1664,13 @@ function BIReport:postRateOpen()
 	self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
 end
 
+function BIReport:postBatttleSnapshotOpen()
+	local args = {
+		event_type  = BIReport.MISCELLANEOUS_OPT_TYPE.BATTLE_SNAP_SHOP_OPEN,
+	}
+	self:report(EVENT_NAME_MISCELLANEOUS_OPT, args)
+end
+
 function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
 	local args = {
 		event_type = BIReport.NETWORK_OPT_TYPE.AUTH_FAILED,
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 96ab9a30..b9dddb16 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -1050,16 +1050,20 @@ function MainCityUI:checkMainPop()
     -- 续关
     if self.isFirstEnter then
         local battleSnapshot = LocalData:getBattleSnapshot()
-        LocalData:saveBattleSnapshot({})
         if battleSnapshot.battleType then
             if battleSnapshot.currentVersion == Platform:getClientVersion() then
                 local snapshotTime = battleSnapshot.snapShotTime
                 if snapshotTime and Time:getOverOfServerToday(snapshotTime) >= Time:getOverOfServerToday() then
+                    BIReport:postBatttleSnapshotOpen()
                     local params = {
                         content = I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_14),
                         okFunc = function()
+                            LocalData:saveBattleSnapshot({})
                             ModuleManager.BattleManager:playBattle(battleSnapshot.battleType, battleSnapshot.parmas, nil, battleSnapshot)
                         end,
+                        cancelFunc = function()
+                            LocalData:saveBattleSnapshot({})
+                        end,
                         boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
                     }
                     GFunc.showMessageBox(params)