Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
b67066cc66
|
|
@ -562,14 +562,14 @@ function ExpeditionMainPanel:OnClose()
|
||||||
timer2:Stop()
|
timer2:Stop()
|
||||||
timer2 = nil
|
timer2 = nil
|
||||||
end
|
end
|
||||||
if self.liveNode then
|
|
||||||
self.liveNode:OnClose()
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function ExpeditionMainPanel:OnDestroy()
|
function ExpeditionMainPanel:OnDestroy()
|
||||||
|
|
||||||
|
if self.liveNode then
|
||||||
|
self.liveNode:OnClose()
|
||||||
|
end
|
||||||
--if live2dList and #live2dList > 0 then
|
--if live2dList and #live2dList > 0 then
|
||||||
-- for i = 1, #live2dList do
|
-- for i = 1, #live2dList do
|
||||||
-- poolManager:UnLoadLive(live2dList[i][1], live2dList[i][2], PoolManager.AssetType.GameObject)
|
-- poolManager:UnLoadLive(live2dList[i][1], live2dList[i][2], PoolManager.AssetType.GameObject)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue