From 5f408e896c5c6358ab2fb7fe9855e15fc774cbe4 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 4 Aug 2019 02:07:39 +0300 Subject: [PATCH] Fix sorting layers and player speed --- Assets/Prefabs/Player.prefab | 12 +- Assets/Prefabs/Revolver.prefab | 4 +- Assets/Prefabs/RevolverBullet.prefab | 8 +- Assets/Scenes/MainScene.unity | 173 ++++++++++++++++++++++++++- ProjectSettings/TagManager.asset | 6 + 5 files changed, 186 insertions(+), 17 deletions(-) diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 3e30579..a144c1d 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -66,8 +66,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -947994997 + m_SortingLayer: 3 m_SortingOrder: 5 m_Sprite: {fileID: -3565353366220660933, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3} @@ -178,8 +178,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -947994997 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: -6198316879909490977, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3} @@ -357,8 +357,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -947994997 + m_SortingLayer: 3 m_SortingOrder: 0 m_Sprite: {fileID: 1687475652488265116, guid: 0aff57dccbcba5d4db39143523f7b1eb, type: 3} diff --git a/Assets/Prefabs/Revolver.prefab b/Assets/Prefabs/Revolver.prefab index 321d7db..19627c1 100644 --- a/Assets/Prefabs/Revolver.prefab +++ b/Assets/Prefabs/Revolver.prefab @@ -138,8 +138,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -947994997 + m_SortingLayer: 3 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 918f808d2d9fc104696617ebfe2a323e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Prefabs/RevolverBullet.prefab b/Assets/Prefabs/RevolverBullet.prefab index d4ec177..0d12ad6 100644 --- a/Assets/Prefabs/RevolverBullet.prefab +++ b/Assets/Prefabs/RevolverBullet.prefab @@ -4727,8 +4727,8 @@ ParticleSystemRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1811527703 + m_SortingLayer: 4 m_SortingOrder: 0 m_RenderMode: 0 m_SortMode: 0 @@ -4929,8 +4929,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1969288999 + m_SortingLayer: 5 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: c52c475497269974b84c1ee730136ca6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index d31faea..cdbe001 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -289,7 +289,7 @@ Transform: m_Children: - {fileID: 1237792229} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &188743841 GameObject: @@ -1137,6 +1137,169 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &280402652 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4462327694118370270, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_Name + value: Revolver + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.3448815 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.8339115 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327694118370271, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4462327695001662280, guid: 7b3529c1a7d22d143a060281857bbca5, + type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7b3529c1a7d22d143a060281857bbca5, type: 3} +--- !u!1001 &370761184 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8489029732530782804, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.86 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.37 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782807, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8489029732530782806, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: MoveSpeed + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8489029732241002784, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8489029732599905344, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6970513589971572751, guid: 14a47f86f9e45da45863a81716f2378b, + type: 3} + propertyPath: m_SortingLayer + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 14a47f86f9e45da45863a81716f2378b, type: 3} --- !u!1 &397489490 GameObject: m_ObjectHideFlags: 0 @@ -1180,7 +1343,7 @@ Transform: - {fileID: 203480853} - {fileID: 628992541} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &490037237 GameObject: @@ -1753,7 +1916,7 @@ Transform: m_Children: - {fileID: 1000260803} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &867100010 MonoBehaviour: @@ -1983,7 +2146,7 @@ Transform: m_Children: - {fileID: 490037238} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963194225 GameObject: @@ -2066,7 +2229,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1000260802 GameObject: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index fe2f19c..37345c6 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -50,6 +50,12 @@ TagManager: - name: Characters uniqueID: 3346972299 locked: 0 + - name: Bullet Trails + uniqueID: 1811527703 + locked: 0 + - name: Bullets + uniqueID: 1969288999 + locked: 0 - name: Blood Particles (On characters) uniqueID: 3258686711 locked: 0