diff --git a/lua/app/module/battle/helper/battle_formula.lua b/lua/app/module/battle/helper/battle_formula.lua index 464da1ee..ad1d09c3 100644 --- a/lua/app/module/battle/helper/battle_formula.lua +++ b/lua/app/module/battle/helper/battle_formula.lua @@ -30,13 +30,13 @@ BattleFormula.calculateFormula = { end end - local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() -- 基础值(攻击 * 技能倍率) + local result = unitComp.unitEntity:getAtk() * buff:getEffectNum() // DEFAULT_FACTOR -- 基础值(攻击 * 技能倍率) result = result * (DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() -- (攻击者元素伤害增加 + 所有伤害增加) - unitComp.unitEntity:getDmgDec() -- (攻击者元素伤害降低 + 所有伤害降低) + targetUnit.unitEntity:getWeakness() -- (受击者受到元素伤害增加 + 受到所有伤害增加) - targetUnit.unitEntity:getDecDmg() -- (受击者受到元素伤害降低 + 受到所有伤害降低) - + skillPAdd) // DEFAULT_FACTOR -- 技能增伤百分比 + + skillPAdd) // DEFAULT_FACTOR -- 技能增伤百分比 result = result + skillFixedAdd -- 固定值 -- 暴击 diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua index e50bc7fd..b9d4b0c9 100644 --- a/lua/app/userdata/battle/battle_base_data.lua +++ b/lua/app/userdata/battle/battle_base_data.lua @@ -688,6 +688,12 @@ function BattleBaseData:initHeroData(formation) ---- 攻击力 for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do unitData.attr[attrName] = heroEntity:getAttrValue(attrName) + local atkAddName = GConst.MATCH_ATTACK_ADD_NAME[matchType] + if atkAddName then + unitData.attr[attrName] = unitData.attr[attrName] + heroEntity:getAttrValue(atkAddName) + end + + unitData.attr[attrName] = unitData.attr[attrName] // DEFAULT_FACTOR end ---- 暴击率