diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua
index 311bb619..c251b19e 100644
--- a/lua/app/module/arena/arena_manager.lua
+++ b/lua/app/module/arena/arena_manager.lua
@@ -59,6 +59,12 @@ function ArenaManager:reqChallenge()
         return
     end
 
+    -- 判断阵容
+    if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.ARENA_ATTACK) then
+        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
+        return
+    end
+
     local reqData = {
         defInfo = DataManager.ArenaData:getMatchInfo()
     }
diff --git a/lua/app/module/chapter/chapter_manager.lua b/lua/app/module/chapter/chapter_manager.lua
index c4f06afc..8e66b01a 100644
--- a/lua/app/module/chapter/chapter_manager.lua
+++ b/lua/app/module/chapter/chapter_manager.lua
@@ -23,7 +23,7 @@ function ChapterManager:openBoxFinish(result)
 end
 
 function ChapterManager:startFight()
-    if not DataManager.FormationData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then
+    if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.STAGE) then
         GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
         return
     end
diff --git a/lua/app/module/daily_challenge/daily_challenge_manager.lua b/lua/app/module/daily_challenge/daily_challenge_manager.lua
index fd457bfd..d0d6a064 100644
--- a/lua/app/module/daily_challenge/daily_challenge_manager.lua
+++ b/lua/app/module/daily_challenge/daily_challenge_manager.lua
@@ -54,7 +54,7 @@ function DailyChallengeManager:startChallenge()
     end
 
     -- 检查阵容
-    if not DataManager.FormationData:formationIsFull(GConst.BattleConst.BATTLE_TYPE.STAGE) then
+    if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.STAGE) then
         GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8))
         return
     end
diff --git a/lua/app/ui/tips/battle_board_skill_tips.lua b/lua/app/ui/tips/battle_board_skill_tips.lua
index ed633b7f..04842064 100644
--- a/lua/app/ui/tips/battle_board_skill_tips.lua
+++ b/lua/app/ui/tips/battle_board_skill_tips.lua
@@ -33,7 +33,6 @@ function BattleBoardSkillTips:onLoadRootComplete()
     self.atkDesc = uiMap["battle_skill_tips.bg_1.atk_desc"]
     self.skillDesc = uiMap["battle_skill_tips.bg_1.skill_desc"]
     self.validEffectDesc = uiMap["battle_skill_tips.bg_1.valid_effect_desc"]
-    self.gridLayout = uiMap["battle_skill_tips.bg_1.grid_layout"]
     if not self.selectSkillCells then
         self.selectSkillCells = {}
         for i = 1, 7 do
@@ -87,19 +86,6 @@ function BattleBoardSkillTips:onRefresh()
         end
     end
 
-    self.gridLayout:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_GRID_LAYOUT):RefreshLayout()
-
-    if count > 5 then
-        addY = addY + MAX_HEIGHT
-    elseif count >= 1 then
-        addY = addY + MIN_HEIGHT
-    else
-        addY = addY + NO_SKILL_HRIGHT
-        self.validEffectDesc:setText(GConst.EMPTY_STRING)
-    end
-
-    self.bg:setSizeDeltaY(addY)
-
 	if self.tarCornerScreenPos then
         self:locate(self.location, self.originSizeDelta, self.bg, self.tarCornerScreenPos)
     end