From e6435c68ff8c4a1ba4beb402cc08efffa2898e2a Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 6 Jun 2023 16:43:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E5=85=B1=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=8A=A5=E4=BD=93=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/bi_report.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index e09d14cd..d6346202 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -235,6 +235,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() From 538c9e51b1e5849da424bc5b0621634c352a144d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 6 Jun 2023 16:44:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/battle/battle_grid_entity.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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