From 14254ef92fc54f8a5b095c60450540c16fdda0c8 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 8 Apr 2025 16:28:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Arena/View/ArenaMainPanel_ArenaView.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaMainPanel_ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaMainPanel_ArenaView.lua index 2319842f4..c55c3f2b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaMainPanel_ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaMainPanel_ArenaView.lua @@ -208,7 +208,7 @@ end --界面打开时调用(用于子类重写) function ArenaMainPanel_ArenaView:OnOpen(...) CheckRedPointStatus(RedPointType.Arena_Record) - this.finalTarget:SetActive(false) + this.finalTarget:SetActive(true) isFistChallenge = true this.RefreshBaseData() this.RefreshEnemyData() From f4b3efa71082270944aa936e86fdf07e3f581970 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 8 Apr 2025 16:29:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Arena/ArenaMainPanel.prefab | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab index 7b9b198ab..6999dc947 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaMainPanel.prefab @@ -1544,7 +1544,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4544204433253627524 RectTransform: m_ObjectHideFlags: 0 @@ -2200,7 +2200,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3872364866044683269 RectTransform: m_ObjectHideFlags: 0 @@ -2224,11 +2224,11 @@ RectTransform: - {fileID: 7228904882578073286} - {fileID: 5451335755413107879} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 9 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 1246} + m_AnchoredPosition: {x: 0, y: 1073} m_SizeDelta: {x: 1080, y: 338} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2710044437861179820 @@ -2922,11 +2922,11 @@ RectTransform: - {fileID: 7088526990043221610} - {fileID: 2656040642083335424} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 286, y: 1260} + m_AnchoredPosition: {x: 286, y: 1363} m_SizeDelta: {x: 500, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &803002120109926675 @@ -3543,7 +3543,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &95030326043338012 RectTransform: m_ObjectHideFlags: 0 @@ -5218,7 +5218,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3578150367180706581 RectTransform: m_ObjectHideFlags: 0 @@ -5951,7 +5951,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3871195050179854763 RectTransform: m_ObjectHideFlags: 0 @@ -11769,7 +11769,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4440547701495113440 RectTransform: m_ObjectHideFlags: 0 @@ -12691,6 +12691,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2605766320359881990} + - {fileID: 3872364866044683269} - {fileID: 6747383585631568983} - {fileID: 8269607837423472147} - {fileID: 2263176850182460070} @@ -12699,7 +12700,6 @@ RectTransform: - {fileID: 639928760474552200} - {fileID: 630528462225347862} - {fileID: 124728646577140780} - - {fileID: 3872364866044683269} - {fileID: 8175236494193881612} m_Father: {fileID: 6384942486344749378} m_RootOrder: 0 @@ -12959,11 +12959,11 @@ RectTransform: - {fileID: 8506047863856818406} - {fileID: 8093553843441027983} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 1152} + m_AnchoredPosition: {x: 0, y: 1199} m_SizeDelta: {x: 1080, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2094360105482459660 @@ -15781,7 +15781,7 @@ RectTransform: - {fileID: 2949485494202258673} - {fileID: 6578412425515057176} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -19974,7 +19974,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8506047863856818406 RectTransform: m_ObjectHideFlags: 0 @@ -21673,11 +21673,11 @@ RectTransform: m_Children: - {fileID: 8330831586880696320} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 306, y: 1002} + m_AnchoredPosition: {x: -215, y: 1276} m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2945189976526685017 @@ -24963,11 +24963,11 @@ RectTransform: m_Children: - {fileID: 899944592038548657} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 464, y: 1002} + m_AnchoredPosition: {x: -57, y: 1276} m_SizeDelta: {x: 124, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1775291208436203954 @@ -28826,11 +28826,11 @@ RectTransform: m_LocalScale: {x: 1.3, y: 1.3, z: 1} m_Children: [] m_Father: {fileID: 5213783082762413727} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 147, y: 1002} + m_AnchoredPosition: {x: -374, y: 1276} m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5179213129289897361 @@ -30852,7 +30852,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8945621807648118353 RectTransform: m_ObjectHideFlags: 0 @@ -34145,7 +34145,7 @@ RectTransform: - {fileID: 3405726735469323330} - {fileID: 1104514486939074799} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -34806,7 +34806,7 @@ RectTransform: 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: -418, y: 253} + m_AnchoredPosition: {x: -418, y: 269} m_SizeDelta: {x: 184, y: 214} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6949796990793658234 @@ -34947,7 +34947,7 @@ RectTransform: - {fileID: 5789570667291909646} - {fileID: 8349993208320146138} m_Father: {fileID: 5213783082762413727} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} From 457f03c0131b462e8898e5ce02e47d8683bbc811 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Tue, 8 Apr 2025 18:05:16 +0800 Subject: [PATCH 3/3] 1 --- .../~Lua/Modules/PowerCenter/PowerCenterPanel.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/PowerCenter/PowerCenterPanel.lua b/Assets/ManagedResources/~Lua/Modules/PowerCenter/PowerCenterPanel.lua index d848ae795..db3696785 100644 --- a/Assets/ManagedResources/~Lua/Modules/PowerCenter/PowerCenterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/PowerCenter/PowerCenterPanel.lua @@ -93,6 +93,12 @@ end --界面关闭时调用(用于子类重写) function PowerCenterPanel:OnClose() + if liveObj and liveData then + UnLoadHerolive(liveData, liveObj,true) + Util.ClearChild(this.livePos.transform) + liveObj = nil + liveData = nil + end end local scrollItems = {} @@ -101,7 +107,7 @@ function PowerCenterPanel:OnDestroy() SubUIManager.Close(this.UpView) SubUIManager.Close(this.PlayerHeadFrameView) if liveObj and liveData then - UnLoadHerolive(liveData, liveObj) + UnLoadHerolive(liveData, liveObj,true) Util.ClearChild(this.livePos.transform) liveObj = nil liveData = nil @@ -116,7 +122,7 @@ end function this.SetHeroLive(data) if liveObj and liveData then - UnLoadHerolive(liveData, liveObj) + UnLoadHerolive(liveData, liveObj,true) Util.ClearChild(this.livePos.transform) liveObj = nil liveData = nil