Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6bf1306ba5
|
@ -96,6 +96,7 @@ function PlayerLiveView:OnOpen(scale,pos,dir)
|
|||
self:SetWalkDir(dir)
|
||||
end
|
||||
self.selfTagParent:SetActive(false)
|
||||
self.liveParentCanvas.overrideSorting = false
|
||||
end
|
||||
local sortingorder=0
|
||||
|
||||
|
@ -336,8 +337,9 @@ function PlayerLiveView:OnClose()
|
|||
if self.titleLive then
|
||||
SubUIManager.Close(self.titleLive)
|
||||
end
|
||||
destroy(self.SelfTagGo)
|
||||
if self.SelfTagGo then
|
||||
poolManager:UnLoadAsset("fx_qufenzhiji",self.SelfTagGo, PoolManager.AssetType.GameObject)
|
||||
destroy(self.SelfTagGo)
|
||||
self.SelfTagGo = nil
|
||||
end
|
||||
end
|
||||
|
@ -410,7 +412,8 @@ end
|
|||
|
||||
function PlayerLiveView:SetSelfTag()
|
||||
if self.SelfTagGo then
|
||||
poolManager:UnLoadAsset("fx_qufenzhiji",self.SelfTagGo, PoolManager.AssetType.GameObject)
|
||||
-- poolManager:UnLoadAsset("fx_qufenzhiji",self.SelfTagGo, PoolManager.AssetType.GameObject)
|
||||
destroy(self.SelfTagGo)
|
||||
self.SelfTagGo = nil
|
||||
end
|
||||
self.SelfTagGo = poolManager:LoadAsset("fx_qufenzhiji", PoolManager.AssetType.GameObject)
|
||||
|
@ -446,7 +449,7 @@ function PlayerLiveView:SetEffectScale(effectScale)
|
|||
isScale = true
|
||||
end
|
||||
if isScale then
|
||||
self.titleLive.transform.localScale = Vector3.one * (self.scale or 1)
|
||||
self.SelfTagGo.transform.localScale = Vector3.one * (self.scale or 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue