From d1b84299c25082ba9a8137be55c33ce0338f4f11 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 3 Jan 2022 02:43:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E7=82=B9=E5=87=BB=E5=9C=86=E7=82=B9=E5=BC=B9=E5=87=BA?= =?UTF-8?q?TIPS=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=9C=86=E7=82=B9=E5=BA=94=E5=88=87=E6=8D=A2?= =?UTF-8?q?TIPS=E5=86=85=E5=AE=B9=EF=BC=8C=E8=80=8C=E9=9D=9E=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E4=B9=8B=E5=89=8D=E7=9A=84TIPS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Practice/PracticePanel.prefab | 72 ++++++++++++++----- .../View2/GeneralInfoPopup_PracticeLevel.lua | 4 ++ .../~Lua/Modules/Practice/PracticePanel.lua | 7 ++ 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab index 70b34c0905..5858148ac4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab @@ -4718,7 +4718,7 @@ ParticleSystem: --- !u!199 &7230004319597149783 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9782,7 +9782,7 @@ ParticleSystem: --- !u!199 &1731307604659967522 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14978,7 +14978,7 @@ ParticleSystem: --- !u!199 &984307701635933128 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20004,7 +20004,7 @@ ParticleSystem: --- !u!199 &8722287443315113565 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -26143,7 +26143,7 @@ ParticleSystem: --- !u!199 &5913121696673349157 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -31476,7 +31476,7 @@ ParticleSystem: --- !u!199 &7256114582625987229 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -36640,7 +36640,7 @@ ParticleSystem: --- !u!199 &4616072941791065012 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -42997,7 +42997,7 @@ ParticleSystem: --- !u!199 &4010181141157830801 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47758,7 +47758,7 @@ ParticleSystem: --- !u!199 &4305352798707543493 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -52519,7 +52519,7 @@ ParticleSystem: --- !u!199 &6408994215580448071 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -57280,7 +57280,7 @@ ParticleSystem: --- !u!199 &2189434392852510045 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63400,7 +63400,7 @@ ParticleSystem: --- !u!199 &673420127744576939 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -68205,7 +68205,7 @@ ParticleSystem: --- !u!199 &4960700602042547561 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -69234,6 +69234,8 @@ GameObject: m_Component: - component: {fileID: 9073860018243356351} - component: {fileID: 35816503056969807} + - component: {fileID: 907540646082014141} + - component: {fileID: 445070290652226982} m_Layer: 0 m_Name: Items m_TagString: Untagged @@ -69269,6 +69271,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8579852649922511585} m_CullTransparentMesh: 0 +--- !u!223 &907540646082014141 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8579852649922511585} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &445070290652226982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8579852649922511585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!1 &8675653942684210745 GameObject: m_ObjectHideFlags: 0 @@ -74333,7 +74373,7 @@ ParticleSystem: --- !u!199 &2426256442623294447 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79149,7 +79189,7 @@ ParticleSystem: --- !u!199 &7003735107301579103 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -83874,7 +83914,7 @@ ParticleSystem: --- !u!199 &6462096629828664088 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua index 2a712a7f37..0f54aad4b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View2/GeneralInfoPopup_PracticeLevel.lua @@ -55,10 +55,14 @@ function this:OnShow(_parent,...) this.addTextList[i]:GetComponent("Text").text = string.format("%s",str) end end + -- 背景透明 + parent.backBtn:GetComponent("Image").color = Color.New(0, 0, 0, 0) end --界面关闭时调用(用于子类重写) function this:OnClose() + -- 还原透明度 + parent.backBtn:GetComponent("Image").color = Color.New(0, 0, 0, 200) end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua index d6aab286d9..9b9328ca49 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticePanel.lua @@ -279,6 +279,8 @@ function Practice:SetSkillInfo() end function Practice:OnFocus() Practice:SetSkillInfo() + -- 设置蓝点层级 + self.items:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1 end function Practice:OnSortingOrderChange() @@ -299,6 +301,9 @@ function Practice:OnSortingOrderChange() if self.playerInfoView then self.playerInfoView:SetLayer(self.sortingOrder) end + -- 设置蓝点层级 + self.items:GetComponent("Canvas").sortingOrder = self.sortingOrder + 1 + end function Practice:OnShow() @@ -380,6 +385,8 @@ function Practice:RefreshPoints() -- self.effectUpgradeList[i]:SetActive(false) Util.AddOnceClick(self.pointList[i],function () UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.PracticeLevel,data) + -- 设置蓝点层级 + self.items:GetComponent("Canvas").sortingOrder = self.sortingOrder + 101 end) end end