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

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

Browse Source
This commit is contained in:
xiekaidong 2023-04-14 15:18:17 +08:00
commit ab14bce85c
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lua/app/global/global_const.lua
View File

@ -396,9 +396,21 @@ GConst.ENTITY_TYPE = {
JEWELRY_ENTITY = 3, 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 = { GConst.ATTR_TYPE = {
hp = 1, hp = 1,
atk = 2, atk_red = 2,
atk_yellow = 3,
atk_green = 4,
atk_blue = 5,
atk_purple = 6
} }
GConst.GAMEOBJECT_LAYER = { GConst.GAMEOBJECT_LAYER = {

1
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -252,6 +252,7 @@ function BattleUnitComp:updateNormalAttack(dt)
return return
else -- 继续攻击 else -- 继续攻击
self.attackTime = 0 self.attackTime = 0
self.currAttackKeyTime = 0.3
local skill = self.unitEntity:getNormalSkill() local skill = self.unitEntity:getNormalSkill()
local attackName = skill:getRandomNormalAttackName() local attackName = skill:getRandomNormalAttackName()
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)

15
lua/app/userdata/battle/battle_data.lua
View File

@ -311,7 +311,11 @@ function BattleData:initHeroData()
attr = { attr = {
hp = hp, hp = hp,
max_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) Logger.printTable(unitData)
@ -328,16 +332,21 @@ end
function BattleData:addMonster(monsterId) function BattleData:addMonster(monsterId)
local monsterInfo = ConfigManager:getConfig("monster")[monsterId] local monsterInfo = ConfigManager:getConfig("monster")[monsterId]
local hp = monsterInfo.hp // DEFAULT_FACTOR local hp = monsterInfo.hp // DEFAULT_FACTOR
local atk = monsterInfo.atk // DEFAULT_FACTOR
local unitData = { local unitData = {
id = monsterId, id = monsterId,
modelId = monsterInfo.model_id, modelId = monsterInfo.model_id,
matchType = 1, matchType = 0,
normalSkill = monsterInfo.hurt_skill, normalSkill = monsterInfo.hurt_skill,
activeSkills = monsterInfo.skill, activeSkills = monsterInfo.skill,
attr = { attr = {
hp = hp, hp = hp,
max_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) return self.defTeam:addUnit(unitData)

13
lua/app/userdata/hero/hero_entity.lua
View File

@ -16,7 +16,11 @@ end
function HeroEntity:initAttr() function HeroEntity:initAttr()
self.allAttr[GConst.ATTR_TYPE.hp] = 0 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 end
function HeroEntity:setLv(lv) function HeroEntity:setLv(lv)
@ -69,7 +73,12 @@ end
function HeroEntity:updateBaseAttr() function HeroEntity:updateBaseAttr()
self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = self:getCfgHp() 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 end
function HeroEntity:getCfgHp(lv) function HeroEntity:getCfgHp(lv)