diff --git a/lua/app/game.lua b/lua/app/game.lua index 944c2d6b..61c87283 100644 --- a/lua/app/game.lua +++ b/lua/app/game.lua @@ -393,11 +393,11 @@ if NOT_PUBLISH then if DataManager.BattleData.gridEntities then local map = {} for posId, entity in pairs(DataManager.BattleData.gridEntities) do - map[posId] = entity:getSnapshoptInfo() + map[tostring(posId)] = entity:getSnapshoptInfo() end Logger.logHighlight("——————————战斗棋盘快照如下————————") - Logger.logHighlight("——————————当前转斗回合步骤————————" .. ModuleManager.BattleManager.battleController.roundStep) - Logger.printTable(map) + Logger.logHighlight("——————————当前战斗回合步骤————————" .. ModuleManager.BattleManager.battleController.roundStep) + Logger.logHighlight(json.encode(map)) end end diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index b6a79231..50a16dcd 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -2615,7 +2615,7 @@ function BattleController:findLinkLine(posId, posIdMap, hadSkill, mainElementTyp maxGotSkill = gotSkill end end - elseif gridEntity:getSkillId() and not hadSkill and mainElementType then + elseif gridEntity:canLink() and gridEntity:getSkillId() and not hadSkill and mainElementType then local skillId = gridEntity:getSkillId() local skillEntity = self.battleData:getSkillEntityBySkillId(skillId) if skillEntity then