Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev
# Conflicts: # lua/app/ui/battle/battle_ui.lua
This commit is contained in:
commit
eb17b324c4
@ -15,6 +15,10 @@ function BattleUI:getPrefabPath()
|
|||||||
return "assets/prefabs/ui/battle/battle_ui.prefab"
|
return "assets/prefabs/ui/battle/battle_ui.prefab"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function BattleUI:onClose()
|
||||||
|
self:clear()
|
||||||
|
end
|
||||||
|
|
||||||
function BattleUI:onLoadRootComplete()
|
function BattleUI:onLoadRootComplete()
|
||||||
self:_display()
|
self:_display()
|
||||||
self:_addListeners()
|
self:_addListeners()
|
||||||
@ -407,4 +411,14 @@ function BattleUI:doCachePopAni(skillInfo, callback)
|
|||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function BattleUI:clear()
|
||||||
|
if self.alreadyClear then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
self.alreadyClear = true
|
||||||
|
if self.battleNode then
|
||||||
|
self.battleNode:removeAllChildren()
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
return BattleUI
|
return BattleUI
|
||||||
Loading…
x
Reference in New Issue
Block a user