Merge branch 'dev_oneDis' into onepiece_demo
commit
e93a0dbf49
|
@ -12725,12 +12725,12 @@ local passivityList = {
|
|||
[480]=function(role,args,id,judge)
|
||||
local num=args[1]
|
||||
local onRoundChange=function(round)
|
||||
if round<2 then
|
||||
if round<1 then
|
||||
return
|
||||
end
|
||||
role:AddSkill(BattleSkillType.Special, false, false, nil,false)
|
||||
role:AddSkill(BattleSkillType.Special, false,true, nil,true)
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEnd, onRoundChange,nil,nil,role)
|
||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundEndBefore, onRoundChange,nil,nil,role)
|
||||
end,
|
||||
--释放技能如果造成减怒,对目标造成 减除怒气*属性[a][b]%的伤害,每回合最多触发[c]次
|
||||
--a[int],b[float],c[int]
|
||||
|
|
|
@ -286,6 +286,7 @@ function BattleLogic.TurnRound(debugTurn)
|
|||
return
|
||||
else
|
||||
-- 上一轮结束
|
||||
BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundEndBefore, CurRound)
|
||||
BattleLogic.Event:DispatchEvent(BattleEventName.BattleRoundEnd, CurRound)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -54,7 +54,7 @@ BattleEventName = {
|
|||
BattleRoundStart = indexAdd(),
|
||||
BattleRoundChange = indexAdd(),
|
||||
BattleRoundEnd = indexAdd(),
|
||||
|
||||
BattleRoundEndBefore = indexAdd(),
|
||||
RoleBeDamaged = indexAdd(),
|
||||
RoleDamage = indexAdd(),
|
||||
RoleBeDamagedBefore = indexAdd(),
|
||||
|
|
Loading…
Reference in New Issue