diff --git a/lua/app/config/arena_rank.lua b/lua/app/config/arena_rank.lua
index aaaf7bdf..7ed06955 100644
--- a/lua/app/config/arena_rank.lua
+++ b/lua/app/config/arena_rank.lua
@@ -3303,8 +3303,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=46000,
- 				["num_for_nothing"]="Ug5cA2U="
+				["num"]=25000,
+ 				["num_for_nothing"]="VA1cA2U="
 			},
 			{
 				["type"]=1,
@@ -5383,8 +5383,8 @@ local arena_rank = {
  				["type_for_nothing"]="Vw==",
 				["id"]=1,
  				["id_for_nothing"]="Vw==",
-				["num"]=54000,
- 				["num_for_nothing"]="UwxcA2U="
+				["num"]=25000,
+ 				["num_for_nothing"]="VA1cA2U="
 			},
 			{
 				["type"]=1,
diff --git a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua
index 1349e3c6..ba57101d 100644
--- a/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua
+++ b/lua/app/module/activity/act_boss_rush/act_boss_rush_manager.lua
@@ -88,15 +88,15 @@ end
 
 function ActBossRushManager:rspEndBattle(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
-        local wave = result.max_wave or 0
-        local round = result.min_round or 0
-        DataManager.ActBossRushData:addWaveCount(wave)
-        DataManager.ActBossRushData:updateWaveAndRound(wave, round)
-        ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat)
-
         if result.reqData then
             ModuleManager.TaskManager:addFightTaskProgress(result.reqData.task_stat)
+            DataManager.ActBossRushData:addWaveCount(result.reqData.task_stat[GConst.BattleConst.BATTLE_TASK_FIELD.PASS_WAVE] or 0)
         end
+
+        local wave = result.max_wave or 0
+        local round = result.min_round or 0
+        DataManager.ActBossRushData:updateWaveAndRound(wave, round)
+        ModuleManager.BattleManager:showBossRushBattleResultUI(GConst.BattleConst.BATTLE_TYPE.ACT_BOSS_RUSH, result.reqData and result.reqData.combatReport, result.reqData and result.reqData.task_stat)
     end
 end
 
diff --git a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua
index 4e7004f3..f2d5e1d7 100644
--- a/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua
+++ b/lua/app/ui/activity/fourteen_day/fourteen_day_entrance_ui.lua
@@ -92,6 +92,9 @@ function FourteenDayEntranceUI:onLoadRootComplete()
     self:bind(DataManager.FourteenDayData, "isDirty", function()
         self:onRefresh()
 	end)
+    self:bind(DataManager.ShopData, "isDirty", function()
+        self:refreshRedPoint()
+	end)
 end
 
 function FourteenDayEntranceUI:onRefresh()
diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua
index 45961d48..96ab9a30 100644
--- a/lua/app/ui/main_city/main_city_ui.lua
+++ b/lua/app/ui/main_city/main_city_ui.lua
@@ -688,7 +688,7 @@ function MainCityUI:refreshRightBtns()
         self.rightSideBar:setSizeDeltaY(-minY)
         self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1)
         self.rightArrowBtn:setVisible(true)
-        self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET)
+        self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + minY + arrowHeight/2 + SIDE_BAR_BORDER_OFFSET)
         if otherColumn then
             self.rightArrowBtn:setAnchoredPositionX(-133)
         else
diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
index e3f3020f..bfe290a9 100644
--- a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
+++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
@@ -460,22 +460,7 @@ end
 
 -- 是否有兑换红点
 function FourteenDayData:hasExchangeRedPoint()
-    local isFullUnlock = true
-    for index, data in ipairs(self:getExchangeShowIdsSort()) do
-        if not self:isExchangeUnlock(data.id) then
-            isFullUnlock = false
-            break
-        end
-    end
-    if not isFullUnlock then
-        return not self:getTodayExchangeCheck()
-    else
-        for index, data in ipairs(self:getExchangeShowIdsSort()) do
-            if self:canExchange(data.id) then
-                return true
-            end
-        end
-    end
+    return not self:getTodayExchangeCheck()
 end
 
 function FourteenDayData:getTodayExchangeCheck()