diff --git a/Assets/Enemies/Sun/sun.prefab b/Assets/Enemies/Sun/sun.prefab index 954837f7b..07d0823b6 100644 --- a/Assets/Enemies/Sun/sun.prefab +++ b/Assets/Enemies/Sun/sun.prefab @@ -29,7 +29,8 @@ Transform: m_LocalPosition: {x: 0, y: -0.3, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5651087258571432906} m_Father: {fileID: 7731386570801727928} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &857265129041421748 @@ -399,3 +400,159 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &5655889617029560222 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7410697996990931353} + m_Modifications: + - target: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Name + value: MusicZone + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Size.x + value: 208.89812 + objectReference: {fileID: 0} + - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Size.y + value: 138.00214 + objectReference: {fileID: 0} + - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Offset.x + value: -0.051612854 + objectReference: {fileID: 0} + - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Offset.y + value: 13.575409 + objectReference: {fileID: 0} + - target: {fileID: 82086711282736910, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_audioClip + value: + objectReference: {fileID: 8300000, guid: 9a11930c4cf77a34eba1987037b91758, type: 3} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x + value: 83.769775 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].y + value: 40.806305 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].x + value: -131.45331 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].y + value: 46.23477 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].x + value: -94.015144 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].y + value: -97.5224 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].x + value: 86.61124 + objectReference: {fileID: 0} + - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].y + value: -73.17667 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + - {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + - {fileID: 114102595860343554, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + insertIndex: -1 + addedObject: {fileID: 269468504123526476} + m_SourcePrefab: {fileID: 100100000, guid: 4048dbf658258ce418e036b46091b68c, type: 3} +--- !u!4 &5651087258571432906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + m_PrefabInstance: {fileID: 5655889617029560222} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5655384325412037104 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} + m_PrefabInstance: {fileID: 5655889617029560222} + m_PrefabAsset: {fileID: 0} +--- !u!114 &269468504123526476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5655384325412037104} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e6d5efb8a3710949886e1ef28a3b19d, type: 3} + m_Name: + m_EditorClassIdentifier: + thingThatMoves: {fileID: 0} + thingToBeCloseTo: {fileID: 7731386570801727928} + threshold: 200 diff --git a/Assets/Scenes/PlayerScene.unity b/Assets/Scenes/PlayerScene.unity index c1bf5036b..b1aec30d7 100644 --- a/Assets/Scenes/PlayerScene.unity +++ b/Assets/Scenes/PlayerScene.unity @@ -8163,11 +8163,6 @@ CircleCollider2D: m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} m_Radius: 10000 ---- !u!4 &1463166730 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7410697996990931353, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} - m_PrefabInstance: {fileID: 7731386571285518054} - m_PrefabAsset: {fileID: 0} --- !u!1 &1572742842 GameObject: m_ObjectHideFlags: 0 @@ -9161,162 +9156,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1918756826042548, guid: 09d73ca31ad729a43bd0de4d964f7551, type: 3} m_PrefabInstance: {fileID: 19714175} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1939390844 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1463166730} - m_Modifications: - - target: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Name - value: MusicZone - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Size.x - value: 208.89812 - objectReference: {fileID: 0} - - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Size.y - value: 138.00214 - objectReference: {fileID: 0} - - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Offset.x - value: -0.051612854 - objectReference: {fileID: 0} - - target: {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Offset.y - value: 13.575409 - objectReference: {fileID: 0} - - target: {fileID: 82086711282736910, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_audioClip - value: - objectReference: {fileID: 8300000, guid: 9a11930c4cf77a34eba1987037b91758, type: 3} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.size - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].x - value: 83.769775 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[0].y - value: 40.806305 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].x - value: -131.45331 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[1].y - value: 46.23477 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].x - value: -94.015144 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[2].y - value: -97.5224 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].x - value: 86.61124 - objectReference: {fileID: 0} - - target: {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - propertyPath: m_Points.m_Paths.Array.data[0].Array.data[3].y - value: -73.17667 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 61746825506427466, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - - {fileID: 3320709279983422493, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - - {fileID: 114102595860343554, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - insertIndex: -1 - addedObject: {fileID: 1939390848} - m_SourcePrefab: {fileID: 100100000, guid: 4048dbf658258ce418e036b46091b68c, type: 3} ---- !u!1 &1939390845 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1750110851749486, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - m_PrefabInstance: {fileID: 1939390844} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1939390847 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4908530054141012, guid: 4048dbf658258ce418e036b46091b68c, type: 3} - m_PrefabInstance: {fileID: 1939390844} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1939390848 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1939390845} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8e6d5efb8a3710949886e1ef28a3b19d, type: 3} - m_Name: - m_EditorClassIdentifier: - thingThatMoves: {fileID: 2593150204304020504} - thingToBeCloseTo: {fileID: 7731386571285518055} - threshold: 200 --- !u!1001 &1949682551 PrefabInstance: m_ObjectHideFlags: 0 @@ -16540,10 +16379,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7731386570801727928, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} + - target: {fileID: 269468504123526476, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} + propertyPath: thingThatMoves + value: + objectReference: {fileID: 2593150204304020504} - target: {fileID: 7731386570801727928, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -16590,10 +16429,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 7410697996990931353, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} - insertIndex: -1 - addedObject: {fileID: 1939390847} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 856da4dbe1d56134692e4488ddf52fc6, type: 3} --- !u!4 &7731386571285518055 stripped