diff --git a/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab index ebf0422537..7ccce404a1 100644 --- a/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TeHuiShenZhuang/TeHuiShenZhuangPanel.prefab @@ -96,7 +96,7 @@ RectTransform: - {fileID: 8541848192336793676} - {fileID: 1127203027444313718} m_Father: {fileID: 898193909354494019} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -188,12 +188,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484290860169939128} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -433,6 +433,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2750471745573935426} + - {fileID: 7585023431606273155} - {fileID: 8445008542788981736} - {fileID: 6700527752452100088} - {fileID: 6826038302389389002} @@ -751,7 +752,7 @@ RectTransform: - {fileID: 7053404110353968548} - {fileID: 311860523735992108} m_Father: {fileID: 898193909354494019} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1159,7 +1160,7 @@ RectTransform: - {fileID: 8892065666247826579} - {fileID: 5387329556305204595} m_Father: {fileID: 898193909354494019} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1624,7 +1625,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 898193909354494019} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -24.795002} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1920,3 +1921,78 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1001 &7900264560111908723 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 898193909354494019} + m_Modifications: + - target: {fileID: 351292166103626739, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_Name + value: UI_Effect_ShenYiTianJiang + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalPosition.x + value: -13 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalPosition.y + value: 470.00006 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a032bc80149e3ae4480516f072114a4b, type: 3} +--- !u!4 &7585023431606273155 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 351292166103626736, guid: a032bc80149e3ae4480516f072114a4b, + type: 3} + m_PrefabInstance: {fileID: 7900264560111908723} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua index 662d828828..78a6bfcb29 100644 --- a/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TeHuiShenZhuang/TeHuiShenZhuangPanel.lua @@ -31,7 +31,10 @@ function TeHuiShenZhuang:InitComponent() self.liveRoot = Util.GetGameObject(self.gameObject, "live/liveRoot") self.liveText = Util.GetGameObject(self.gameObject, "live/Image"):GetComponent("Image") + self.effect = Util.GetGameObject(self.gameObject,"UI_Effect_ShenYiTianJiang") + self.itemViewList = {} + self.sortingOrder = 0 end --绑定事件(用于子类重写) @@ -51,6 +54,10 @@ end function TeHuiShenZhuang:RemoveListener() end +function TeHuiShenZhuang:OnSortingOrderChange() + Util.SetParticleSortLayer(self.effect,self.sortingOrder + 1) +end + --界面打开时调用(用于子类重写) function TeHuiShenZhuang:OnOpen() end @@ -114,7 +121,6 @@ function TeHuiShenZhuang:ShowSingleHero(go,data,index) end self.itemViewList[go][i]:OnOpen(false, rewardData, 0.9,false,false,false,self.sortingOrder) self.itemViewList[go][i].gameObject:SetActive(true) - -- Util.SetGray(self.itemViewList[go][i].gameObject,data.progress == 3) end Util.SetGray(btnGet,false) @@ -173,6 +179,7 @@ function TeHuiShenZhuang:OnClose() end self.Live = nil PatFaceManager.RefreshPatface() + self.sortingOrder = 0 end --界面销毁时调用(用于子类重写)