diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index cead002f..25981664 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -1230,6 +1230,10 @@ function BattleUnitComp:enterNormalAttackState()
 	self.attackTime = 0
 	self.skillSlowDownTime = nil
 	local skill = self.unitEntity:getNormalSkill(true)
+	if not skill then
+		self:onAttackOver()
+		return
+	end
 	skill:startUse()
 	if skill:getMoveType() == BattleConst.SKILL_MOVE_TYPE.MOVE then
 		self.isMove = true
diff --git a/lua/app/ui/battle/battle_base_ui.lua b/lua/app/ui/battle/battle_base_ui.lua
index bc9ba71d..801f5885 100644
--- a/lua/app/ui/battle/battle_base_ui.lua
+++ b/lua/app/ui/battle/battle_base_ui.lua
@@ -515,7 +515,7 @@ end
 
 function BattleBaseUI:showBuffTips(buffList, autoClose)
     if #buffList <= 0 then
-        return
+        return 0
     end
     self.battleBuffTipsRoot:setLocalScale(1, 1, 1)
     local buffObj = nil
diff --git a/lua/app/ui/shop/cell/grow_sell_cell.lua b/lua/app/ui/shop/cell/grow_sell_cell.lua
index 088eddde..26b24aad 100644
--- a/lua/app/ui/shop/cell/grow_sell_cell.lua
+++ b/lua/app/ui/shop/cell/grow_sell_cell.lua
@@ -3,6 +3,7 @@ local GROW_CELL = "app/ui/shop/cell/grow_cell"
 local BASE_CELL_HEIGHT = 320
 
 function GrowSellCell:init()
+    self.actGifts = {}
 	local uiMap = self.baseObject:genAllChildren()
 	self.scrollRectObj = uiMap["grow_sell_cell.scroll_rect"]
     self.contentObj = uiMap["grow_sell_cell.scroll_rect.viewport.content"]