【战斗】修复凤凰技能第二回合无法触发的问题,修复战斗开始时界面显示回合数错误的问题
parent
8b4aa8ec10
commit
6de92f3692
|
|
@ -74,7 +74,7 @@ local _TriggerConfig = {
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
[10] = {--10:回合开始前
|
[10] = {--10:回合开始前
|
||||||
event = BattleEventName.BattleRoundEnd,
|
event = BattleEventName.BattleRoundStart,
|
||||||
triggerFunc = function(skill, ...)
|
triggerFunc = function(skill, ...)
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -280,6 +280,7 @@ end
|
||||||
function this.InitOption()
|
function this.InitOption()
|
||||||
--显示倒计时
|
--显示倒计时
|
||||||
local curRound, maxRound = BattleLogic.GetCurRound()
|
local curRound, maxRound = BattleLogic.GetCurRound()
|
||||||
|
curRound = curRound <= 0 and 1 or curRound -- 最小显示第一回合
|
||||||
this.roundText.text = string.format(Language[10252], curRound, maxRound)
|
this.roundText.text = string.format(Language[10252], curRound, maxRound)
|
||||||
hadCounted = 0
|
hadCounted = 0
|
||||||
|
|
||||||
|
|
@ -508,6 +509,7 @@ function this.OnRoundChanged(round)
|
||||||
-- body
|
-- body
|
||||||
--显示波次
|
--显示波次
|
||||||
local curRound, maxRound = BattleLogic.GetCurRound()
|
local curRound, maxRound = BattleLogic.GetCurRound()
|
||||||
|
curRound = curRound <= 0 and 1 or curRound -- 最小显示第一回合
|
||||||
this.roundText.text = string.format(Language[10252], curRound, maxRound)
|
this.roundText.text = string.format(Language[10252], curRound, maxRound)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -672,12 +672,10 @@ function this.SetRoleHighLight(caster, targets, func)
|
||||||
max = max + 1
|
max = max + 1
|
||||||
role:SetHighLight(false, 0.95, 0.2, _Count)
|
role:SetHighLight(false, 0.95, 0.2, _Count)
|
||||||
end
|
end
|
||||||
LogPink("max1 = "..max)
|
|
||||||
if caster and caster.role.type == BattleUnitType.Role then
|
if caster and caster.role.type == BattleUnitType.Role then
|
||||||
max = max - 1
|
max = max - 1
|
||||||
caster:SetHighLight(true, 1.5, 0.2)
|
caster:SetHighLight(true, 1.5, 0.2)
|
||||||
end
|
end
|
||||||
LogPink("max2 = "..max)
|
|
||||||
if targets then
|
if targets then
|
||||||
for _, data in ipairs(targets) do
|
for _, data in ipairs(targets) do
|
||||||
if caster ~= tbRole[data] then
|
if caster ~= tbRole[data] then
|
||||||
|
|
@ -686,7 +684,6 @@ function this.SetRoleHighLight(caster, targets, func)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogPink("max3 = "..max)
|
|
||||||
if max == 0 then
|
if max == 0 then
|
||||||
if func then func() end
|
if func then func() end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue