diff --git a/Assets/DevMocks/BombsUpgrade.prefab b/Assets/DevMocks/BombsUpgrade.prefab index 8dc626b..d9f443c 100644 --- a/Assets/DevMocks/BombsUpgrade.prefab +++ b/Assets/DevMocks/BombsUpgrade.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7980903176349258245} - component: {fileID: 6699440875015304414} - component: {fileID: 7875732231624854186} - - component: {fileID: 7738746775589240714} + - component: {fileID: 5909025813549437813} m_Layer: 0 m_Name: BombsUpgrade m_TagString: Untagged @@ -107,7 +107,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!114 &7738746775589240714 +--- !u!114 &5909025813549437813 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/DevMocks/FlameUpgrade.prefab b/Assets/DevMocks/FlameUpgrade.prefab index cebe9d9..8b3a227 100644 --- a/Assets/DevMocks/FlameUpgrade.prefab +++ b/Assets/DevMocks/FlameUpgrade.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 7037551310800415105} - component: {fileID: 7958292204112110464} - component: {fileID: 5334633105760309190} + - component: {fileID: 6293070509487257227} m_Layer: 0 m_Name: FlameUpgrade m_TagString: Untagged @@ -119,3 +120,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94153367f2364ab38597c8f4a6521909, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6293070509487257227 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7385886653159515755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94153367f2364ab38597c8f4a6521909, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Ammo/Bomb.prefab b/Assets/Prefabs/Ammo/Bomb.prefab index ef8c415..c90229d 100644 --- a/Assets/Prefabs/Ammo/Bomb.prefab +++ b/Assets/Prefabs/Ammo/Bomb.prefab @@ -68,7 +68,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 9 m_Sprite: {fileID: 21300008, guid: 1611b607563ac5b4d919348f10e92487, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b8d629a..8e111bf 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -404,7 +404,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 11.459104, y: -4.0430503, z: -10} + m_LocalPosition: {x: 13.828903, y: -4.0430503, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -832,6 +832,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 16 objectReference: {fileID: 0} + - target: {fileID: 311312839, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8007755715420797612, guid: 4ca131020414f4b1597dac2e1d292d7f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2219516564249810540, guid: 4ca131020414f4b1597dac2e1d292d7f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1533625511004221075, guid: 4ca131020414f4b1597dac2e1d292d7f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7551096532728223647, guid: 4ca131020414f4b1597dac2e1d292d7f, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ca131020414f4b1597dac2e1d292d7f, type: 3} --- !u!1001 &6843575829779162303 @@ -906,10 +930,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1778702657, guid: d3055091a17dc4aa1accf2e33ccef144, type: 3} - propertyPath: m_SortingOrder - value: 10 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d3055091a17dc4aa1accf2e33ccef144, type: 3} --- !u!1001 &7054975846332595845