From f0bde7e48c0f19b0560910969d6cebcda29358bb Mon Sep 17 00:00:00 2001 From: "DESKTOP-RH64908\\Administrator" <1545929779@qq.com> Date: Mon, 23 Dec 2024 18:51:04 +0800 Subject: [PATCH] 1 --- .../~Lua/Modules/Battle/BattleManager.lua | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index c6b1d1ae38..66cbba629d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -311,18 +311,20 @@ end function this.PlayerSkillAdapter2(MSkillId) local skill = {} local monsterSkill = playerSkill[tonumber(MSkillId)] - for index, skillId in ipairs(monsterSkill.SkillIDList) do - skill[index] = {} - skill[index].effect = this.GetSkillData(tonumber(skillId)) - skill[index].triggerId = monsterSkill.ReleasePoint[index] - skill[index].triggerCondition = { 0 } - if monsterSkill.ReleaseLimit and monsterSkill.ReleaseLimit[index] then - for k, v in ipairs(monsterSkill.ReleaseLimit[index]) do - skill[index].triggerCondition[k] = v + if monsterSkill then + for index, skillId in ipairs(monsterSkill.SkillIDList) do + skill[index] = {} + skill[index].effect = this.GetSkillData(tonumber(skillId)) + skill[index].triggerId = monsterSkill.ReleasePoint[index] + skill[index].triggerCondition = { 0 } + if monsterSkill.ReleaseLimit and monsterSkill.ReleaseLimit[index] then + for k, v in ipairs(monsterSkill.ReleaseLimit[index]) do + skill[index].triggerCondition[k] = v + end end + skill[index].maxCount = monsterSkill.WarEffectCount[index] or 999 + skill[index].maxRoundCount = monsterSkill.TurnEffectCount[index] or 999 end - skill[index].maxCount = monsterSkill.WarEffectCount[index] or 999 - skill[index].maxRoundCount = monsterSkill.TurnEffectCount[index] or 999 end return skill end @@ -877,7 +879,9 @@ function this.GetMonsterDataFromGroup(gId, camp) local id = monster[1] local star = monster[2] local level = monster[3] - + if star == nil then + break + end local mUnit = { unitId = id, position = i,