战斗同步

back_recharge
lvxinran 2019-10-28 12:05:04 +08:00
parent 6abcb5ce6b
commit a35eefefac
2 changed files with 9 additions and 8 deletions

View File

@ -271,12 +271,14 @@ function BattleUtil.CalDamage(atkRole, defRole, damageType, baseFactor, ignoreDe
(1 + atkRole:GetRoleData(RoleDataName.ElementDamageBocusFactor) - defRole:GetRoleData(elementDamageReduceFactor)))
--属性克制关系:光暗互克,地克风克水克火克地
local restrain = atkRole.element == 1 and defRole.element == 4 or
atkRole.element == 4 and defRole.element == 2 or
atkRole.element == 2 and defRole.element == 3 or
atkRole.element == 3 and defRole.element == 1 or
atkRole.element == 5 and defRole.element == 6 or
atkRole.element == 6 and defRole.element == 5
local atkEle = atkRole.roleData.element
local defEle = defRole.roleData.element
local restrain = atkEle == 1 and defEle == 4 or
atkEle == 4 and defEle == 2 or
atkEle == 2 and defEle == 3 or
atkEle == 3 and defEle == 1 or
atkEle == 5 and defEle == 6 or
atkEle == 6 and defEle == 5
baseDamage = restrain and floor(max(baseDamage*1.5, 0.1*attack)) or floor(max(baseDamage, 0.1*attack))
for i=1, atkRole.exCalDmgList.size do

View File

@ -41,7 +41,7 @@ local skillPool = BattleObjectPool.New(function ()
end)
function RoleLogic.New()
local instance = {uid=0,roleData=0,data=RoleData.New(),camp=0,name=0,roleType=0,aiIndex=1,position=0,sp=0,spPass=0,
local instance = {uid=0,roleData=0,data=RoleData.New(),camp=0,name=0,aiIndex=1,position=0,sp=0,spPass=0,
shield=BattleList.New(),
exCalDmgList=BattleList.New(),
proTranList=BattleList.New(),
@ -61,7 +61,6 @@ function RoleLogic:Init(uid, data, position)
self.camp = data.camp --阵营 0我方 1敌方
self.name = data.name
self.roleType = 1 --阵营 1普通 2Boss 3召唤物
self.shield:Clear() --护盾列表
self.exCalDmgList:Clear() --额外计算伤害列表