【战斗】==========除死亡技能外,混乱后的所有技能都变为混乱普攻
parent
9362f341a6
commit
55972b70d7
|
@ -384,14 +384,16 @@ end
|
||||||
--加入额外技能,用于额外释放技能 by:王振兴
|
--加入额外技能,用于额外释放技能 by:王振兴
|
||||||
function RoleLogic:InsertExtraSkill(id,type)
|
function RoleLogic:InsertExtraSkill(id,type)
|
||||||
local effectData=BattleUtil.GetExtraSkillbyId(id)
|
local effectData=BattleUtil.GetExtraSkillbyId(id)
|
||||||
|
|
||||||
if effectData then
|
if effectData then
|
||||||
local skillType=BattleSkillType.Extra
|
local skillType=BattleSkillType.Extra
|
||||||
--如果type为1则按绝技处理,不为1的话按额外技能处理(额外技能因为被动判断会判断是否是绝技类型,所以不会触发)
|
--如果type为1则按绝技处理,不为1的话按额外技能处理(额外技能因为被动判断会判断是否是绝技类型,所以不会触发)
|
||||||
if type==1 then
|
if type==1 then
|
||||||
skillType=BattleSkillType.Special
|
skillType=BattleSkillType.Special
|
||||||
end
|
end
|
||||||
|
|
||||||
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
|
--和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴
|
||||||
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false)
|
SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,true)
|
||||||
BattleLogManager.Log(
|
BattleLogManager.Log(
|
||||||
"Insert Extra Skill",
|
"Insert Extra Skill",
|
||||||
"camp", self.camp,
|
"camp", self.camp,
|
||||||
|
|
|
@ -57,12 +57,20 @@ function this.AddSkill(caster, effectData, type, targets, isAdd, isRage,isTrigge
|
||||||
return skill
|
return skill
|
||||||
end
|
end
|
||||||
-- 插入技能到技能列表首位
|
-- 插入技能到技能列表首位
|
||||||
function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage)
|
function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage,isTriggerJudge)
|
||||||
-- 如果超出最大限制则不再追加技能
|
-- 如果超出最大限制则不再追加技能
|
||||||
if not this.CheckMaxCount() then
|
if not this.CheckMaxCount() then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local skill = skillPool:Get()
|
local skill = skillPool:Get()
|
||||||
|
--角色被混乱后
|
||||||
|
isTriggerJudge=true
|
||||||
|
if caster.ctrl_chaos and type~=BattleSkillType.DeadSkill then
|
||||||
|
type=BattleSkillType.ChaosNormal
|
||||||
|
--混乱普攻使用普攻特效
|
||||||
|
effectData={caster.skill[1],caster.skill[2],caster.skill[3],caster.skill[4],{100001,{1,1,1}}}
|
||||||
|
isTriggerJudge=false
|
||||||
|
end
|
||||||
skill:Init(caster, effectData, type, targets, isAdd, isRage)
|
skill:Init(caster, effectData, type, targets, isAdd, isRage)
|
||||||
if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列
|
if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列
|
||||||
table.insert(this.DeadSkillList, 1, skill)
|
table.insert(this.DeadSkillList, 1, skill)
|
||||||
|
|
Loading…
Reference in New Issue