From 20bf67d50e851b1950eae30a690d5428cc70d220 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 23 Jul 2021 18:23:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A7=B0=E5=8F=B7=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=E7=A7=B0=E5=8F=B7=E7=89=B9=E6=95=88=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=A7=B0=E5=8F=B7=E7=89=B9=E6=95=88?= =?UTF-8?q?=E9=A2=84=E8=AE=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChengHao_new/Prefab/chegnhao_dtzz.prefab | 44 +++++++++++-------- .../ChengHao_new/Prefab/chegnhao_fdhf.prefab | 36 ++++++++------- .../ChengHao_new/Prefab/chegnhao_lfzz.prefab | 24 +++++----- .../~Lua/Common/functions.lua | 18 +++++++- .../~Lua/View/PlayerTitle.lua | 3 +- 5 files changed, 77 insertions(+), 48 deletions(-) diff --git a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_dtzz.prefab b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_dtzz.prefab index 1b108cdac0..102aa866fb 100644 --- a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_dtzz.prefab +++ b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_dtzz.prefab @@ -4697,7 +4697,7 @@ ParticleSystem: --- !u!199 &431482275 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4732,7 +4732,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 100 + m_SortingOrder: 10 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -9395,7 +9395,7 @@ ParticleSystem: --- !u!199 &468787697 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9430,7 +9430,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 300 + m_SortingOrder: 30 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -14151,7 +14151,7 @@ ParticleSystem: --- !u!199 &599171519 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14186,7 +14186,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -18850,7 +18850,7 @@ ParticleSystem: --- !u!199 &723247372 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23606,7 +23606,7 @@ ParticleSystem: --- !u!199 &769766712 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23641,7 +23641,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -28362,7 +28362,7 @@ ParticleSystem: --- !u!199 &1424887845 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28397,7 +28397,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 100 + m_SortingOrder: 10 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -33118,7 +33118,7 @@ ParticleSystem: --- !u!199 &1513933112 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33153,7 +33153,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -37816,7 +37816,7 @@ ParticleSystem: --- !u!199 &1639851356 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37851,7 +37851,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 400 + m_SortingOrder: 40 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -42522,7 +42522,7 @@ ParticleSystem: --- !u!199 &1645515644 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47278,7 +47278,7 @@ ParticleSystem: --- !u!199 &1765132406 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -47313,7 +47313,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -47400,6 +47400,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: e8f31f8ed40ee2649bd148c1c78b73bc, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -47472,6 +47474,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 48e0e223918f6e84a906f7482243e99d, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -47544,6 +47548,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: cc8c18de78cef774d94b4018a7c129c2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -47656,6 +47662,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 38057100c38dfe74ab21628c883b94e8, type: 3} m_Type: 0 m_PreserveAspect: 0 diff --git a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_fdhf.prefab b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_fdhf.prefab index 91fefb3bda..b9bcf8674f 100644 --- a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_fdhf.prefab +++ b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_fdhf.prefab @@ -667,7 +667,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: -0.26, y: 1, z: 1} + m_Scale: {x: 0, y: 1, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 @@ -4639,7 +4639,7 @@ ParticleSystem: --- !u!199 &191448689 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4674,7 +4674,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 16 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -9337,7 +9337,7 @@ ParticleSystem: --- !u!199 &247348041 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9372,7 +9372,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 250 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -14035,7 +14035,7 @@ ParticleSystem: --- !u!199 &766691231 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14070,7 +14070,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 100 + m_SortingOrder: 10 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -18739,7 +18739,7 @@ ParticleSystem: --- !u!199 &802795062 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23437,7 +23437,7 @@ ParticleSystem: --- !u!199 &934927499 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23472,7 +23472,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 300 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -24163,7 +24163,7 @@ ParticleSystem: donutRadius: 0.2 m_Position: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0} - m_Scale: {x: -0.26, y: 1, z: 1} + m_Scale: {x: 0, y: 1, z: 1} placementMode: 0 m_MeshMaterialIndex: 0 m_MeshNormalOffset: 0 @@ -28135,7 +28135,7 @@ ParticleSystem: --- !u!199 &1328465948 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28170,7 +28170,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 16 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -32834,7 +32834,7 @@ ParticleSystem: --- !u!199 &1764325430 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37590,7 +37590,7 @@ ParticleSystem: --- !u!199 &1769848368 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37625,7 +37625,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 15 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -37712,6 +37712,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 2dd0bfbadbd8bc140a2c772822cf1271, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -37822,6 +37824,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 9be0ae9b2f5ee554a84d2b2ee178f9cc, type: 3} m_Type: 0 m_PreserveAspect: 0 diff --git a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab index 13881f6510..fd575d48a8 100644 --- a/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab +++ b/Assets/ManagedResources/EffectResUI/ChengHao_new/Prefab/chegnhao_lfzz.prefab @@ -4674,7 +4674,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 100 + m_SortingOrder: 0 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -9372,7 +9372,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 10 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -14070,7 +14070,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 400 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -18768,7 +18768,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 100 + m_SortingOrder: 0 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -28227,7 +28227,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 11 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -32925,7 +32925,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 400 + m_SortingOrder: 20 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -42381,7 +42381,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 150 + m_SortingOrder: 10 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -47079,7 +47079,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 200 + m_SortingOrder: 11 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -47129,7 +47129,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105212673} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 63.1, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 522547230} @@ -51839,7 +51839,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: -46.9, y: -35.4} + m_AnchoredPosition: {x: -6.3, y: -35.4} m_SizeDelta: {x: 277, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3042148440082944811 @@ -51898,7 +51898,7 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 10 m_TargetDisplay: 0 --- !u!1 &3996167517654444152 GameObject: @@ -51972,7 +51972,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: -42.2, y: -7.92} + m_AnchoredPosition: {x: 0, y: -7.92} m_SizeDelta: {x: 486, y: 191} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8515785465420495731 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 68aea1f3be..17250eda5d 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -142,7 +142,23 @@ function Util_SetHeadImage(spLoader, url, image, isSelf) imageDownloadMgr:SetImage_Image(url, image, isSelf) end - +function AddParticleSortLayer(go,layer) + if layer==0 then + return + end + local list=go.transform:GetComponentsInChildren(typeof(UnityEngine.Transform)):ToTable() + for key, value in pairs(list) do + local aaa=value + local render=aaa:GetComponent(typeof(UnityEngine.Renderer)) + if render then + render.sortingOrder=render.sortingOrder+layer + end + local canvas=aaa:GetComponent(typeof(UnityEngine.Canvas)) + if canvas then + canvas.sortingOrder=canvas.sortingOrder+layer + end + end +end function Util_SetToDefaultHeadImage(spLoader, image) if image == nil then return diff --git a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua index b56fa909b0..cf1f1cdad8 100644 --- a/Assets/ManagedResources/~Lua/View/PlayerTitle.lua +++ b/Assets/ManagedResources/~Lua/View/PlayerTitle.lua @@ -115,8 +115,9 @@ end function PlayerTitle:SetLayer(layer) local _layer = layer + 10 if self.titleLive then - Util.AddParticleSortLayer(self.titleLive, _layer - self.layer) + AddParticleSortLayer(self.titleLive, _layer - self.layer) end + if self.canvas then self.canvas.overrideSorting = true self.canvas.sortingOrder = _layer