|
|
@@ -277,13 +277,13 @@ function getCombatObjList(human, side, args)
|
|
|
end
|
|
|
|
|
|
print("[getCombatObjList] 进攻方 获取人物对战列表")
|
|
|
- local objList, helpList, rolebase, formation,jiban = CombatLogic.getHumanObjList(human, CombatDefine.COMBAT_TYPE34)
|
|
|
+ local objList, helpList, rolebase, formation,jiban, elfList = CombatLogic.getHumanObjList(human, CombatDefine.COMBAT_TYPE34)
|
|
|
if not objList or nil == _G.next(objList) then
|
|
|
print("[getCombatObjList] 没有获取到对应的进攻方防守阵容,取默认对战阵容")
|
|
|
- objList, helpList, rolebase, formation,jiban = CombatLogic.getHumanObjList(human, CombatDefine.COMBAT_TYPE1)
|
|
|
+ objList, helpList, rolebase, formation,jiban, elfList = CombatLogic.getHumanObjList(human, CombatDefine.COMBAT_TYPE1)
|
|
|
end
|
|
|
|
|
|
- return objList, helpList, rolebase, formation,jiban
|
|
|
+ return objList, helpList, rolebase, formation,jiban, elfList
|
|
|
end
|
|
|
|
|
|
-- 获取机器人对应战斗ID
|
|
|
@@ -335,6 +335,14 @@ function onFightEnd(human, result, combatType, defUuid, combatInfo)
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+ -- 精灵 造成伤害
|
|
|
+ for _,pos in ipairs(CombatDefine.SIDE2ELFPOS[CombatDefine.ATTACK_SIDE]) do
|
|
|
+ local elf = combatInfo.elfList and combatInfo.elfList[pos]
|
|
|
+ if elf then
|
|
|
+ atkHurt = atkHurt + elf.result[1]
|
|
|
+ end
|
|
|
+ end
|
|
|
+
|
|
|
local nNowDamage = CommonActBoss_GetDamage(human)
|
|
|
nNowDamage = nNowDamage + atkHurt
|
|
|
|