From 391f7b792550fef372caea45ec3db61a2ba88ded Mon Sep 17 00:00:00 2001 From: chenxi Date: Mon, 24 Apr 2023 17:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E6=94=BB=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/battle/battle_data.lua | 1 + lua/app/userdata/battle/team/battle_unit_entity.lua | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 28dc1f90..b5ffd58c 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -542,6 +542,7 @@ function BattleData:addMonster(monsterId, newTeam) modelId = monsterInfo.model_id, matchType = 0, normalSkills = monsterInfo.hurt_skill, + normalSkillCount = monsterInfo.atk_times or 0, activeSkills = monsterInfo.skill, passiveSkills = monsterInfo.passive_skill, assistingSkill = nil, diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index e4a872f7..d5e90a56 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -22,9 +22,9 @@ function BattleUnitEntity:initSkill() local skill = BattleSkillEntity:create(v, GConst.BattleConst.SKILL_TYPE_NORMAL, self) table.insert(self.normalSkills, skill) end - self.normalSkillCount = #self.normalSkills + self.normalSkillCount = self.unitData.normalSkillCount or #self.normalSkills else - self.normalSkillCount = 0 + self.normalSkillCount = self.unitData.normalSkillCount or 0 end self.normalSkill = nil if self.unitData.assistingSkill then