diff options
3 files changed, 79 insertions, 317 deletions
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs index e0101d4..c6841c8 100644 --- a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs +++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs @@ -23,6 +23,16 @@ public class TopDownSorting : MonoBehaviour public void Sorting() { + if(m_SpriteRenderer == null) + { + m_SpriteRenderer = GetComponent<SpriteRenderer>(); + } + + if(m_Coord == null) + { + m_Coord = GetComponent<TopDownTransform>(); + } + // ¸ù¾ÝyÉèÖÃsortOrder m_SpriteRenderer.sortingOrder = (int)(-m_Coord.y * 100); } diff --git a/AlienSurvival/Assets/Test/Prefabs/prop/broken_piece.prefab b/AlienSurvival/Assets/Test/Prefabs/prop/broken_piece.prefab index bcc50c7..8c8b78a 100644 --- a/AlienSurvival/Assets/Test/Prefabs/prop/broken_piece.prefab +++ b/AlienSurvival/Assets/Test/Prefabs/prop/broken_piece.prefab @@ -1,87 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7883860634240310615 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7883860634240310614} - - component: {fileID: 7883860634240310612} - m_Layer: 0 - m_Name: shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7883860634240310614 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7883860634240310615} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.4143, z: 1} - m_Children: [] - m_Father: {fileID: 7883860634438912535} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7883860634240310612 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7883860634240310615} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 601505335 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: -7400182745698257873, guid: 74cdaebf4351a1644a0aa87577cb1c7a, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 0.29803923} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.5, y: 0.46875} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &7883860634438912529 GameObject: m_ObjectHideFlags: 0 @@ -111,8 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 14.712371, y: 4.2065034, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7883860634240310614} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -201,5 +118,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 780072e6ea35d1f4abd930754c5e9c9f, type: 3} m_Name: m_EditorClassIdentifier: - m_Shadow: {fileID: 7883860634240310614} + m_Shadow: {fileID: 0} + m_Coord: {x: 0, y: 0, z: 0} m_Height: 0 diff --git a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity index d850742..d8684d9 100644 --- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity +++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity @@ -123,88 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &54371578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 54371579} - - component: {fileID: 54371580} - m_Layer: 0 - m_Name: shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &54371579 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54371578} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5, z: 0} - m_Children: [] - m_Father: {fileID: 414827377} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &54371580 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 54371578} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 601505335 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 79a8cc6654335874799aa6349918161e, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 0.22745098} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.03125, y: 1.25} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &80465628 GameObject: m_ObjectHideFlags: 0 @@ -604,7 +522,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 231104471} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.5282884, y: 8.535414, z: 0} + m_LocalPosition: {x: 4.5282884, y: 8.676869, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -648,7 +566,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 4.5282884, y: 8.05027, z: 0.48514414} + m_LocalPosition: {x: 4.5282884, y: 8.05027, z: 0.6265991} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!1 &248224694 @@ -1111,88 +1029,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320299115} m_CullTransparentMesh: 1 ---- !u!1 &353775663 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 353775664} - - component: {fileID: 353775665} - m_Layer: 0 - m_Name: shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &353775664 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353775663} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5, z: 0} - m_Children: [] - m_Father: {fileID: 414827377} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &353775665 -SpriteRenderer: +--- !u!1001 &343426271 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353775663} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 601505335 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 79a8cc6654335874799aa6349918161e, type: 3} - m_Color: {r: 0, g: 0, b: 0, a: 0.22745098} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.03125, y: 1.25} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931891, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6158943708042931892, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} + propertyPath: m_Name + value: eff_explosion + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 779262af2df6cab4ab893e9884f5bf74, type: 3} --- !u!1 &414827375 GameObject: m_ObjectHideFlags: 0 @@ -1275,11 +1168,9 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 5.46383, y: 4.505465, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 54371579} - - {fileID: 353775664} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &414827380 MonoBehaviour: @@ -2486,7 +2377,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 844062961} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.0113106, y: 6.6672025, z: 0} + m_LocalPosition: {x: 2.0113106, y: 7.0797606, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -2530,7 +2421,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3} m_Name: m_EditorClassIdentifier: - m_LocalPosition: {x: 2.0113106, y: 4.038198, z: 2.6290045} + m_LocalPosition: {x: 2.0113106, y: 6.301758, z: 0.778003} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} --- !u!1 &917445573 @@ -5758,67 +5649,6 @@ MonoBehaviour: m_LocalPosition: {x: -4.3151608, y: 7.5453644, z: 1.0356388} m_LocalRotation: 0 m_LocalScale: {x: 0, y: 0} ---- !u!1001 &7883860632909510251 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7883860634438912529, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_Name - value: broken_piece - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912529, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_RootOrder - value: 18 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalPosition.x - value: 14.712371 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalPosition.y - value: 4.2065034 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7883860634438912535, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b73ac478c3e69e341918d8f8acd5e4b6, type: 3} --- !u!1001 &8582758514292956423 PrefabInstance: m_ObjectHideFlags: 0 @@ -5878,5 +5708,9 @@ PrefabInstance: propertyPath: m_Camera value: objectReference: {fileID: 976849206} + - target: {fileID: 8582758513714280099, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32f108a63fddba54fbcf9b728f232946, type: 3} |