puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
CloudJ 2023-06-06 17:11:18 +08:00
commit f84f0a103a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/common/bi_report.lua
View File

@ -236,6 +236,7 @@ function BIReport:report(name, args)
if DataManager.BagData and DataManager.BagData.ItemData then if DataManager.BagData and DataManager.BagData.ItemData then
args.gold = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GOLD) args.gold = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GOLD)
args.gem = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GEM) args.gem = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_GEM)
args.energy = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_VIT)
end end
end end
args.current_version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion() args.current_version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion()

2
lua/app/userdata/battle/battle_grid_entity.lua
View File

@ -203,7 +203,7 @@ end
function BattleGridEntity:setElementType(elementType, noDirty) function BattleGridEntity:setElementType(elementType, noDirty)
self.elementType = elementType 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) self:setGridType(BattleConst.GRID_TYPE.LOCK)
end end
if not noDirty then if not noDirty then