diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 2b9586c87d..91c780e4f7 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -29,7 +29,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2397075533203636806} - {fileID: 1643314764344359615} - {fileID: 5465567569812857081} - {fileID: 9011644464351372673} @@ -19297,7 +19296,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 4773899770423882129} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20607,7 +20606,7 @@ RectTransform: - {fileID: 1318734297380065345} - {fileID: 7636132594834853689} m_Father: {fileID: 4773899770423882129} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -24165,41 +24164,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4744369471951006384 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2397075533203636806} - m_Layer: 5 - m_Name: live - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2397075533203636806 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4744369471951006384} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4773899770423882129} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4794720836169568682 GameObject: m_ObjectHideFlags: 0 @@ -41644,7 +41608,7 @@ RectTransform: - {fileID: 1896747530736212666} - {fileID: 943129105371628370} m_Father: {fileID: 4773899770423882129} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -43526,7 +43490,7 @@ RectTransform: - {fileID: 2322210039407364533} - {fileID: 7678256388184617692} m_Father: {fileID: 4773899770423882129} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index 2806df812d..0f3413595e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -89,8 +89,6 @@ function QianKunBox:BindEvent() self.btnBack:SetActive(true) self.tabList:SetActive(true) self.bottomBar:SetActive(true) - poolManager:UnLoadLive(self.livename, self.liveNode) - self.livename = nil end) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua index cf08437ca4..f3b3965d82 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua @@ -64,8 +64,6 @@ function this:InitComponent(gameObject) this.shop = Util.GetGameObject(this.gameObject,"shop") this.shopBack = Util.GetGameObject(this.shop,"shopBack/btnBack") this.content = Util.GetGameObject(this.shop,"content") - this.livename=nil - this.live = Util.GetGameObject(this.shop,"live") --bottomArea this.bottom = Util.GetGameObject(this.gameObject,"bottom") @@ -111,8 +109,6 @@ function SheJiDaDian:BindEvent() this.btnBack:SetActive(false) this.tabList:SetActive(false) this.bottomBar:SetActive(false) - this.livename = "live2d_ui_h_52_xx_pf1" - this.liveNode = poolManager:LoadLive(this.livename, this.live.transform, Vector3.New(0.25,0.25,0.25), Vector3.New(123,214,0)) this:StoreShow()--商店 end) @@ -122,8 +118,6 @@ function SheJiDaDian:BindEvent() this.btnBack:SetActive(true) this.tabList:SetActive(true) this.bottomBar:SetActive(true) - poolManager:UnLoadLive(this.livename, this.liveNode) - this.livename = nil end) Util.AddClick(this.btnDetail,function()