From e5e23cc06c4a6bd1af8b8999448e9209f617200b Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Mon, 15 Sep 2025 11:41:23 +0800
Subject: [PATCH] fix bug

---
 lua/app/module/arena/arena_manager.lua   | 6 +++++-
 lua/app/ui/arena/arena_ui.lua            | 6 ++++++
 lua/app/ui/player/player_level_up_ui.lua | 3 ++-
 lua/app/userdata/arena/arena_data.lua    | 6 +++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua
index 64595b3f..9399ebaf 100644
--- a/lua/app/module/arena/arena_manager.lua
+++ b/lua/app/module/arena/arena_manager.lua
@@ -108,7 +108,11 @@ function ArenaManager:rspChallenge(result)
             atkFormation = atkFormation,
             defFormation = defFormation
         }
-        ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.ARENA, params)
+        ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.ARENA, params, function ()
+            UIManager:closeAllUI()
+            ModuleManager.MaincityManager:showMainCityUI()
+            self:showArenaUI()
+        end)
 
         --bi上报
         LocalData:recordTodayArenaBattle()
diff --git a/lua/app/ui/arena/arena_ui.lua b/lua/app/ui/arena/arena_ui.lua
index 19d29ef6..51fb1514 100644
--- a/lua/app/ui/arena/arena_ui.lua
+++ b/lua/app/ui/arena/arena_ui.lua
@@ -281,6 +281,12 @@ function ArenaUI:refreshFightBtn()
 	self.fightCost:setActive(false)
 	self.countTxNum:setActive(false)
 	self.fightBtn:setActive(true)
+
+	if DataManager.ArenaData:hasTicket() then
+		self.fightBtn:addRedPoint(120, 40, 1)
+	else
+		self.fightBtn:removeRedPoint()
+	end
 end
 
 return ArenaUI
\ No newline at end of file
diff --git a/lua/app/ui/player/player_level_up_ui.lua b/lua/app/ui/player/player_level_up_ui.lua
index 4f92f202..fadffd55 100644
--- a/lua/app/ui/player/player_level_up_ui.lua
+++ b/lua/app/ui/player/player_level_up_ui.lua
@@ -12,7 +12,8 @@ function PlayerLevelUpUI:ctor(params)
     params = params or GConst.EMPTY_TABLE
 
     self.fromLevel = params.fromLevel
-    self.rewards = params.rewards or GConst.EMPTY_TABLE
+    self.rewards = {}
+    GFunc.mergeRewards2(params.rewards or GConst.EMPTY_TABLE, self.rewards, true)
 end
 
 function PlayerLevelUpUI:onLoadRootComplete()
diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua
index ab089a75..aa45b11d 100644
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@@ -464,7 +464,11 @@ function ArenaData:hasEntranceRedDot()
     if not self:isOpen() then
         return false
     end
-    return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0 or self:hasSeasonReward() or self:hasGradingRewardRedDot()
+    return self:hasSeasonReward() or self:hasGradingRewardRedDot() or self:hasTicket()
+end
+
+function ArenaData:hasTicket()
+    return DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_ARENA_TICKET) > 0
 end
 
 -- 广告宝箱 ----------------------------------------------------------------------