puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-04-19 17:44:26 +08:00
commit 06d96cefd4
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -52,6 +52,10 @@ function BattleUnitComp:getIsBoss()
return self.unitEntity:getIsBoss() return self.unitEntity:getIsBoss()
end end
function BattleUnitComp:getIsLimit()
return self.unitEntity:getIsLimit()
end
function BattleUnitComp:setTeam(team) function BattleUnitComp:setTeam(team)
self.team = team self.team = team
end end

18
lua/app/module/battle/team/battle_team.lua
View File

@ -53,6 +53,9 @@ function BattleTeam:useNormalSkill(matchType, count, callback)
end end
if unit == nil then if unit == nil then
return callback() return callback()
end
if unit:getIsLimit() then
return callback()
end end
self.mainUnit = unit self.mainUnit = unit
self.battleController:setIsPauseHpProgress(true) self.battleController:setIsPauseHpProgress(true)
@ -70,6 +73,9 @@ function BattleTeam:useSkill(matchType, count, callback)
end end
if unit == nil then if unit == nil then
return callback() return callback()
end
if unit:getIsLimit() then
return callback()
end end
self.mainUnit = unit self.mainUnit = unit
self.battleController:setIsPauseHpProgress(true) self.battleController:setIsPauseHpProgress(true)
@ -79,6 +85,12 @@ function BattleTeam:useSkill(matchType, count, callback)
end end
function BattleTeam:useAssistingSkill(assistingList, callback) function BattleTeam:useAssistingSkill(assistingList, callback)
if self.mainUnit == nil then
return callback()
end
if self.mainUnit:getIsLimit() then
return callback()
end
local count = #assistingList local count = #assistingList
if count <= 0 then if count <= 0 then
return callback() return callback()
@ -103,6 +115,12 @@ function BattleTeam:useAssistingSkill(assistingList, callback)
end end
function BattleTeam:mainUnitUseAllSkills(callback) function BattleTeam:mainUnitUseAllSkills(callback)
if self.mainUnit == nil then
return callback()
end
if self.mainUnit:getIsLimit() then
return callback()
end
self.battleController:setIsPauseHpProgress(true) self.battleController:setIsPauseHpProgress(true)
self.mainUnit:beforeAttack() self.mainUnit:beforeAttack()
self.mainUnit:resetBeforeAttack() self.mainUnit:resetBeforeAttack()