From 06145762e14656093223b53b8d5171ef58ed5e3a Mon Sep 17 00:00:00 2001 From: chenxi Date: Thu, 13 Apr 2023 23:21:40 +0800 Subject: [PATCH 1/2] . --- lua/app/module/battle/component/battle_unit_comp.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua index 00bc6f2b..b42ba678 100644 --- a/lua/app/module/battle/component/battle_unit_comp.lua +++ b/lua/app/module/battle/component/battle_unit_comp.lua @@ -252,6 +252,7 @@ function BattleUnitComp:updateNormalAttack(dt) return else -- 继续攻击 self.attackTime = 0 + self.currAttackKeyTime = 0.3 local skill = self.unitEntity:getNormalSkill() local attackName = skill:getRandomNormalAttackName() self.currAttackDuration = self:getAnimationDuration(attackName) From 442e59c95ac25b6c553415edefb2886925bd28ac Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 14 Apr 2023 00:21:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=BB=E5=87=BB=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/global/global_const.lua | 14 +++++++++++++- lua/app/userdata/battle/battle_data.lua | 15 ++++++++++++--- lua/app/userdata/hero/hero_entity.lua | 13 +++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index da72a503..37446e09 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -396,9 +396,21 @@ GConst.ENTITY_TYPE = { JEWELRY_ENTITY = 3, } +GConst.MATCH_ATTACK_NAME = { + [1] = "atk_red", + [2] = "atk_yellow", + [3] = "atk_green", + [4] = "atk_blue", + [5] = "atk_purple", +} + GConst.ATTR_TYPE = { hp = 1, - atk = 2, + atk_red = 2, + atk_yellow = 3, + atk_green = 4, + atk_blue = 5, + atk_purple = 6 } GConst.GAMEOBJECT_LAYER = { diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua index 1efffafb..f49405c1 100644 --- a/lua/app/userdata/battle/battle_data.lua +++ b/lua/app/userdata/battle/battle_data.lua @@ -307,7 +307,11 @@ function BattleData:initHeroData() attr = { hp = hp, max_hp = hp, - atk = heroAttr[ATTR_TYPE.atk] // DEFAULT_FACTOR, + atk_red = heroAttr[ATTR_TYPE.atk_red] // DEFAULT_FACTOR, + atk_yellow = heroAttr[ATTR_TYPE.atk_yellow] // DEFAULT_FACTOR, + atk_green = heroAttr[ATTR_TYPE.atk_green] // DEFAULT_FACTOR, + atk_blue = heroAttr[ATTR_TYPE.atk_blue] // DEFAULT_FACTOR, + atk_purple = heroAttr[ATTR_TYPE.atk_purple] // DEFAULT_FACTOR, } } Logger.printTable(unitData) @@ -324,16 +328,21 @@ end function BattleData:addMonster(monsterId) local monsterInfo = ConfigManager:getConfig("monster")[monsterId] local hp = monsterInfo.hp // DEFAULT_FACTOR + local atk = monsterInfo.atk // DEFAULT_FACTOR local unitData = { id = monsterId, modelId = monsterInfo.model_id, - matchType = 1, + matchType = 0, normalSkill = monsterInfo.hurt_skill, activeSkills = monsterInfo.skill, attr = { hp = hp, max_hp = hp, - atk = monsterInfo.atk // DEFAULT_FACTOR, + atk_red = atk, + atk_yellow = atk, + atk_green = atk, + atk_blue = atk, + atk_purple = atk, } } return self.defTeam:addUnit(unitData) diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 258584e8..8e0b25fe 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -16,7 +16,11 @@ end function HeroEntity:initAttr() self.allAttr[GConst.ATTR_TYPE.hp] = 0 - self.allAttr[GConst.ATTR_TYPE.atk] = 0 + self.allAttr[GConst.ATTR_TYPE.atk_red] = 0 + self.allAttr[GConst.ATTR_TYPE.atk_yellow] = 0 + self.allAttr[GConst.ATTR_TYPE.atk_green] = 0 + self.allAttr[GConst.ATTR_TYPE.atk_blue] = 0 + self.allAttr[GConst.ATTR_TYPE.atk_purple] = 0 end function HeroEntity:setLv(lv) @@ -69,7 +73,12 @@ end function HeroEntity:updateBaseAttr() self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = self:getCfgHp() - self.baseAttrOriginal[GConst.ATTR_TYPE.atk] = self:getCfgAtk() + self.baseAttrOriginal[GConst.ATTR_TYPE.atk_red] = 0 + self.baseAttrOriginal[GConst.ATTR_TYPE.atk_yellow] = 0 + self.baseAttrOriginal[GConst.ATTR_TYPE.atk_green] = 0 + self.baseAttrOriginal[GConst.ATTR_TYPE.atk_blue] = 0 + self.baseAttrOriginal[GConst.ATTR_TYPE.atk_purple] = 0 + self.baseAttrOriginal[GConst.ATTR_TYPE[GConst.MATCH_ATTACK_NAME[self.config.position]]] = self:getCfgAtk() end function HeroEntity:getCfgHp(lv)