diff --git a/Assets/Player/Player.prefab b/Assets/Player/Player.prefab index 1b7d838..bc08a48 100644 --- a/Assets/Player/Player.prefab +++ b/Assets/Player/Player.prefab @@ -1038,7 +1038,7 @@ CharacterController: serializedVersion: 2 m_Height: 3 m_Radius: 1 - m_SlopeLimit: 75 + m_SlopeLimit: 75.01 m_StepOffset: 1.5 m_SkinWidth: 0.08 m_MinMoveDistance: 0 diff --git a/Assets/Scenes/Mountain.unity b/Assets/Scenes/Mountain.unity index d304df5..350db66 100644 --- a/Assets/Scenes/Mountain.unity +++ b/Assets/Scenes/Mountain.unity @@ -492,7 +492,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 436779933} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &366952851 MeshCollider: @@ -592,8 +592,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 392546070} m_LocalRotation: {x: -0, y: 0.93505573, z: -0, w: 0.35450074} - m_LocalPosition: {x: -1401.5497, y: -101.23, z: -3266.0686} - m_LocalScale: {x: 25.01164, y: 2.501164, z: 25.01164} + m_LocalPosition: {x: -1394.2, y: -101.23, z: -3265.1} + m_LocalScale: {x: 28.92346, y: 2.892346, z: 28.92346} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2077331998} @@ -1104,10 +1104,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 872275959} - - {fileID: 672092648} - - {fileID: 366952850} - - {fileID: 1651078844} - {fileID: 437583651} + - {fileID: 1651078844} + - {fileID: 366952850} + - {fileID: 672092648} m_Father: {fileID: 2077331998} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1143,7 +1143,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 436779933} - m_RootOrder: 4 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &437583652 MeshCollider: @@ -1557,7 +1557,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 436779933} - m_RootOrder: 1 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &672092649 MeshCollider: @@ -2008,6 +2008,103 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &909201194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 909201195} + - component: {fileID: 909201198} + - component: {fileID: 909201197} + - component: {fileID: 909201196} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &909201195 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909201194} + m_LocalRotation: {x: -0, y: -0.35973576, z: -0, w: 0.93305427} + m_LocalPosition: {x: -1359.4, y: -104.134674, z: -3273.3} + m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2077331998} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: -42.168, z: 0} +--- !u!65 &909201196 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909201194} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &909201197 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909201194} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &909201198 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 909201194} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &925009686 GameObject: m_ObjectHideFlags: 0 @@ -2434,6 +2531,103 @@ Transform: m_Father: {fileID: 2082500391} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1431375352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1431375353} + - component: {fileID: 1431375356} + - component: {fileID: 1431375355} + - component: {fileID: 1431375354} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1431375353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1431375352} + m_LocalRotation: {x: -0, y: -0.86631376, z: -0, w: 0.49950033} + m_LocalPosition: {x: -1356.4, y: -104.134674, z: -3328.2} + m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2077331998} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: -120.066, z: 0} +--- !u!65 &1431375354 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1431375352} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1431375355 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1431375352} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1431375356 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1431375352} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1561401313 GameObject: m_ObjectHideFlags: 0 @@ -2959,6 +3153,103 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &1617412154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1617412155} + - component: {fileID: 1617412158} + - component: {fileID: 1617412157} + - component: {fileID: 1617412156} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1617412155 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617412154} + m_LocalRotation: {x: -0, y: -0.35973576, z: -0, w: 0.93305427} + m_LocalPosition: {x: -1386.8, y: -104.134674, z: -3324.3} + m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2077331998} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: -42.168, z: 0} +--- !u!65 &1617412156 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617412154} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1617412157 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617412154} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1617412158 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617412154} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1620235925 GameObject: m_ObjectHideFlags: 0 @@ -3201,7 +3492,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 436779933} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &1651078845 MeshCollider: @@ -3294,14 +3585,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1716491135} - m_LocalRotation: {x: 0.68841404, y: -0.000000048428777, z: 0.09282742, w: 0.7193533} - m_LocalPosition: {x: -1373.3, y: -97.803635, z: -3332.4} - m_LocalScale: {x: 6.2758, y: 6.2758, z: 6.2758} + m_LocalRotation: {x: 0.65049183, y: -0.16008838, z: 0.24370272, w: 0.70131385} + m_LocalPosition: {x: -1368.1, y: -97.803635, z: -3316.6} + m_LocalScale: {x: 9.233585, y: 9.233585, z: 9.233585} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 57368836} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 82.065, y: 67.794, z: 75.339} + m_LocalEulerAnglesHint: {x: 82.065, y: 42.077, z: 75.339} --- !u!114 &1716491137 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3315,6 +3606,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scene: WorldMap + _spawnPoint: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3} --- !u!64 &1716491138 MeshCollider: m_ObjectHideFlags: 0 @@ -4118,6 +4410,9 @@ Transform: - {fileID: 35772942} - {fileID: 57368836} - {fileID: 165937104} + - {fileID: 909201195} + - {fileID: 1617412155} + - {fileID: 1431375353} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -172.32, z: 0} diff --git a/Assets/Scenes/Temple.unity b/Assets/Scenes/Temple.unity index 351435e..e6ae26d 100644 --- a/Assets/Scenes/Temple.unity +++ b/Assets/Scenes/Temple.unity @@ -3299,7 +3299,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 887465837} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 802.6505, y: 12.510616, z: -152} + m_LocalPosition: {x: 198, y: 12.510616, z: 23} m_LocalScale: {x: 347.2, y: 347.2, z: 347.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -4185,6 +4185,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scene: WorldMap + _spawnPoint: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3} --- !u!1 &1207374167 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8371988295430097843, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3} @@ -6422,9 +6423,7 @@ GameObject: - component: {fileID: 1683568855} - component: {fileID: 1683568854} - component: {fileID: 1683568853} - - component: {fileID: 1683568852} - component: {fileID: 1683568856} - - component: {fileID: 1683568857} m_Layer: 0 m_Name: Temple D Zone m_TagString: Untagged @@ -6441,24 +6440,12 @@ Transform: m_GameObject: {fileID: 1683568850} m_LocalRotation: {x: -0, y: 0.59908956, z: -0, w: 0.80068207} m_LocalPosition: {x: 450.61426, y: 423.38245, z: -441.3246} - m_LocalScale: {x: 39.46, y: 39.46, z: 39.46} + m_LocalScale: {x: 94.64862, y: 94.64862, z: 94.64862} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 583349410} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 73.609, z: 0} ---- !u!114 &1683568852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683568850} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d750c023dab0b040a63e345c8b2830d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!65 &1683568853 BoxCollider: m_ObjectHideFlags: 0 @@ -6535,18 +6522,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3} ---- !u!114 &1683568857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1683568850} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1696556166 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9133296873901943786, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3} diff --git a/Assets/Scenes/TitleScreen.unity b/Assets/Scenes/TitleScreen.unity index ec06ea3..b4c6a23 100644 --- a/Assets/Scenes/TitleScreen.unity +++ b/Assets/Scenes/TitleScreen.unity @@ -134,9 +134,9 @@ GameObject: - component: {fileID: 82480} - component: {fileID: 82479} - component: {fileID: 82478} + - component: {fileID: 82482} - component: {fileID: 82477} - component: {fileID: 82481} - - component: {fileID: 82482} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -220,7 +220,7 @@ RectTransform: - {fileID: 1072745562} - {fileID: 714166849} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -251,6 +251,321 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 253db048700363d419cdd2430bb39594, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &46212140 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8700725330082129686, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &46212144 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46212140} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &46212145 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46212140} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 6239881831769578202, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &62948269 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5118718654049349811, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &62948273 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62948269} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &62948274 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 62948269} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 582929404686336434, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &63502464 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5824510187379060028, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &63502468 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63502464} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &63502469 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 63502464} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5287425419667122880, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &64989856 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6733177361254619370, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &64989860 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64989856} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &64989861 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64989856} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 8691780276856062721, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &295928507 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3029419914001338269, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &295928511 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 295928507} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &295928512 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 295928507} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -7453770956514601984, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &506946345 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &506946349 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506946345} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &506946350 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506946345} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8678823145569952518, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &560873534 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3849762623622064168, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &560873538 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 560873534} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &560873539 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 560873534} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -125435165217083709, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &570046298 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7029948723529949830, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &570046302 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570046298} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &570046303 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 570046298} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -462981019419857548, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &577671485 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -817925072480010518, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &577671489 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577671485} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &577671490 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 577671485} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -3089802480582621648, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1 &581646820 GameObject: m_ObjectHideFlags: 0 @@ -343,8 +658,78 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &617805625 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 359312179909449575, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &617805629 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617805625} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &617805630 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 617805625} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 150581138598605843, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &650872535 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8415129438696708325, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &650872539 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650872535} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &650872540 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 650872535} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4047570355474788538, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1 &714166848 GameObject: m_ObjectHideFlags: 0 @@ -418,6 +803,146 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 714166848} m_CullTransparentMesh: 1 +--- !u!1 &741599666 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5148817236446094103, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &741599670 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741599666} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &741599671 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741599666} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4579454407841743219, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &752204101 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6512510688612296998, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &752204105 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752204101} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &752204106 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 752204101} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3163171260390484736, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &882245426 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7839774403502766560, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &882245430 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 882245426} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &882245431 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 882245426} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -2611713111728331920, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &944100616 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8153468022190502949, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &944100620 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944100616} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &944100621 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944100616} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 1568016432510859342, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1 &1072745561 GameObject: m_ObjectHideFlags: 0 @@ -491,6 +1016,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072745561} m_CullTransparentMesh: 1 +--- !u!1 &1115518035 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -1155751280581548556, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1115518039 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115518035} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1115518040 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115518035} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -614873171625502810, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1 &1313739774 GameObject: m_ObjectHideFlags: 0 @@ -536,8 +1096,43 @@ Transform: m_Children: - {fileID: 1696198992} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1348695381 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8513859187771203891, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1348695385 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348695381} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1348695386 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348695381} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -7387706064836869012, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1001 &1376266713 PrefabInstance: m_ObjectHideFlags: 0 @@ -547,7 +1142,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} propertyPath: m_LocalPosition.x @@ -600,6 +1195,181 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} m_PrefabInstance: {fileID: 1376266713} m_PrefabAsset: {fileID: 0} +--- !u!1 &1429562471 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8416272007918961125, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1429562475 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429562471} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1429562476 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1429562471} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1550514412580984892, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &1442519025 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -2571958757387108284, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1442519029 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442519025} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1442519030 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1442519025} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 7803668523658286640, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &1478740021 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -8391222552659086748, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1478740025 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478740021} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1478740026 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1478740021} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5495902117074765545, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &1497123222 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2800250516343163423, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1497123226 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497123222} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1497123227 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1497123222} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 3390558720134950976, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &1615023915 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -7640558969779515294, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1615023919 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615023915} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1615023920 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615023915} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -5053925668127403250, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1 &1696198989 GameObject: m_ObjectHideFlags: 0 @@ -610,7 +1380,6 @@ GameObject: m_Component: - component: {fileID: 1696198992} - component: {fileID: 1696198991} - - component: {fileID: 1696198993} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -676,14 +1445,41 @@ Transform: m_Father: {fileID: 1313739776} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &1696198993 -AudioListener: +--- !u!1 &1806231094 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5568371526223589888, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1806231098 +Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696198989} + m_GameObject: {fileID: 1806231094} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &1806231099 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806231094} + m_Material: {fileID: 0} + m_IsTrigger: 0 m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 2534964839176971238, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} --- !u!1001 &1827405165 PrefabInstance: m_ObjectHideFlags: 0 @@ -693,7 +1489,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_RootOrder - value: 4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} propertyPath: m_LocalPosition.x @@ -741,3 +1537,143 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3} +--- !u!1 &2038473121 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -516098083770646512, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2038473125 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2038473121} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &2038473126 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2038473121} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4493585093827132993, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &2061772893 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -5546747315237514756, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2061772897 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061772893} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &2061772898 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2061772893} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 5512361600001258384, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &2081238769 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 921391927218321214, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2081238773 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081238769} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &2081238774 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2081238769} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6968846074178130577, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} +--- !u!1 &2087518699 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -391268320553695201, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} + m_PrefabInstance: {fileID: 1376266713} + m_PrefabAsset: {fileID: 0} +--- !u!54 &2087518703 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2087518699} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!64 &2087518704 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2087518699} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -8803937527578110353, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3} diff --git a/Assets/Scripts/GameManager/GameManager.cs b/Assets/Scripts/GameManager/GameManager.cs index 1f1aeb5..ed06626 100644 --- a/Assets/Scripts/GameManager/GameManager.cs +++ b/Assets/Scripts/GameManager/GameManager.cs @@ -7,7 +7,6 @@ namespace Scampz.GameJam public class GameManager : MonoBehaviour { public static GameManager Instance; - private LevelChanger _levelChanger; private void Awake() { @@ -16,20 +15,26 @@ namespace Scampz.GameJam Destroy(this); return; } - Instance = this; - _levelChanger = GetComponentInChildren(); } - public void LoadScene(string sceneName, LoadSceneMode loadSceneMode) + public void LoadScene(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode) { - StartCoroutine(LoadSceneAsync(sceneName, loadSceneMode)); + StartCoroutine(LoadSceneAsync(sceneName, spawnPoint, loadSceneMode)); } - private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode) + public void LoadFromWorldMap(LoadSceneMode loadSceneMode) { - _levelChanger.FadeAnimation(); + SceneManager.LoadScene("WorldMap", loadSceneMode); + } + + private IEnumerator LoadSceneAsync(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode) + { + yield return null; + var player = GameObject.FindGameObjectWithTag("Player"); + var levelChanger = GetComponentInChildren(); + levelChanger.FadeAnimation(); yield return null; var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode); yield return new WaitForSeconds(3f); @@ -44,6 +49,11 @@ namespace Scampz.GameJam loadSceneOperation.allowSceneActivation = true; yield return loadSceneOperation; + var cc = player.GetComponent(); + cc.enabled = false; + player.transform.position = spawnPoint.position; + player.transform.rotation = spawnPoint.rotation; + yield return null; } } } diff --git a/Assets/Scripts/Player/PlayerState.cs b/Assets/Scripts/Player/PlayerState.cs index 47954cc..8e00df4 100644 --- a/Assets/Scripts/Player/PlayerState.cs +++ b/Assets/Scripts/Player/PlayerState.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.SceneManagement; namespace Scampz.GameJam.Assets.Scripts.Player { @@ -21,7 +22,7 @@ namespace Scampz.GameJam.Assets.Scripts.Player _canMove = true; _animator.SetFloat("Speed", _characterController.velocity.magnitude); var rayCasterExists = TryGetComponent(out var rayCaster); - if (rayCasterExists) + if (SceneManager.GetActiveScene().name.Equals("WorldMap") && rayCasterExists) _canMove = rayCaster.IsWithinBoundsWithRay(); } diff --git a/Assets/Scripts/SceneManagement/LoadScene.cs b/Assets/Scripts/SceneManagement/LoadScene.cs index 85054ed..e90a166 100644 --- a/Assets/Scripts/SceneManagement/LoadScene.cs +++ b/Assets/Scripts/SceneManagement/LoadScene.cs @@ -8,13 +8,15 @@ namespace Scampz.GameJam private bool loaded = false; [SerializeField] private string scene; + [SerializeField] + private Transform _spawnPoint; void OnTriggerEnter(Collider collider) { if (!loaded && collider.CompareTag("Player")) { loaded = true; - GameManager.Instance.LoadScene(scene, LoadSceneMode.Single); + GameManager.Instance.LoadScene(scene, _spawnPoint, LoadSceneMode.Single); } } } diff --git a/Assets/Scripts/TitleScreen/TitleScreen.cs b/Assets/Scripts/TitleScreen/TitleScreen.cs index 6a844da..395aab3 100644 --- a/Assets/Scripts/TitleScreen/TitleScreen.cs +++ b/Assets/Scripts/TitleScreen/TitleScreen.cs @@ -10,7 +10,7 @@ namespace Scampz.GameJam { if (Input.GetButtonDown(InputOptions.Submit)) { - GameManager.Instance.LoadScene("WorldMap", LoadSceneMode.Single); + GameManager.Instance.LoadFromWorldMap(LoadSceneMode.Single); } } } diff --git a/Assets/Singleton/SingletonManager.prefab b/Assets/Singleton/SingletonManager.prefab index 26ea085..026084f 100644 --- a/Assets/Singleton/SingletonManager.prefab +++ b/Assets/Singleton/SingletonManager.prefab @@ -459,7 +459,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3584299648992395886} - - component: {fileID: 7941352839808612940} + - component: {fileID: 2037842046} m_Layer: 0 m_Name: Game Manager m_TagString: Untagged @@ -483,7 +483,7 @@ Transform: m_Father: {fileID: 3584299649024768172} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7941352839808612940 +--- !u!114 &2037842046 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f83e270..b077b57 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/TitleScreen.unity + guid: db85c8a913eb62e44b74bd0ac4c660c7 - enabled: 1 path: Assets/Scenes/WorldMap.unity guid: 70adf3ac8cd6ed047afaee7d42e6d836 @@ -14,9 +17,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Mountain.unity guid: ee81386bad9331a43a9ddeee098c68e8 - - enabled: 1 - path: Assets/Scenes/TitleScreen.unity - guid: db85c8a913eb62e44b74bd0ac4c660c7 - enabled: 1 path: Assets/Scenes/Airship.unity guid: b11cef1efc4f9c145984a8273cf40f29