fix bug

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()

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

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()

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
 
 -- 广告宝箱 ----------------------------------------------------------------------