From 3a481d6d5f9a3a844735a0caca92de6973c61a41 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 6 Nov 2020 21:05:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9A=AE=E8=82=A4]=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleInfoPanel.prefab | 10 +++++----- .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 9 ++++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab index 53f38f8e1c..4e8d2c6840 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab @@ -63737,7 +63737,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3651492194596798470 RectTransform: m_ObjectHideFlags: 0 @@ -79779,7 +79779,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4414717549777261857 RectTransform: m_ObjectHideFlags: 0 @@ -82791,7 +82791,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6944843860791029965 RectTransform: m_ObjectHideFlags: 0 @@ -84645,7 +84645,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6109564688861603607 RectTransform: m_ObjectHideFlags: 0 @@ -85455,7 +85455,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &165780861447383144 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index b94ecb77ff..522a387431 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -588,15 +588,15 @@ end --界面关闭时调用(用于子类重写) function RoleInfoPanel:OnClose() if this.leftLiveObj and leftHeroData then - poolManager:UnLoadLive(leftHeroData.live, this.leftLiveObj) + poolManager:UnLoadLive(this.leftLiveObj.name, this.leftLiveObj) this.leftLiveObj = nil end if this.rightLiveObj and rightHeroData then - poolManager:UnLoadLive(rightHeroData.live, this.rightLiveObj) + poolManager:UnLoadLive(this.rightLiveObj.name, this.rightLiveObj) this.rightLiveObj = nil end if this.curLiveObj and curHeroData then - poolManager:UnLoadLive(curHeroData.live, this.curLiveObj) + poolManager:UnLoadLive(this.curLiveObj.name, this.curLiveObj) this.curLiveObj = nil end this.leftBtn:GetComponent("Button").enabled = true @@ -605,6 +605,9 @@ function RoleInfoPanel:OnClose() this.PageList[_CurPageIndex]:OnClose() this.PageList[_CurPageIndex].gameObject:SetActive(false) end + Util.ClearChild(this.curObj.transform) + Util.ClearChild(this.leftObj.transform) + Util.ClearChild(this.rightObj.transform) end