diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a9461c7..e448cff 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -396,6 +396,131 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &14747676 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 14747677} + - component: {fileID: 14747679} + - component: {fileID: 14747678} + - component: {fileID: 14747680} + m_Layer: 0 + m_Name: Music_runner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &14747677 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14747676} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -172, y: 0, z: 0} + m_LocalScale: {x: 227.40382, y: 78.932335, z: 128.86911} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1719607633} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &14747678 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14747676} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &14747679 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14747676} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0.06700338, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &14747680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14747676} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 565138fb66668ea4498492befe0a0997, type: 3} + m_Name: + m_EditorClassIdentifier: + currentMusic: {fileID: 8300000, guid: 514d15b838150ce42a4c19373b102784, type: 3} --- !u!1 &16484891 GameObject: m_ObjectHideFlags: 0 @@ -1343,7 +1468,7 @@ Transform: - {fileID: 50118135} - {fileID: 477698391} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &71314508 GameObject: @@ -4446,174 +4571,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &211093265 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 211093266} - - component: {fileID: 211093271} - - component: {fileID: 211093270} - - component: {fileID: 211093269} - - component: {fileID: 211093268} - - component: {fileID: 211093267} - m_Layer: 0 - m_Name: COLLECTIBLE (2) - m_TagString: Collectible - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &211093266 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -35.98, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 570336690} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &211093267 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5259f691cb02c75479c93eef6ba8d85b, type: 3} - m_Name: - m_EditorClassIdentifier: - boostDuration: 150 ---- !u!50 &211093268 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!95 &211093269 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f7dd921c5b573ea4e89197132dd3c15f, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 ---- !u!61 &211093270 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &211093271 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 211093265} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &211273826 GameObject: m_ObjectHideFlags: 0 @@ -5629,7 +5586,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &254300989 MonoBehaviour: @@ -7379,7 +7336,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 331148260} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -141.1109, y: -11.406926, z: -5.33709} + m_LocalPosition: {x: -65.3109, y: -10.006927, z: -5.33709} m_LocalScale: {x: 3.3446257, y: 3.3446257, z: 3.3446257} m_ConstrainProportionsScale: 1 m_Children: @@ -10227,7 +10184,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 570336690} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &500839003 MonoBehaviour: @@ -10636,7 +10593,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75.9, y: 6.8, z: -10} + m_LocalPosition: {x: 151.7, y: 8.2, z: -10} m_LocalScale: {x: 1.5357056, y: 3.8764622, z: 1.5357056} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10824,7 +10781,7 @@ EdgeCollider2D: m_Offset: {x: 0, y: 0} m_EdgeRadius: 0 m_Points: - - {x: -9.822571, y: 8.192053} + - {x: -6.212799, y: 8.274092} - {x: -9.924225, y: 11.699455} - {x: -6.395569, y: 12.945391} - {x: 6.7261047, y: 12.97538} @@ -12009,13 +11966,11 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1805989337} - {fileID: 727800003} - - {fileID: 211093266} - {fileID: 1862102565} - {fileID: 500839002} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &574517330 GameObject: @@ -12708,13 +12663,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 594451877} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 320.73, y: 4.92, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 302.7022, y: -10.533078, z: 1.3681227} m_LocalScale: {x: 0.70832, y: 0.70832, z: 0.70832} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 20 + m_Father: {fileID: 1067798074} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &597013236 GameObject: @@ -14838,7 +14793,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 694507420} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75.9, y: 6.8, z: 0} + m_LocalPosition: {x: 151.7, y: 8.2, z: 0} m_LocalScale: {x: 1.4178485, y: 1.4178485, z: 1.4178485} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15257,6 +15212,131 @@ Transform: m_Father: {fileID: 1865208847} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &703854226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 703854227} + - component: {fileID: 703854229} + - component: {fileID: 703854228} + - component: {fileID: 703854230} + m_Layer: 0 + m_Name: Music_town_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &703854227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703854226} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 121.282036, y: 78.932335, z: 128.86911} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1719607633} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &703854228 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703854226} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &703854229 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703854226} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.23448825, g: 1, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &703854230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 703854226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 565138fb66668ea4498492befe0a0997, type: 3} + m_Name: + m_EditorClassIdentifier: + currentMusic: {fileID: 8300000, guid: 5454e20a6b924de459af69f0bfa487ba, type: 3} --- !u!1 &704220872 GameObject: m_ObjectHideFlags: 0 @@ -15888,7 +15968,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 570336690} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &727800004 MonoBehaviour: @@ -17760,7 +17840,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &847369964 Rigidbody2D: @@ -17807,7 +17887,7 @@ GameObject: - component: {fileID: 847768514} - component: {fileID: 847768513} m_Layer: 0 - m_Name: MUSIQUE + m_Name: MUSIQUE_player m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17825,7 +17905,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} m_PlayOnAwake: 1 - m_Volume: 1 + m_Volume: 0.191 m_Pitch: 1 Loop: 0 Mute: 0 @@ -17916,13 +17996,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 847768512} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 250.09412, y: 75.77348, z: -4.0759845} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -540.5, y: 3.2721462, z: -4.0759845} + m_LocalScale: {x: 393.10315, y: 170.59341, z: 170.59341} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 23 + m_Father: {fileID: 1719607633} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &851501309 GameObject: @@ -21365,8 +21445,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1040774572} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 265.7836, y: 9.382752, z: 1.3681227} - m_LocalScale: {x: 2.414257, y: 13.326857, z: 2.4867253} + m_LocalPosition: {x: 265.7836, y: 8.2, z: 1.3681227} + m_LocalScale: {x: 2.414257, y: 15.825643, z: 2.4867253} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1315484175} @@ -22235,6 +22315,7 @@ Transform: - {fileID: 2077598067} - {fileID: 1677870297} - {fileID: 892287131} + - {fileID: 594451879} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25009,6 +25090,228 @@ Transform: m_Father: {fileID: 665380466} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1167003078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1167003079} + - component: {fileID: 1167003081} + - component: {fileID: 1167003080} + - component: {fileID: 1167003082} + - component: {fileID: 1167003083} + m_Layer: 0 + m_Name: Music_town + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1167003079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167003078} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -346.1, y: 0, z: 0} + m_LocalScale: {x: 121.282036, y: 78.932335, z: 128.86911} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1719607633} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1167003080 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167003078} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &1167003081 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167003078} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.23448825, g: 1, b: 0, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1167003082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167003078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 565138fb66668ea4498492befe0a0997, type: 3} + m_Name: + m_EditorClassIdentifier: + currentMusic: {fileID: 8300000, guid: 5454e20a6b924de459af69f0bfa487ba, type: 3} +--- !u!82 &1167003083 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1167003078} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1177734578 GameObject: m_ObjectHideFlags: 0 @@ -25475,7 +25778,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1207366755 GameObject: @@ -30761,7 +31064,7 @@ Transform: m_GameObject: {fileID: 1492983202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 333.6, y: 20.4, z: 0} - m_LocalScale: {x: 1.7965083, y: 54.39881, z: 1} + m_LocalScale: {x: 1.7965083, y: 111.51756, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -31827,6 +32130,228 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!1 &1525010822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1525010823} + - component: {fileID: 1525010826} + - component: {fileID: 1525010824} + - component: {fileID: 1525010827} + - component: {fileID: 1525010828} + m_Layer: 0 + m_Name: Music_forest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1525010823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525010822} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -534.9805, y: 13, z: 0} + m_LocalScale: {x: 252.90562, y: 78.932335, z: 128.86911} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1719607633} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1525010824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525010822} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 565138fb66668ea4498492befe0a0997, type: 3} + m_Name: + m_EditorClassIdentifier: + currentMusic: {fileID: 8300000, guid: 78f6b9e4820a9a64cadce382d5e9147f, type: 3} +--- !u!212 &1525010826 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525010822} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0.5873754, b: 1, a: 0.40392157} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &1525010827 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525010822} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!82 &1525010828 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525010822} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1526930754 GameObject: m_ObjectHideFlags: 0 @@ -39030,7 +39555,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1655394985 GameObject: @@ -40618,6 +41143,42 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1719607632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1719607633} + m_Layer: 0 + m_Name: MUSIQUE + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1719607633 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719607632} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 589, y: 20.127853, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 847768514} + - {fileID: 1525010823} + - {fileID: 1167003079} + - {fileID: 703854227} + - {fileID: 14747677} + m_Father: {fileID: 0} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1732638072 GameObject: m_ObjectHideFlags: 0 @@ -41827,8 +42388,9 @@ Transform: - {fileID: 701633036} - {fileID: 934970522} - {fileID: 941406524} + - {fileID: 1814997046} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1780155781 GameObject: @@ -42519,174 +43081,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1805989332 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1805989337} - - component: {fileID: 1805989336} - - component: {fileID: 1805989335} - - component: {fileID: 1805989334} - - component: {fileID: 1805989333} - - component: {fileID: 1805989338} - m_Layer: 0 - m_Name: COLLECTIBLE - m_TagString: Collectible - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!50 &1805989333 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!95 &1805989334 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f7dd921c5b573ea4e89197132dd3c15f, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 ---- !u!61 &1805989335 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1805989336 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1805989337 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 570336690} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1805989338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1805989332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5259f691cb02c75479c93eef6ba8d85b, type: 3} - m_Name: - m_EditorClassIdentifier: - boostDuration: 150 --- !u!1 &1808256077 GameObject: m_ObjectHideFlags: 0 @@ -42855,6 +43249,139 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1814997045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1814997046} + - component: {fileID: 1814997049} + - component: {fileID: 1814997048} + - component: {fileID: 1814997047} + m_Layer: 0 + m_Name: Ladders_box_collider (2) + m_TagString: Ladders + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1814997046 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814997045} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 113.7, y: 21.3, z: 2.5813975} + m_LocalScale: {x: 20.343134, y: 172.16653, z: 2.4867253} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1774334779} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1814997047 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814997045} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 0.6666667, g: 0.69411767, b: 0.68235296, a: 0.6745098} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.4, y: 0.41} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &1814997048 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814997045} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1814997049 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1814997045} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0071430504, y: 0.06687988} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.4, y: 0.41} + newSize: {x: 0.4, y: 0.41} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.42379636, y: 0.5451548} + m_EdgeRadius: 0 --- !u!1 &1819870065 GameObject: m_ObjectHideFlags: 0 @@ -42885,7 +43412,7 @@ Transform: m_Children: - {fileID: 1148542927} m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1834843836 GameObject: @@ -43739,6 +44266,130 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1861968689 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1861968691} + - component: {fileID: 1861968690} + - component: {fileID: 1861968693} + - component: {fileID: 1861968692} + m_Layer: 0 + m_Name: End_runner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1861968690 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861968689} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0, b: 0.8499465, a: 0.6117647} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1861968691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861968689} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 529.6, y: 35.6549, z: 0} + m_LocalScale: {x: 2.5125, y: 141.04759, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1861968692 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861968689} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!114 &1861968693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1861968689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df70eb103446f29459c1d3dd1f7baa68, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1862102564 GameObject: m_ObjectHideFlags: 0 @@ -43773,7 +44424,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 570336690} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1862102566 MonoBehaviour: @@ -47761,7 +48412,7 @@ Transform: - {fileID: 1671893408} - {fileID: 2116037501} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2035880490 GameObject: diff --git a/Assets/Script/Ennemy.cs b/Assets/Script/Ennemy.cs index 50f4b4b..b0b8f65 100644 --- a/Assets/Script/Ennemy.cs +++ b/Assets/Script/Ennemy.cs @@ -31,8 +31,8 @@ public class Ennemy : MonoBehaviour } } - public void setAggro(){ - isAggro = true; + public void setAggro(bool value){ + isAggro = value; } public void reset(){ diff --git a/Assets/Script/MusicTrigger.cs b/Assets/Script/MusicTrigger.cs new file mode 100644 index 0000000..bffb065 --- /dev/null +++ b/Assets/Script/MusicTrigger.cs @@ -0,0 +1,62 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MusicTrigger : MonoBehaviour +{ + + private AudioSource audioSource; + private bool isPlaying = false; + [SerializeField] private AudioClip currentMusic; + + private void Start(){ + audioSource = GetComponent(); + audioSource.volume = 1; + Debug.Log("AudioSource : " + audioSource); + } + + private void OnTriggerEnter2D(Collider2D collision){ + if(collision.gameObject.CompareTag("Joueur") && !isPlaying){ + Debug.Log("Lancement de la musique"); + isPlaying = true; + audioSource.clip = currentMusic; + audioSource.Play(); + } + } + + private void OnTriggerStay2D(Collider2D collision){ + Debug.Log("est dans la zone de musique"); + if(collision.gameObject.CompareTag("Joueur") && !isPlaying){ + Debug.Log("Lancement de la musique"); + isPlaying = true; + audioSource.clip = currentMusic; + audioSource.Play(); + } + } + + private void OnTriggerExit2D(Collider2D collision){ + if(collision.gameObject.CompareTag("Joueur") && isPlaying){ + Debug.Log("Arret de la musique"); + isPlaying = false; + audioSource.Stop(); + } + } + + + private IEnumerator FadeOut(){ + while(audioSource.volume > 0){ + audioSource.volume -= 1 * Time.deltaTime; + yield return null; + } + audioSource.Stop(); + } + + private IEnumerator FadeIn(){ + float volume = audioSource.volume; + while(audioSource.volume < 1){ + audioSource.volume += 1 * Time.deltaTime; + yield return null; + } + } +} diff --git a/Assets/Script/MusicTrigger.cs.meta b/Assets/Script/MusicTrigger.cs.meta new file mode 100644 index 0000000..6f7e193 --- /dev/null +++ b/Assets/Script/MusicTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 565138fb66668ea4498492befe0a0997 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Player.cs b/Assets/Script/Player.cs index 0b8b02b..a794d24 100644 --- a/Assets/Script/Player.cs +++ b/Assets/Script/Player.cs @@ -48,7 +48,7 @@ public class Player : MonoBehaviour private float walkingSpeed = 400f; private float runningSpeed = 800f; private float crouchingSpeed = 200f; - private float climbingSpeed = 100f; + private float climbingSpeed = 1200f; private float horizontalValue; private float verticalValue; @@ -122,12 +122,11 @@ public class Player : MonoBehaviour //Gère l'orientation du sprite en horizontal horizontalValue = Input.GetAxis("Horizontal"); - if (horizontalValue != 0) - { - GetComponent().SetBool("Walk", true); - } else - { - GetComponent().SetBool("Walk", false); + if (horizontalValue != 0){ + animController.SetBool("Walk", true); + } + else { + animController.SetBool("Walk", false); } if (horizontalValue < 0) sr.flipX = true; @@ -138,6 +137,7 @@ public class Player : MonoBehaviour if (Input.GetKeyDown(KeyCode.Space) && canJump) { + //TODO EXPLAIN if (isClimbing) { isJumping = true; @@ -172,7 +172,6 @@ public class Player : MonoBehaviour */ - if (isDashing) { return; @@ -225,25 +224,13 @@ public class Player : MonoBehaviour if (isClimbing) { - targetVelocity += verticalVelocity; + targetVelocity.y = verticalVelocity.y; } targetVelocity += horizontalVelocity; rb.velocity = Vector2.SmoothDamp(rb.velocity, targetVelocity, ref ref_velocity, 0.05f); } - private void OnTriggerStay2D(Collider2D collision) - { - - /*else - { - Debug.Log("Pas esclade"); - //isClimbing = false; - //animController.SetBool("Climbing", false); - }*/ - - } - private void OnTriggerExit2D(Collider2D collision) { if (collision.gameObject.CompareTag("Ladders")) @@ -259,18 +246,30 @@ public class Player : MonoBehaviour } } + private void OnTriggerStay2D(Collider2D collision) + { + if (collision.gameObject.CompareTag("Ladders")) + { + rb.velocity = new Vector2(0,0); + rb.gravityScale = 0f; + } + } + + private void OnTriggerEnter2D(Collider2D collision) { animController.SetBool("Jumping", false); if(collision.gameObject.CompareTag("Ladders")) { - isClimbing = true; - grounded = false; - rb.gravityScale = 0f; - rb.velocity = new Vector2(); - animController.SetBool("Climbing", true); - Debug.Log("Escalader"); + if (!isClimbing){ + isClimbing = true; + grounded = false; + //rb.gravityScale = 0f; + rb.velocity = new Vector2(); + animController.SetBool("Climbing", true); + Debug.Log("Escalader"); + } } if(collision.gameObject.CompareTag("Slowdown")){ diff --git a/Assets/Script/Trigger.cs b/Assets/Script/Trigger.cs new file mode 100644 index 0000000..3e1ea40 --- /dev/null +++ b/Assets/Script/Trigger.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class Trigger : MonoBehaviour +{ + private bool isTriggered = false; + + private void OnTriggerEnter2D(Collider2D collision) + { + if(collision.gameObject.CompareTag("Joueur")) + { + Debug.Log("je rentre dans le trigger"); + } + } + private void OnTriggerExit2D(Collider2D collision){ + if(collision.gameObject.CompareTag("Joueur")) + { + Debug.Log("je sors du trigger"); + } + } +} diff --git a/Assets/Script/Trigger.cs.meta b/Assets/Script/Trigger.cs.meta new file mode 100644 index 0000000..a309b24 --- /dev/null +++ b/Assets/Script/Trigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ebbfee2cfe9161489b08cbdb9bc3d33 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/TriggerDog.cs b/Assets/Script/TriggerDog.cs index e365b2d..96d4866 100644 --- a/Assets/Script/TriggerDog.cs +++ b/Assets/Script/TriggerDog.cs @@ -15,7 +15,7 @@ public class TriggerDog : MonoBehaviour isTriggered = true; GameObject hades = GameObject.Find("HADES"); Ennemy e = hades.GetComponent(); - e.setAggro(); + e.setAggro(true); GameObject follow = GameObject.Find("Camera Run"); CameraRun cr = follow.GetComponent(); cr.toggleFollowPlayer(); diff --git a/Assets/Script/UntriggerDog.cs b/Assets/Script/UntriggerDog.cs new file mode 100644 index 0000000..6b1ffdc --- /dev/null +++ b/Assets/Script/UntriggerDog.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class UntriggerDog : MonoBehaviour +{ + private bool isTriggered = false; + + private void OnTriggerEnter2D(Collider2D collision) + { + if(collision.gameObject.CompareTag("Joueur")) + { + if (!isTriggered){ + isTriggered = true; + GameObject hades = GameObject.Find("HADES"); + Ennemy e = hades.GetComponent(); + e.setAggro(false); + GameObject follow = GameObject.Find("Camera Run"); + CameraRun cr = follow.GetComponent(); + cr.toggleFollowPlayer(); + } + } + } + private void OnTriggerExit2D(Collider2D collision){ + if(collision.gameObject.CompareTag("Joueur")) + { + if (isTriggered){ + isTriggered = false; + } + } + } +} diff --git a/Assets/Script/UntriggerDog.cs.meta b/Assets/Script/UntriggerDog.cs.meta new file mode 100644 index 0000000..f257472 --- /dev/null +++ b/Assets/Script/UntriggerDog.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df70eb103446f29459c1d3dd1f7baa68 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SunnyLand Artwork/Sprites/player/climb/1.png.meta b/Assets/SunnyLand Artwork/Sprites/player/climb/1.png.meta index 0750dc7..40bd66f 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/climb/1.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/climb/1.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 1200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/climb/2.png.meta b/Assets/SunnyLand Artwork/Sprites/player/climb/2.png.meta index 3499390..a7c8feb 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/climb/2.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/climb/2.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 1200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/climb/3.png.meta b/Assets/SunnyLand Artwork/Sprites/player/climb/3.png.meta index 687b7de..d77ffe6 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/climb/3.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/climb/3.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 1200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/climb/4.png.meta b/Assets/SunnyLand Artwork/Sprites/player/climb/4.png.meta index 99ec564..d39e11d 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/climb/4.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/climb/4.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 1200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/crouch/1.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/1.png.meta index 34cef70..b8b347c 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/crouch/1.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/crouch/1.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 500 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/crouch/2.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/2.png.meta index 22748a3..30757da 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/crouch/2.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/crouch/2.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 500 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/crouch/3.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/3.png.meta index 0c5e41d..587380b 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/crouch/3.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/crouch/3.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 500 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/crouch/4.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/4.png.meta index 4315e2c..0cb7d3a 100644 --- a/Assets/SunnyLand Artwork/Sprites/player/crouch/4.png.meta +++ b/Assets/SunnyLand Artwork/Sprites/player/crouch/4.png.meta @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 400 + spritePixelsToUnits: 500 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/SunnyLand Artwork/Sprites/player/run.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/1.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/1.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/1.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/1.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/1.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/1.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/1.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/1.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/2.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/2.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/2.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/2.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/2.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/2.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/2.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/2.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/3.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/3.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/3.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/3.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/3.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/3.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/3.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/3.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/4.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/4.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/4.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/4.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/4.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/4.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/4.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/4.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/5.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/5.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/5.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/5.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/5.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/5.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/5.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/5.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/6.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/6.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/6.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/6.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/6.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/6.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/6.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/6.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/7.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/7.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/7.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/7.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/7.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/7.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/7.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/7.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/8.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/8.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/8.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/8.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/8.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/8.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/8.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/8.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/9.png b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/9.png similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/9.png rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/9.png diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/9.png.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/9.png.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/9.png.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/9.png.meta diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/Player_Run.anim b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/Player_Run.anim similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/Player_Run.anim rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/Player_Run.anim diff --git a/Assets/SunnyLand Artwork/Sprites/player/run/Player_Run.anim.meta b/Assets/SunnyLand Artwork/Sprites/player/crouch/run/Player_Run.anim.meta similarity index 100% rename from Assets/SunnyLand Artwork/Sprites/player/run/Player_Run.anim.meta rename to Assets/SunnyLand Artwork/Sprites/player/crouch/run/Player_Run.anim.meta diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 53dfff6..90e8167 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,18 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 15} - - {fileID: 17} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 947 - m_MinSize: {x: 400, y: 300} - m_MaxSize: {x: 32384, y: 24288} + width: 1536 + height: 730.8 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 55541 + controlID: 14713 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -42,14 +41,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 420 - y: 73 - width: 1187 - height: 433 + x: 284.2 + y: 19 + width: 791.60004 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -62,7 +61,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1187, y: 412} + m_TargetSize: {x: 791.60004, y: 382.8} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -77,10 +76,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -593.5 - m_HBaseRangeMax: 593.5 - m_VBaseRangeMin: -206 - m_VBaseRangeMax: 206 + m_HBaseRangeMin: -316.64 + m_HBaseRangeMax: 316.64 + m_VBaseRangeMin: -153.12 + m_VBaseRangeMax: 153.12 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -89,7 +88,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -98,23 +97,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1187 - height: 412 + width: 791.60004 + height: 382.8 m_Scale: {x: 1, y: 1} - m_Translation: {x: 593.5, y: 206} + m_Translation: {x: 395.80002, y: 191.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -593.5 - y: -206 - width: 1187 - height: 412 + x: -395.80002 + y: -191.4 + width: 791.60004 + height: 382.8 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1187, y: 433} + m_LastWindowPixelSize: {x: 989.50006, y: 504.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -134,17 +133,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 12} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1609 - height: 947 - m_MinSize: {x: 200, y: 300} - m_MaxSize: {x: 16192, y: 24288} + width: 1076.8 + height: 730.8 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 55542 + controlID: 14714 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +163,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1609 - height: 681 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1076.8 + height: 424.8 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 55543 + controlID: 14715 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,8 +186,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 420 - height: 681 + width: 283.2 + height: 424.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -212,14 +211,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 419 - height: 660 + y: 73.6 + width: 282.2 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -227,9 +226,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 724a0100 - m_LastClickedID: 84594 - m_ExpandedIDs: 206effff9470fffff4faffff427300003e47010048470100bc470100d64b0100 + m_SelectedIDs: 90a00200 + m_LastClickedID: 172176 + m_ExpandedIDs: 863effff2e61ffffc261ffffae64ffff5efaffff2a770000fc7a0000087b0000fa7c0000f49f0200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -254,31 +253,6 @@ MonoBehaviour: m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 --- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 420 - y: 0 - width: 1189 - height: 681 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 55544 ---- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -293,19 +267,21 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 283.2 y: 0 - width: 1189 - height: 454 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 793.60004 + height: 424.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - - {fileID: 9} + - {fileID: 8} - {fileID: 2} + - {fileID: 9} + - {fileID: 10} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -321,14 +297,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 518 - y: 73 - width: 1452 - height: 433 + x: 283.2 + y: 73.6 + width: 791.60004 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -339,7 +315,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -585,9 +561,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 250.88445, y: 7.2063003, z: -8.931474} + m_Target: {x: 37.391384, y: 41.640648, z: -2.616785} speed: 2 - m_Value: {x: 250.88445, y: 7.2063003, z: -8.931474} + m_Value: {x: 37.391384, y: 41.640648, z: -2.616785} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -604,7 +580,7 @@ MonoBehaviour: showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 - m_FxEnabled: 0 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -638,9 +614,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.415252 + m_Target: 90.281685 speed: 2 - m_Value: 6.415252 + m_Value: 90.281685 m_Ortho: m_Target: 1 speed: 2 @@ -665,285 +641,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &10 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 454 - width: 1189 - height: 227 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 11} - m_Panes: - - {fileID: 11} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 420 - y: 527 - width: 1187 - height: 206 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 84594 ---- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 681 - width: 1609 - height: 266 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 754 - width: 1608 - height: 245 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/SunnyLand Artwork/Sprites/player/climb - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/SunnyLand Artwork/Sprites/player/climb - m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\GAME1\Documents\unity_repos\Chataigne_Plateformer - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 259} - m_SelectedIDs: ceab0000 - m_LastClickedID: 43982 - m_ExpandedIDs: 00000000e4800000e6800000e8800000ec800000ee800000f4800000fa800000d68e0000e08e000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000e4800000e6800000e8800000ec800000ee800000f4800000fa800000d68e000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: 724a0100 - m_LastClickedInstanceID: 84594 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c62300002a960300 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 754 - width: 1290 - height: 245 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1609 - y: 0 - width: 507 - height: 947 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -959,14 +657,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1609 - y: 73 - width: 505 - height: 926 + x: 1 + y: 19 + width: 1133.4 + height: 329.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1160,7 +858,233 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &17 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 348 + y: 73.6 + width: 978.80005 + height: 504.59998 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 172176 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 424.8 + width: 1076.8 + height: 306 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 498.4 + width: 1075.8 + height: 285 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scenes + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scenes + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\solen\OneDrive\Documents\REPOS_github\Chataigne_Plateformer + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e2810000 + m_LastClickedID: 33250 + m_ExpandedIDs: 00000000da810000e0810000e48100007483000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 11} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000da810000e0810000e48100007483000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 90a00200 + m_LastClickedInstanceID: 172176 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c62300002a960300 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 11} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 498.4 + width: 1075.8 + height: 285 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1175,18 +1099,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2116 + x: 1076.8 y: 0 - width: 444 - height: 947 + width: 459.19995 + height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 18} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1202,14 +1126,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2116 - y: 73 - width: 443 - height: 926 + x: 1076.8 + y: 73.6 + width: 458.19995 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 56acc66..cee643e 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,13 +15,13 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43 - width: 2560 - height: 997 + y: 43.2 + width: 1536 + height: 780.8 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 350} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -44,9 +44,9 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 - height: 997 - m_MinSize: {x: 875, y: 350} + width: 1536 + height: 780.8 + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2560 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 2560 + y: 760.8 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -109,18 +109,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 6} - - {fileID: 13} - - {fileID: 14} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 947 - m_MinSize: {x: 400, y: 300} - m_MaxSize: {x: 32384, y: 24288} + width: 1536 + height: 730.8 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 55968 + controlID: 15168 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -135,17 +134,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 12} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1609 - height: 947 - m_MinSize: {x: 200, y: 300} - m_MaxSize: {x: 16192, y: 24288} + width: 1076 + height: 730.8 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 55969 + controlID: 15169 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1609 - height: 681 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1076 + height: 424.8 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 55970 + controlID: 15170 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,41 +187,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 420 - height: 681 + width: 283.2 + height: 424.8 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 16} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 --- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 10} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 420 - y: 0 - width: 1189 - height: 681 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 55971 ---- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -232,50 +206,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 0 + x: 283.2 y: 0 - width: 1189 - height: 454 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + width: 792.8 + height: 424.8 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 17} + - {fileID: 14} + - {fileID: 12} - {fileID: 15} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &11 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 454 - width: 1189 - height: 227 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &12 + m_LastSelected: 1 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -291,44 +241,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 681 - width: 1609 - height: 266 + y: 424.8 + width: 1076 + height: 306 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 19} - - {fileID: 20} + - {fileID: 17} + - {fileID: 18} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 1609 - y: 0 - width: 507 - height: 947 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 21} - m_Panes: - - {fileID: 21} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -343,18 +267,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2116 + x: 1076 y: 0 - width: 444 - height: 947 + width: 460 + height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 22} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -370,14 +294,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 420 - y: 73 - width: 1187 - height: 433 + x: 283.2 + y: 73.6 + width: 790.8 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -390,11 +314,11 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1187, y: 412} + m_TargetSize: {x: 790.8, y: 382.8} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 1 + m_EnterPlayModeBehavior: 0 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 0 @@ -405,10 +329,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -593.5 - m_HBaseRangeMax: 593.5 - m_VBaseRangeMin: -206 - m_VBaseRangeMax: 206 + m_HBaseRangeMin: -316.32 + m_HBaseRangeMax: 316.32 + m_VBaseRangeMin: -153.12 + m_VBaseRangeMax: 153.12 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -417,7 +341,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -426,29 +350,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1187 - height: 412 + width: 790.8 + height: 382.8 m_Scale: {x: 1, y: 1} - m_Translation: {x: 593.5, y: 206} + m_Translation: {x: 395.4, y: 191.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -593.5 - y: -206 - width: 1187 - height: 412 + x: -395.4 + y: -191.4 + width: 790.8 + height: 382.8 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1187, y: 433} + m_LastWindowPixelSize: {x: 988.5, y: 504.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,24 +388,24 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73 - width: 419 - height: 660 + y: 73.6 + width: 282.2 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 724a0100 - m_LastClickedID: 84594 - m_ExpandedIDs: 206effff9470fffff4faffff427300003e47010048470100bc470100d64b0100 + scrollPos: {x: 0, y: 97.20001} + m_SelectedIDs: 2440ffff + m_LastClickedID: -49116 + m_ExpandedIDs: 863effff2e61ffffc261ffffae64ffff5efaffff2a770000fc7a0000087b0000fa7c0000f49f0200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -505,7 +429,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -521,14 +445,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 518 - y: 73 - width: 1452 - height: 433 + x: 283.2 + y: 73.6 + width: 790.8 + height: 403.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -539,7 +463,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -101, y: -26} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -785,9 +709,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 250.88445, y: 7.2063003, z: -8.931474} + m_Target: {x: 200.52118, y: 3.2134576, z: -6.5310264} speed: 2 - m_Value: {x: 250.88445, y: 7.2063003, z: -8.931474} + m_Value: {x: 206.3672, y: 5.798437, z: -6.4369726} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -804,7 +728,7 @@ MonoBehaviour: showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 - m_FxEnabled: 0 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -838,9 +762,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.415252 + m_Target: 218.41304 speed: 2 - m_Value: 6.415252 + m_Value: 209.00769 m_Ortho: m_Target: 1 speed: 2 @@ -865,206 +789,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 420 - y: 527 - width: 1187 - height: 206 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 84594 ---- !u!114 &19 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} - m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 754 - width: 1608 - height: 245 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/SunnyLand Artwork/Sprites/player/climb - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/SunnyLand Artwork/Sprites/player/climb - m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\GAME1\Documents\unity_repos\Chataigne_Plateformer - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 259} - m_SelectedIDs: ceab0000 - m_LastClickedID: 43982 - m_ExpandedIDs: 00000000e4800000e6800000e8800000ec800000ee800000f4800000fa800000d68e0000e08e000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000e4800000e6800000e8800000ec800000ee800000f4800000fa800000d68e000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c62300002a960300 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 12} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &20 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 754 - width: 1290 - height: 245 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &21 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1080,14 +805,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1609 - y: 73 - width: 505 - height: 926 + x: 1 + y: 19 + width: 1133.4 + height: 329.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1281,7 +1006,206 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &22 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 348 + y: 73.6 + width: 978.80005 + height: 504.59998 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -46178 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 498.4 + width: 1075 + height: 285 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scenes + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scenes + m_LastFoldersGridSize: -1 + m_LastProjectPath: C:\Users\solen\OneDrive\Documents\REPOS_github\Chataigne_Plateformer + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e2810000 + m_LastClickedID: 33250 + m_ExpandedIDs: 00000000da810000e0810000e48100007483000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000da810000e0810000e48100007483000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c62300002a960300 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 10} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 498.4 + width: 1075 + height: 285 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1297,14 +1221,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2116 - y: 73 - width: 443 - height: 926 + x: 1076 + y: 73.6 + width: 459 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1316,7 +1240,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 516.80005 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: