[战斗]=====灵兽金乌技能修改提交
parent
91531e00b0
commit
6d86795403
|
|
@ -290,6 +290,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
camp = 0,
|
camp = 0,
|
||||||
type = 1,
|
type = 1,
|
||||||
quality = 0,
|
quality = 0,
|
||||||
|
job=HeroConfig[rid].Job,
|
||||||
element = HeroConfig[rid].PropertyName,
|
element = HeroConfig[rid].PropertyName,
|
||||||
professionId = HeroConfig[rid].Profession,
|
professionId = HeroConfig[rid].Profession,
|
||||||
passivity = { },
|
passivity = { },
|
||||||
|
|
|
||||||
|
|
@ -46,30 +46,27 @@ local _ConditionConfig = {
|
||||||
return isRoundOk and isRandomOk
|
return isRoundOk and isRandomOk
|
||||||
end,
|
end,
|
||||||
|
|
||||||
[4] = function(skill, condition) --4:行动单位的职业设定 【比较类型】 N
|
[4] = function(skill, condition) --4:场上燃烧目标的数量 【比较类型】 N
|
||||||
local conId = condition[1]
|
local conId = condition[1]
|
||||||
local comType = condition[2]
|
local comType = condition[2]
|
||||||
local comValue = condition[3]
|
local comValue = condition[3]
|
||||||
-- 当前释放技能的单位的职业
|
-- 当前释放技能的单位的职业
|
||||||
local professionId = skill.owner.professionId
|
local professionId = skill.owner.professionId
|
||||||
local skillCastEnd=function(skill2)
|
|
||||||
if skill2.owner.camp==skill.owner.camp then
|
local list = RoleManager.Query(function(role)
|
||||||
local list=skill2:GetDirectTargetsNoMiss()
|
return role.camp ~= skill.owner.camp
|
||||||
|
end)
|
||||||
if not list then
|
if not list then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
local num=0
|
local num=0
|
||||||
for key, value in pairs(list) do
|
for key, value in pairs(list) do
|
||||||
local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == 1 and buff.caster==skill2.owner and buff.startRound == BattleLogic.GetCurRound() end)
|
local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == 1 end)
|
||||||
if isHave then
|
if isHave then
|
||||||
return true
|
num=num+1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return BattleUtil.CompareValue(num, comValue, comType)
|
||||||
end
|
|
||||||
end
|
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.SkillCastEnd,skillCastEnd)
|
|
||||||
return skillCastEnd
|
|
||||||
end,
|
end,
|
||||||
[5] = function(skill, condition) --5:敌方上场神将数量 且概率(万分比)
|
[5] = function(skill, condition) --5:敌方上场神将数量 且概率(万分比)
|
||||||
local conId = condition[1]
|
local conId = condition[1]
|
||||||
|
|
@ -125,7 +122,6 @@ function MCondition.CheckCondition(skill, condition)
|
||||||
if not condition then
|
if not condition then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
LogError("skill"..skill.id)
|
|
||||||
local conId = condition[1]
|
local conId = condition[1]
|
||||||
local comType = condition[2]
|
local comType = condition[2]
|
||||||
local comValue = condition[3]
|
local comValue = condition[3]
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ local _TriggerConfig = {
|
||||||
triggerFunc = function(skill, ...)
|
triggerFunc = function(skill, ...)
|
||||||
local args = {...}
|
local args = {...}
|
||||||
local castSkill = args[1]
|
local castSkill = args[1]
|
||||||
return castSkill.owner.camp == skill.owner.camp
|
return castSkill.owner.camp == skill.owner.camp and castSkill.owner.job==2 and (castSkill.type==BattleSkillType.DeadSkill or castSkill.type==BattleSkillType.Extra or castSkill.type==BattleSkillType.Special)
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,7 @@ function RoleLogic:Init(uid, data, position)
|
||||||
self.name = data.name
|
self.name = data.name
|
||||||
self.element = data.element
|
self.element = data.element
|
||||||
self.professionId = data.professionId
|
self.professionId = data.professionId
|
||||||
|
self.job=data.job
|
||||||
self.star = data.star or 1
|
self.star = data.star or 1
|
||||||
-- LogError("英雄uid".. self.roleId .." " .. self.star)
|
-- LogError("英雄uid".. self.roleId .." " .. self.star)
|
||||||
self.shield:Clear() --护盾列表
|
self.shield:Clear() --护盾列表
|
||||||
|
|
|
||||||
|
|
@ -157,15 +157,22 @@ function this.Update()
|
||||||
-- 检测一下轮转
|
-- 检测一下轮转
|
||||||
this.IsSkilling = false
|
this.IsSkilling = false
|
||||||
-- this.CheckTurnRound()
|
-- this.CheckTurnRound()
|
||||||
-- 检测一次灵兽技能
|
if this.MonsterCheckFunc then
|
||||||
this.CheckMonsterSkill(this.MonsterCheckFunc)
|
this.CheckMonsterSkill(this.MonsterCheckFunc)
|
||||||
|
else
|
||||||
|
this.CheckMonsterSkill(this.CheckTurnRound)
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
-- 检测一下轮转
|
-- 检测一下轮转
|
||||||
this.IsSkilling = false
|
this.IsSkilling = false
|
||||||
-- this.CheckTurnRound()
|
-- this.CheckTurnRound()
|
||||||
-- 检测一次灵兽技能
|
-- 检测一次灵兽技能
|
||||||
this.CheckMonsterSkill(this.MonsterCheckFunc)
|
if this.MonsterCheckFunc then
|
||||||
|
this.CheckMonsterSkill(this.MonsterCheckFunc)
|
||||||
|
else
|
||||||
|
this.CheckMonsterSkill(this.CheckTurnRound)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -308,6 +308,7 @@ function this.RefreshFightData(type)
|
||||||
data.skinId=role.skinId
|
data.skinId=role.skinId
|
||||||
LogError("skinId==="..role.skinId)
|
LogError("skinId==="..role.skinId)
|
||||||
data.type = 1
|
data.type = 1
|
||||||
|
data.job=roleData.Job
|
||||||
local paskill = string.split(role.passivity, "#")
|
local paskill = string.split(role.passivity, "#")
|
||||||
data.passivity = BattleManager.GetPassivityData(paskill) or {}
|
data.passivity = BattleManager.GetPassivityData(paskill) or {}
|
||||||
data.property = {}
|
data.property = {}
|
||||||
|
|
@ -364,6 +365,7 @@ end
|
||||||
function this.ApplyMonsterData(data)
|
function this.ApplyMonsterData(data)
|
||||||
monsterTestData = data
|
monsterTestData = data
|
||||||
this.RefreshFightData(2)
|
this.RefreshFightData(2)
|
||||||
|
return true
|
||||||
end
|
end
|
||||||
function this.ClearMonsterData(camp)
|
function this.ClearMonsterData(camp)
|
||||||
if camp == 0 then
|
if camp == 0 then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue