diff --git a/lua/app/ui/arena/arena_formation_ui.lua b/lua/app/ui/arena/arena_formation_ui.lua
index 194eedfe..4678d9c0 100644
--- a/lua/app/ui/arena/arena_formation_ui.lua
+++ b/lua/app/ui/arena/arena_formation_ui.lua
@@ -32,7 +32,8 @@ function ArenaFormationUI:getCurrencyParams()
 end
 
 function ArenaFormationUI:ctor(params)
-    self.formationType = params
+    self.formationType = params.type
+    self.fromMatch = params.fromMatch
 end
 
 function ArenaFormationUI:onCover()
@@ -50,11 +51,23 @@ function ArenaFormationUI:onLoadRootComplete()
     uiMap["arena_formation_ui.banner.btn_ok.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_24))
     uiMap["arena_formation_ui.banner.btn_ok"]:addClickListener(function()
         ModuleManager.FormationManager:reqArenaFormation()
-        if self.isMatch then
+        if self.fromMatch then
             UIManager:showUI("app/ui/arena/arena_match_ui")
         end
         self:closeUI()
 	end)
+    self.selectAttack = uiMap["arena_formation_ui.banner.btn_attack.img_select"]
+    uiMap["arena_formation_ui.banner.btn_attack.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_10))
+    uiMap["arena_formation_ui.banner.btn_attack"]:addClickListener(function()
+        self.formationType = GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK
+        self:onRefresh()
+	end)
+    self.selectDefend = uiMap["arena_formation_ui.banner.btn_defend.img_select"]
+    uiMap["arena_formation_ui.banner.btn_defend.tx_desc"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_9))
+    uiMap["arena_formation_ui.banner.btn_defend"]:addClickListener(function()
+        self.formationType = GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND
+        self:onRefresh()
+	end)
 
     local heroUI = uiMap["arena_formation_ui.hero_ui"]
     heroUI:initPrefabHelper()
@@ -66,7 +79,6 @@ function ArenaFormationUI:onLoadRootComplete()
     self:bind(DataManager.HeroData, "isDirty", function()
         self:onRefresh()
     end)
-
     self:bind(DataManager.BagData.ItemData, "dirty", function()
         self:onRefresh()
     end)
@@ -76,10 +88,8 @@ function ArenaFormationUI:onLoadRootComplete()
 end
 
 function ArenaFormationUI:onRefresh()
-    if self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK then
-        -- 从匹配界面进来的
-        self.isMatch = true
-    end
+    self.selectAttack:setActive(self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK)
+    self.selectDefend:setActive(self.formationType == GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND)
     self.heroComp:refresh(self.formationType)
 end
 
diff --git a/lua/app/ui/arena/arena_match_ui.lua b/lua/app/ui/arena/arena_match_ui.lua
index 97c29253..0297c050 100644
--- a/lua/app/ui/arena/arena_match_ui.lua
+++ b/lua/app/ui/arena/arena_match_ui.lua
@@ -107,7 +107,7 @@ function ArenaMatchUI:onLoadRootComplete()
 		self:onClickRematch()
 	end)
 	self.btnFormation:addClickListener(function()
-		UIManager:showUI("app/ui/arena/arena_formation_ui", GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK)
+		UIManager:showUI("app/ui/arena/arena_formation_ui", {type = GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK, fromMatch = true})
 		self:closeUI()
 	end)
 	self:addEventListener(EventManager.CUSTOM_EVENT.ARENA_SEASON_SETTLEMENT, function()
diff --git a/lua/app/ui/main_city/component/arena_comp.lua b/lua/app/ui/main_city/component/arena_comp.lua
index 8e98530d..0e8ed88a 100644
--- a/lua/app/ui/main_city/component/arena_comp.lua
+++ b/lua/app/ui/main_city/component/arena_comp.lua
@@ -76,7 +76,7 @@ function ArenaComp:init()
         UIManager:showUI("app/ui/arena/arena_recent_battle_ui")
     end)
     self.btnFormation:addClickListener(function()
-        UIManager:showUI("app/ui/arena/arena_formation_ui", GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND)
+        UIManager:showUI("app/ui/arena/arena_formation_ui", {type = GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND})
     end)
     self.btnReward:addClickListener(function()
         UIManager:showUI("app/ui/arena/arena_season_reward_ui")