diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua
index 82d4de3e..c3bcb03e 100644
--- a/lua/app/module/battle/controller/battle_controller.lua
+++ b/lua/app/module/battle/controller/battle_controller.lua
@@ -511,9 +511,6 @@ function BattleController:enterNextWave()
     self.eliminateCount = 0
 
     self.isBossWave = self.defTeam:getMainUnit().unitEntity:getIsBoss()
-    if self.isBossWave then
-        self:showBuffTips(BattleConst.SIDE_DEF, true)
-    end
     self:postFightStart()
     self:enterRoundBegin()
 end
diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua
index 6434cb94..f6cd5280 100644
--- a/lua/app/ui/battle/battle_ui.lua
+++ b/lua/app/ui/battle/battle_ui.lua
@@ -2046,6 +2046,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
         if callback then
             callback()
         end
+        self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
         return
     end
     self.bossEnterNode:setVisible(true)
@@ -2066,6 +2067,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
         if callback then
             callback()
         end
+        self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
     end)
     self.bossEnterAniSeq:AppendInterval(bornTime)
     self.bossEnterAniSeq:AppendCallback(function()
diff --git a/lua/app/userdata/battle/skill/battle_buff_entity.lua b/lua/app/userdata/battle/skill/battle_buff_entity.lua
index 5deb3477..432ec986 100644
--- a/lua/app/userdata/battle/skill/battle_buff_entity.lua
+++ b/lua/app/userdata/battle/skill/battle_buff_entity.lua
@@ -32,15 +32,16 @@ function BattleBuffEntity:getHostSkill()
 end
 
 function BattleBuffEntity:getDesc()
-	if self.desc == nil then
-		local buff18NInfo = I18N:getConfigWithOtherKey("buff", "name")[self.name]
-		if buff18NInfo then
-			self.desc = buff18NInfo.desc or GConst.EMPTY_STRING
-		else
-			self.desc = GConst.EMPTY_STRING
-		end
-	end
-	return self.desc
+	return GFunc.getBuffDesc(self:getName(), self:getEffectNum())
+	-- if self.desc == nil then
+	-- 	local buff18NInfo = I18N:getConfigWithOtherKey("buff", "name")[self.name]
+	-- 	if buff18NInfo then
+	-- 		self.desc = buff18NInfo.desc or GConst.EMPTY_STRING
+	-- 	else
+	-- 		self.desc = GConst.EMPTY_STRING
+	-- 	end
+	-- end
+	-- return self.desc
 end
 
 function BattleBuffEntity:getBuffType()