diff --git a/Assets/Resources/LevelData/2.asset b/Assets/Resources/LevelData/2.asset index 9d2466a..8903360 100644 --- a/Assets/Resources/LevelData/2.asset +++ b/Assets/Resources/LevelData/2.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: 2 m_EditorClassIdentifier: Assembly-CSharp::LevelData levelID: 2 - timeLimit: 30 - maxReplyCount: 1 + timeLimit: 1000 + maxReplyCount: 100 nextLevelData: {fileID: 11400000, guid: 1277e94fea55582409d5b9ebed074313, type: 2} diff --git a/Assets/Resources/Prefabs/Player/Ghost.prefab b/Assets/Resources/Prefabs/Player/Ghost.prefab index 595345e..1a4e6cb 100644 --- a/Assets/Resources/Prefabs/Player/Ghost.prefab +++ b/Assets/Resources/Prefabs/Player/Ghost.prefab @@ -35,8 +35,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6310145167924703520} - - {fileID: 6300331755610773185} - {fileID: 4340425662678190451} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -124,7 +122,7 @@ Rigidbody2D: m_Bits: 0 m_Interpolate: 1 m_SleepingMode: 1 - m_CollisionDetection: 1 + m_CollisionDetection: 0 m_Constraints: 4 --- !u!61 &3579431522946132784 BoxCollider2D: @@ -187,17 +185,18 @@ MonoBehaviour: moveSpeed: 4 jumpForce: 8.5 poleForce: 3 - groundCheckCollider: {fileID: 2709621320460236112} - hangWallCheckCollider: {fileID: 808045438588007676} + groundCheckSize: {x: 1.2, y: 0.2} + groundCheckOffset: {x: 0, y: -0.5} + hangCheckSize: {x: 1.2, y: 0.97} + hangCheckOffset: {x: 0, y: -0.2} groundLayer: serializedVersion: 2 - m_Bits: 8 + m_Bits: 264 hangingWallLayer: serializedVersion: 2 m_Bits: 512 hangingWallCollider: {fileID: 0} hangingWallRigidBody: {fileID: 0} - footstepRate: 0.3 --- !u!95 &676705953958797541 Animator: serializedVersion: 7 @@ -251,7 +250,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4340425662678190451 Transform: m_ObjectHideFlags: 0 @@ -418,279 +417,3 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!1 &4002533940390952431 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6300331755610773185} - - component: {fileID: 1005087433339588838} - - component: {fileID: 2709621320460236112} - m_Layer: 7 - m_Name: Foot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6300331755610773185 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002533940390952431} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.03, y: -0.498, z: 0} - m_LocalScale: {x: 0.53, y: 0.1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7588602306031819191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1005087433339588838 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002533940390952431} - m_Enabled: 0 - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 0, b: 0, 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_SpriteSortPoint: 0 ---- !u!61 &2709621320460236112 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4002533940390952431} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!1 &6404803895780848317 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6310145167924703520} - - component: {fileID: 3755142527984776671} - - component: {fileID: 808045438588007676} - m_Layer: 7 - m_Name: Hang - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6310145167924703520 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6404803895780848317} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.07, y: -0.16, z: 0} - m_LocalScale: {x: 0.77, y: 0.73, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7588602306031819191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3755142527984776671 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6404803895780848317} - m_Enabled: 0 - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.14481235, g: 1, b: 0, 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_SpriteSortPoint: 0 ---- !u!61 &808045438588007676 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6404803895780848317} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 diff --git a/Assets/Resources/Prefabs/Player/Player.prefab b/Assets/Resources/Prefabs/Player/Player.prefab index 29781cd..9fc1e45 100644 --- a/Assets/Resources/Prefabs/Player/Player.prefab +++ b/Assets/Resources/Prefabs/Player/Player.prefab @@ -37,8 +37,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3943275774170693834} - - {fileID: 7944902203221672218} - {fileID: 8793401598569977826} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -126,7 +124,7 @@ Rigidbody2D: m_Bits: 0 m_Interpolate: 1 m_SleepingMode: 1 - m_CollisionDetection: 1 + m_CollisionDetection: 0 m_Constraints: 4 --- !u!114 &9183217660445491922 MonoBehaviour: @@ -143,8 +141,10 @@ MonoBehaviour: moveSpeed: 4 jumpForce: 8.5 poleForce: 3 - groundCheckCollider: {fileID: 5495617370377014515} - hangWallCheckCollider: {fileID: 6481877445078531268} + groundCheckSize: {x: 1.2, y: 0.2} + groundCheckOffset: {x: 0, y: -0.5} + hangCheckSize: {x: 1.2, y: 0.81} + hangCheckOffset: {x: 0, y: -0.2} groundLayer: serializedVersion: 2 m_Bits: 264 @@ -153,7 +153,6 @@ MonoBehaviour: m_Bits: 512 hangingWallCollider: {fileID: 0} hangingWallRigidBody: {fileID: 0} - footstepRate: 0.3 --- !u!114 &7321184312672384639 MonoBehaviour: m_ObjectHideFlags: 0 @@ -295,7 +294,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &8793401598569977826 Transform: m_ObjectHideFlags: 0 @@ -462,307 +461,3 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!1 &2569477875044198337 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7944902203221672218} - - component: {fileID: 6414477000461253142} - - component: {fileID: 6481877445078531268} - - component: {fileID: 4163805818211508829} - m_Layer: 6 - m_Name: Hang - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7944902203221672218 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2569477875044198337} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.07, y: -0.16, z: 0} - m_LocalScale: {x: 0.77, y: 0.73, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7588602306031819191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6414477000461253142 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2569477875044198337} - m_Enabled: 0 - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.14481235, g: 1, b: 0, 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_SpriteSortPoint: 0 ---- !u!61 &6481877445078531268 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2569477875044198337} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!50 &4163805818211508829 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2569477875044198337} - m_BodyType: 1 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!1 &2757615747814713057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3943275774170693834} - - component: {fileID: 1456137351026860733} - - component: {fileID: 5495617370377014515} - m_Layer: 6 - m_Name: Foot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3943275774170693834 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2757615747814713057} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.03, y: -0.525, z: 0} - m_LocalScale: {x: 0.53, y: 0.1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7588602306031819191} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1456137351026860733 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2757615747814713057} - m_Enabled: 0 - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_MaskInteraction: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 0, b: 0, 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_SpriteSortPoint: 0 ---- !u!61 &5495617370377014515 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2757615747814713057} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 diff --git a/Assets/Resources/Scripts/Manager/GameManager.cs b/Assets/Resources/Scripts/Manager/GameManager.cs index 4bd452a..ba4377a 100644 --- a/Assets/Resources/Scripts/Manager/GameManager.cs +++ b/Assets/Resources/Scripts/Manager/GameManager.cs @@ -49,6 +49,8 @@ public class GameManager : MonoBehaviour Destroy(gameObject); return; } + + Application.targetFrameRate = 60; } private void Start() @@ -135,7 +137,8 @@ public class GameManager : MonoBehaviour public void ExitLevel() { gameState = GameState.Lobby; - + + Time.timeScale = 1; currentLevelData = null; currentTimer = 0; currentReplayCount = 0; diff --git a/Assets/Resources/Scripts/Manager/SpawnManager.cs b/Assets/Resources/Scripts/Manager/SpawnManager.cs index e7940c4..421bb81 100644 --- a/Assets/Resources/Scripts/Manager/SpawnManager.cs +++ b/Assets/Resources/Scripts/Manager/SpawnManager.cs @@ -91,15 +91,18 @@ public class SpawnManager : MonoBehaviour cameraEffect.SetTarget(currentPlayer.transform); currentReplayIndex = 0; SoundManager.instance.PlaySFX(SfxType.Replay); - foreach (var record in allRecordedFrames) + for(int i = 0; i < 100; i++) { - GameObject ghost = Instantiate(ghostPrefab, spawnPoint.position, Quaternion.identity); - GhostController ghostController = ghost.GetComponent(); - ActiveGhost addedGhost = new ActiveGhost(); - addedGhost.controller = ghostController; - addedGhost.recordedFrames = record; - - activeGhostList.Add(addedGhost); + foreach (var record in allRecordedFrames) + { + GameObject ghost = Instantiate(ghostPrefab, spawnPoint.position, Quaternion.identity); + GhostController ghostController = ghost.GetComponent(); + ActiveGhost addedGhost = new ActiveGhost(); + addedGhost.controller = ghostController; + addedGhost.recordedFrames = record; + + activeGhostList.Add(addedGhost); + } } } } diff --git a/Assets/Resources/Scripts/Player/PlayerMovement.cs b/Assets/Resources/Scripts/Player/PlayerMovement.cs index bb7923f..d99adac 100644 --- a/Assets/Resources/Scripts/Player/PlayerMovement.cs +++ b/Assets/Resources/Scripts/Player/PlayerMovement.cs @@ -17,8 +17,12 @@ public class PlayerMovement : MonoBehaviour [SerializeField] private float poleForce = 3f; [Header("감지 설정")] - [SerializeField] private BoxCollider2D groundCheckCollider; - [SerializeField] private BoxCollider2D hangWallCheckCollider; + [SerializeField] private Vector2 groundCheckSize = new Vector2(0.5f, 0.2f); + [SerializeField] private Vector2 groundCheckOffset = new Vector2(0f, -0.6f); + + [SerializeField] private Vector2 hangCheckSize = new Vector2(0.3f, 0.5f); + [SerializeField] private Vector2 hangCheckOffset = new Vector2(0.4f, 0.5f); + [SerializeField] private LayerMask groundLayer; [SerializeField] private LayerMask hangingWallLayer; @@ -40,7 +44,7 @@ public class PlayerMovement : MonoBehaviour _rigidbody2D = GetComponent(); _collider2D = GetComponent(); _animator = GetComponent(); - isPlayer = gameObject.tag.Equals("Player"); + isPlayer = gameObject.CompareTag("Player"); } private void FixedUpdate() @@ -52,13 +56,12 @@ public class PlayerMovement : MonoBehaviour return; } - // 바닥 체크 - bool isGround = IsGrounded(); + bool isGrounded = IsGrounded(); + float yVel = _rigidbody2D.linearVelocity.y; - // 애니메이션 조건 설정 - _animator.SetBool("isRun", inputVector.x != 0 && isGround); - _animator.SetBool("isGround", isGround); + _animator.SetBool("isRun", inputVector.x != 0 && isGrounded); + _animator.SetBool("isGround", isGrounded); _animator.SetFloat("yVelocity", yVel); // 메달릴때 이동 @@ -71,30 +74,10 @@ public class PlayerMovement : MonoBehaviour return; } - // 보는 방향으로 돌리기( 매달린 상태에선 고정 ) HandleRotation(); - // 입력값 만큼 움직이기 + // 이동 로직 _rigidbody2D.linearVelocity = new Vector2(inputVector.x * moveSpeed, _rigidbody2D.linearVelocity.y); - - // 사운드 나오는 부분 일단 주석해놓기 - - // if (isGround && inputVector.x != 0) - // { - // footstepTimer -= Time.deltaTime; - // if (footstepTimer <= 0) - // { - // if (isPlayer) - // { - // SoundManager.instance.PlaySFX(SfxType.Walk); - // } - // footstepTimer = footstepRate; - // } - // } - // else - // { - // footstepTimer = 0; - // } } public void SetMoveInput(Vector2 input) @@ -141,15 +124,15 @@ public class PlayerMovement : MonoBehaviour return; } - // 매달린 상태라면 취소 if (isHanging) { CancelHanging(); } - // 아니라면 Collider 가 있는지 체크하고 붙기 else { - Collider2D hit = Physics2D.OverlapBox(hangWallCheckCollider.bounds.center, hangWallCheckCollider.size, 0, hangingWallLayer); + Vector2 checkPos = transform.TransformPoint(hangCheckOffset); + + Collider2D hit = Physics2D.OverlapBox(checkPos, hangCheckSize, 0, hangingWallLayer); if (hit != null) { HangingObject(); @@ -167,8 +150,11 @@ public class PlayerMovement : MonoBehaviour hangingWallCollider = null; } transform.SetParent(null, true); - _rigidbody2D.linearVelocity = hangingWallRigidBody.linearVelocity * 4; - hangingWallRigidBody = null; + if (hangingWallRigidBody != null) + { + _rigidbody2D.linearVelocity = hangingWallRigidBody.linearVelocity * 4; + hangingWallRigidBody = null; + } } private void HangingObject() @@ -195,7 +181,8 @@ public class PlayerMovement : MonoBehaviour private bool IsGrounded() { - return groundCheckCollider.IsTouchingLayers(groundLayer); + Vector2 checkPos = (Vector2)transform.position + groundCheckOffset; + return Physics2D.OverlapBox(checkPos, groundCheckSize, 0f, groundLayer); } private void HandleRotation() @@ -209,4 +196,12 @@ public class PlayerMovement : MonoBehaviour transform.rotation = Quaternion.Euler(0, 180, 0); } } + private void OnDrawGizmosSelected() + { + Gizmos.color = Color.green; + Gizmos.DrawWireCube((Vector2)transform.position + groundCheckOffset, groundCheckSize); + Gizmos.color = Color.cyan; + Vector2 hangPos = transform.TransformPoint(hangCheckOffset); + Gizmos.DrawWireCube(hangPos, hangCheckSize); + } } \ No newline at end of file