diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua
index 237116c4..cc7445b0 100644
--- a/lua/app/common/bi_report.lua
+++ b/lua/app/common/bi_report.lua
@@ -236,6 +236,7 @@ function BIReport:report(name, args)
 			if DataManager.BagData and DataManager.BagData.ItemData then
 				args.gold = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GOLD)
 				args.gem = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GEM)
+				args.energy = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_VIT)
 			end
 		end
 		args.current_version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion()
diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua
index 34fa1c3b..b3a73254 100644
--- a/lua/app/userdata/battle/battle_grid_entity.lua
+++ b/lua/app/userdata/battle/battle_grid_entity.lua
@@ -203,7 +203,7 @@ end
 
 function BattleGridEntity:setElementType(elementType, noDirty)
     self.elementType = elementType
-    if DataManager.BattleData:getCacheLockedElement(self.elementType) then
+    if DataManager.BattleData:getCacheLockedElement(self.elementType) and not self.skillId then
         self:setGridType(BattleConst.GRID_TYPE.LOCK)
     end
     if not noDirty then