From b03b4a4ede7237075b8fa03c157866e025dd8c28 Mon Sep 17 00:00:00 2001 From: kimmoonwoong Date: Mon, 15 Aug 2022 14:42:34 +0900 Subject: [PATCH] =?UTF-8?q?feature:=20=ED=8C=8C=EB=8F=99=EA=B2=8C=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...352\271\200\353\254\270\354\233\205.unity" | 1574 +++++++++-------- .../Core/MonoBehaviour/MeleeAttackable.cs | 6 +- .../Scripts/Core/MonoBehaviour/Paringable.cs | 9 +- .../Core/MonoBehaviour/PlayerCharacter.cs | 9 +- .../Player/MeleeAttackCombo2SMB.cs | 5 +- .../Player/MeleeAttackCombo3SMB.cs | 5 +- .../Player/MeleeAttackCombo4SMB.cs | 5 +- .../Player/MeleeAttackComboSMB.cs | 5 +- 8 files changed, 826 insertions(+), 792 deletions(-) diff --git "a/Project_Blind/Assets/Scenes/\352\271\200\353\254\270\354\233\205.unity" "b/Project_Blind/Assets/Scenes/\352\271\200\353\254\270\354\233\205.unity" index 0bbe2660..a4a86c61 100644 --- "a/Project_Blind/Assets/Scenes/\352\271\200\353\254\270\354\233\205.unity" +++ "b/Project_Blind/Assets/Scenes/\352\271\200\353\254\270\354\233\205.unity" @@ -335,170 +335,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &172629596 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 42 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 704 - _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &173849289 PrefabInstance: m_ObjectHideFlags: 0 @@ -590,6 +426,18 @@ PrefabInstance: propertyPath: _spawnPoint value: objectReference: {fileID: 1360829223} + - target: {fileID: 7138595047812326861, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} + propertyPath: maxWaveGauge + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7138595047812326861, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} + propertyPath: attackWaveGauge + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 7138595047812326861, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} + propertyPath: paringWaveGauge + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 7138595048606892256, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} propertyPath: m_Enabled value: 1 @@ -770,200 +618,36 @@ Transform: m_CorrespondingSourceObject: {fileID: 6540852046543418591, guid: a1ce373c235fffb488b67c95390b841c, type: 3} m_PrefabInstance: {fileID: 1481200029} m_PrefabAsset: {fileID: 0} ---- !u!43 &477420249 -Mesh: +--- !u!1 &489705952 +GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4130092069143574498, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 276885348} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 489705956} + - component: {fileID: 489705955} + - component: {fileID: 489705954} + - component: {fileID: 489705953} + - component: {fileID: 489705957} + m_Layer: 6 + m_Name: PressFloor3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &489705953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 4130092069143574526, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 276885348} m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 42 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 704 - _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!1 &489705952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574498, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 276885348} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 489705956} - - component: {fileID: 489705955} - - component: {fileID: 489705954} - - component: {fileID: 489705953} - - component: {fileID: 489705957} - m_Layer: 6 - m_Name: PressFloor3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &489705953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574526, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 276885348} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 489705952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} + m_GameObject: {fileID: 489705952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} m_Name: m_EditorClassIdentifier: m_ShadowGroup: 0 @@ -979,8 +663,8 @@ MonoBehaviour: - {x: 0.5, y: 0.5, z: 0} - {x: 0.5, y: -0.5, z: 0} m_ShapePathHash: 0 - m_Mesh: {fileID: 172629596} - m_InstanceId: 30300 + m_Mesh: {fileID: 2103702642} + m_InstanceId: 39454 --- !u!61 &489705954 BoxCollider2D: m_ObjectHideFlags: 0 @@ -1216,184 +900,348 @@ Transform: m_Father: {fileID: 1650661544} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &715458306 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574498, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 2086948348} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 715458310} - - component: {fileID: 715458309} - - component: {fileID: 715458308} - - component: {fileID: 715458307} - - component: {fileID: 715458311} - m_Layer: 6 - m_Name: PressFloor1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &715458307 -MonoBehaviour: +--- !u!43 &650233689 +Mesh: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574526, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 2086948348} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715458306} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} m_Name: - m_EditorClassIdentifier: - m_ShadowGroup: 0 - m_ComponentVersion: 1 - m_HasRenderer: 1 - m_UseRendererSilhouette: 1 - m_CastsShadows: 1 - m_SelfShadows: 0 - m_ApplyToSortingLayers: 8d33c247ab75ae9600000000 - m_ShapePath: - - {x: -0.5, y: -0.5, z: 0} - - {x: -0.5, y: 0.5, z: 0} - - {x: 0.5, y: 0.5, z: 0} - - {x: 0.5, y: -0.5, z: 0} - m_ShapePathHash: 0 - m_Mesh: {fileID: 1098356748} - m_InstanceId: 30324 ---- !u!61 &715458308 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574496, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 2086948348} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715458306} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 1 - 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 &715458309 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574497, guid: b604927e5444c4662b8db46623822915, type: 3} - m_PrefabInstance: {fileID: 2086948348} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715458306} - 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: -1766951509 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.16337568, g: 0.7830189, b: 0.06278926, 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 &715458310 -Transform: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 42 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 704 + _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &715458306 +GameObject: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4130092069143574499, guid: b604927e5444c4662b8db46623822915, type: 3} + m_CorrespondingSourceObject: {fileID: 4130092069143574498, guid: b604927e5444c4662b8db46623822915, type: 3} m_PrefabInstance: {fileID: 2086948348} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 715458306} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -18.467196, y: -8.763153, z: 0} - m_LocalScale: {x: 10.117589, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!251 &715458311 -PlatformEffector2D: + serializedVersion: 6 + m_Component: + - component: {fileID: 715458310} + - component: {fileID: 715458309} + - component: {fileID: 715458308} + - component: {fileID: 715458307} + - component: {fileID: 715458311} + m_Layer: 6 + m_Name: PressFloor1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &715458307 +MonoBehaviour: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4130092069143574526, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 2086948348} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715458306} m_Enabled: 1 - m_UseColliderMask: 1 - m_ColliderMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RotationalOffset: 0 - m_UseOneWay: 1 - m_UseOneWayGrouping: 0 - m_SurfaceArc: 180 - m_UseSideFriction: 0 - m_UseSideBounce: 0 - m_SideArc: 1 ---- !u!114 &729100380 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7138595047812326861, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} - m_PrefabInstance: {fileID: 173849289} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3} + m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &848100747 -PrefabInstance: + m_ShadowGroup: 0 + m_ComponentVersion: 1 + m_HasRenderer: 1 + m_UseRendererSilhouette: 1 + m_CastsShadows: 1 + m_SelfShadows: 0 + m_ApplyToSortingLayers: 8d33c247ab75ae9600000000 + m_ShapePath: + - {x: -0.5, y: -0.5, z: 0} + - {x: -0.5, y: 0.5, z: 0} + - {x: 0.5, y: 0.5, z: 0} + - {x: 0.5, y: -0.5, z: 0} + m_ShapePathHash: 0 + m_Mesh: {fileID: 1228252579} + m_InstanceId: 39478 +--- !u!61 &715458308 +BoxCollider2D: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 4130092069143574496, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 2086948348} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715458306} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 1 + 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_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4130092069143574496, guid: b604927e5444c4662b8db46623822915, type: 3} + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &715458309 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 4130092069143574497, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 2086948348} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715458306} + 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: -1766951509 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.16337568, g: 0.7830189, b: 0.06278926, 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 &715458310 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 4130092069143574499, guid: b604927e5444c4662b8db46623822915, type: 3} + m_PrefabInstance: {fileID: 2086948348} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715458306} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -18.467196, y: -8.763153, z: 0} + m_LocalScale: {x: 10.117589, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!251 &715458311 +PlatformEffector2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 715458306} + m_Enabled: 1 + m_UseColliderMask: 1 + m_ColliderMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RotationalOffset: 0 + m_UseOneWay: 1 + m_UseOneWayGrouping: 0 + m_SurfaceArc: 180 + m_UseSideFriction: 0 + m_UseSideBounce: 0 + m_SideArc: 1 +--- !u!114 &729100380 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7138595047812326861, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3} + m_PrefabInstance: {fileID: 173849289} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &848100747 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4130092069143574496, guid: b604927e5444c4662b8db46623822915, type: 3} propertyPath: m_UsedByEffector value: 1 objectReference: {fileID: 0} @@ -2074,9 +1922,88 @@ MonoBehaviour: - {x: 0.5, y: 0.5, z: 0} - {x: 0.5, y: -0.49999952, z: 0} m_ShapePathHash: 0 - m_Mesh: {fileID: 1002308893} - m_InstanceId: 30370 ---- !u!43 &994241664 + m_Mesh: {fileID: 2122194423} + m_InstanceId: 39524 +--- !u!1 &1023719589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1023719591} + - component: {fileID: 1023719590} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1023719590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023719589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 040acca4651b34056892c0620e34ed5a, type: 3} + m_Name: + m_EditorClassIdentifier: + Player: {fileID: 729100380} +--- !u!4 &1023719591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1023719589} + 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: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1049670869 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1049670870} + m_Layer: 3 + m_Name: Enemys + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1049670870 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1049670869} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.12, y: -11.09, z: 0.18314946} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1808616419} + - {fileID: 431025818} + - {fileID: 578895318} + m_Father: {fileID: 0} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1130750999 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2240,7 +2167,7 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1002308893 +--- !u!43 &1175194397 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2257,8 +2184,8 @@ Mesh: firstVertex: 0 vertexCount: 16 localAABB: - m_Center: {x: 0, y: 0.00000023841858, z: 0} - m_Extent: {x: 0.5, y: 0.49999976, z: 0} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} m_Shapes: vertices: [] shapes: [] @@ -2337,7 +2264,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 704 - _typelessdata: 0000003ff0ffffbe000000000000803f0000008000000080000000800000003ff0ffffbe0000003ff0ffffbe0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00008034000000000000803f0000008000000080000000800000003f0000003f0000003ff0ffffbe00000000f0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe000000bff0ffffbe000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bff0ffffbe0000000000000080000080bf0000000000000080000000bff0ffffbe000000bff0ffffbe000000bf0000803400000000000080bf000000800000008000000080000000bff0ffffbe000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00008034000000000000803f0000008000000080000000800000003f0000003f0000003ff0ffffbe0000003ff0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe0000003ff0ffffbe0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000f0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe000000bff0ffffbe000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bff0ffffbe00000000000080bf000000800000008000000080000000bff0ffffbe000000bff0ffffbe000000bf0000803400000000000080bf000000800000008000000080000000bff0ffffbe000000bf0000003f + _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -2391,8 +2318,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0, y: 0.00000023841858, z: 0} - m_Extent: {x: 0.5, y: 0.49999976, z: 0} + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -2404,251 +2331,8 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1023719589 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1023719591} - - component: {fileID: 1023719590} - m_Layer: 0 - m_Name: GameManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1023719590 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1023719589} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 040acca4651b34056892c0620e34ed5a, type: 3} - m_Name: - m_EditorClassIdentifier: - Player: {fileID: 729100380} ---- !u!4 &1023719591 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1023719589} - 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: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1049670869 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1049670870} - m_Layer: 3 - m_Name: Enemys - m_TagString: Enemy - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1049670870 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1049670869} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.12, y: -11.09, z: 0.18314946} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1808616419} - - {fileID: 431025818} - - {fileID: 578895318} - m_Father: {fileID: 0} - m_RootOrder: 20 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!43 &1098356748 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 42 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 16 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 16 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 4 - - stream: 0 - offset: 28 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 704 - _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0.5, y: 0.5, z: 0} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: ---- !u!43 &1130750999 -Mesh: +--- !u!43 &1199145816 +Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2811,7 +2495,7 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1175194397 +--- !u!43 &1216716254 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2975,7 +2659,7 @@ Mesh: offset: 0 size: 0 path: ---- !u!43 &1216716254 +--- !u!43 &1228252579 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3184,8 +2868,8 @@ MonoBehaviour: - {x: 0.5, y: 0.5, z: 0} - {x: 0.5, y: -0.5, z: 0} m_ShapePathHash: 0 - m_Mesh: {fileID: 477420249} - m_InstanceId: 30390 + m_Mesh: {fileID: 1199145816} + m_InstanceId: 39550 --- !u!61 &1359668099 BoxCollider2D: m_ObjectHideFlags: 0 @@ -3504,8 +3188,8 @@ MonoBehaviour: - {x: 0.5, y: 0.5, z: 0} - {x: 0.5, y: -0.5, z: 0} m_ShapePathHash: 0 - m_Mesh: {fileID: 994241664} - m_InstanceId: 30410 + m_Mesh: {fileID: 650233689} + m_InstanceId: 39570 --- !u!61 &1600758426 BoxCollider2D: m_ObjectHideFlags: 0 @@ -4213,6 +3897,334 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b604927e5444c4662b8db46623822915, type: 3} +--- !u!43 &2103702642 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 42 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 704 + _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0.5, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!43 &2122194423 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 42 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 16 + localAABB: + m_Center: {x: 0, y: 0.00000023841858, z: 0} + m_Extent: {x: 0.5, y: 0.49999976, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 16 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 28 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 704 + _typelessdata: 0000003ff0ffffbe000000000000803f0000008000000080000000800000003ff0ffffbe0000003ff0ffffbe0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00008034000000000000803f0000008000000080000000800000003f0000003f0000003ff0ffffbe00000000f0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe000000bff0ffffbe000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bff0ffffbe0000000000000080000080bf0000000000000080000000bff0ffffbe000000bff0ffffbe000000bf0000803400000000000080bf000000800000008000000080000000bff0ffffbe000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00008034000000000000803f0000008000000080000000800000003f0000003f0000003ff0ffffbe0000003ff0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe0000003ff0ffffbe0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000f0ffffbe0000000000000080000080bf00000000000000800000003ff0ffffbe000000bff0ffffbe000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bff0ffffbe00000000000080bf000000800000008000000080000000bff0ffffbe000000bff0ffffbe000000bf0000803400000000000080bf000000800000008000000080000000bff0ffffbe000000bf0000003f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0.00000023841858, z: 0} + m_Extent: {x: 0.5, y: 0.49999976, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &6645882747662237116 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs index 0635ed70..a0606954 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs @@ -79,6 +79,7 @@ public void OnDrawGizmos() private void MeleeAttack() { + PlayerCharacter _player = gameObject.GetComponent(); int facing = -1; if (sprite.flipX) { @@ -97,7 +98,10 @@ private void MeleeAttack() { hitobj.GetComponent().HP.GetDamage(_damage); hitobj.GetComponent().hitted(facing); - canDamage = false; + if (_player.currentWaveGauge + _player.attackWaveGauge < _player.maxWaveGauge) + _player.currentWaveGauge += _player.attackWaveGauge; + else _player.currentWaveGauge = _player.maxWaveGauge; + canDamage = false; Debug.Log("맞음"); } } diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs index bb43c1da..5ad0c3f5 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs @@ -69,7 +69,13 @@ public void FixedUpdate() { if (_hitObj.GetComponent().isAttack()) { - gameObject.GetComponent().PlayerInvincibility(); + PlayerCharacter _player = gameObject.GetComponent(); + _player.PlayerInvincibility(); + if (_player.currentWaveGauge + _player.paringWaveGauge < _player.maxWaveGauge) + _player.currentWaveGauge += _player.paringWaveGauge; + else + _player.currentWaveGauge = _player.maxWaveGauge; + _isParing = false; Debug.Log("패링 성공!"); } } @@ -77,6 +83,7 @@ public void FixedUpdate() { gameObject.GetComponent().PlayerInvincibility(); _hitObj.GetComponent().Paring(); + _isParing = false; Debug.Log("패링 성공!"); } } diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs index e57f875f..3bd60893 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs @@ -60,6 +60,12 @@ public class PlayerCharacter : MonoBehaviour,IGameManagerObj private GameObject _waveSense; public bool _isInvincibility; + public int maxWaveGauge; + public float currentWaveGauge; + + public float attackWaveGauge; + public float paringWaveGauge; + public bool isOnLava; private void Awake() { @@ -155,11 +161,12 @@ public void Jump() public void WaveSensePress() { - if (InputController.Instance.Wave.Down) + if (InputController.Instance.Wave.Down && currentWaveGauge>=1) { if (WaveSense.IsUsing) return; + currentWaveGauge -= 1f; SoundManager.Instance.Play("WaveSound", Define.Sound.Effect); var waveSense = ResourceManager.Instance.Instantiate("WaveSense").GetComponent(); diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs index 2cf6aaa6..e573c484 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs @@ -12,7 +12,7 @@ public override void OnSLStateEnter(Animator animator, AnimatorStateInfo stateIn } public override void OnSLStatePostEnter(Animator animator,AnimatorStateInfo stateInfo,int layerIndex) { - if (_monoBehaviour.CheckForPowerAttack()) animator.speed = 0.1f; + if (_monoBehaviour.CheckForPowerAttack() && _monoBehaviour.currentWaveGauge>1) animator.speed = 0.1f; else { if(_monoBehaviour.isJump) _monoBehaviour.AttackableMove(_monoBehaviour._attackMove * _monoBehaviour.GetFacing()); @@ -46,12 +46,13 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat if (_monoBehaviour._clickcount == 0) _monoBehaviour.MeleeAttackComoEnd(); - if (_monoBehaviour.CheckForUpKey()) + if (_monoBehaviour.CheckForUpKey() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 1.0f; _monoBehaviour._attack.DamageReset(_monoBehaviour._powerAttackdamage); _monoBehaviour.enableAttack(); _monoBehaviour.AttackableMove(_monoBehaviour._attackMove * _monoBehaviour.GetFacing()); + _monoBehaviour.currentWaveGauge -= 1f; } } public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo3SMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo3SMB.cs index ac688d08..856a26f7 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo3SMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo3SMB.cs @@ -11,7 +11,7 @@ public override void OnSLStateEnter(Animator animator,AnimatorStateInfo stateInf public override void OnSLStatePostEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - if (_monoBehaviour.CheckForPowerAttack()) + if (_monoBehaviour.CheckForPowerAttack() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 0.1f; } @@ -54,12 +54,13 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat if(_monoBehaviour._clickcount == 0) _monoBehaviour.MeleeAttackComoEnd(); - if (_monoBehaviour.CheckForUpKey()) + if (_monoBehaviour.CheckForUpKey() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 1.0f; _monoBehaviour._attack.DamageReset(_monoBehaviour._powerAttackdamage); _monoBehaviour.enableAttack(); _monoBehaviour.AttackableMove(_monoBehaviour._attackMove * _monoBehaviour.GetFacing()); + _monoBehaviour.currentWaveGauge -= 1f; } } public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo4SMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo4SMB.cs index e643ea19..d2e5d876 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo4SMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo4SMB.cs @@ -12,7 +12,7 @@ public override void OnSLStateEnter(Animator animator,AnimatorStateInfo stateInf public override void OnSLStatePostEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - if (_monoBehaviour.CheckForPowerAttack()) + if (_monoBehaviour.CheckForPowerAttack() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 0.1f; } @@ -39,12 +39,13 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat } else _monoBehaviour.GroundedHorizontalMovement(false); - if (_monoBehaviour.CheckForUpKey()) + if (_monoBehaviour.CheckForUpKey() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 1.0f; _monoBehaviour._attack.DamageReset(_monoBehaviour._powerAttackdamage); _monoBehaviour.enableAttack(); _monoBehaviour.AttackableMove(_monoBehaviour._attackMove * _monoBehaviour.GetFacing()); + _monoBehaviour.currentWaveGauge -= 1f; } } public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs index 79fc20f5..f21238f9 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs @@ -11,7 +11,7 @@ public override void OnSLStateEnter(Animator animator, AnimatorStateInfo stateIn } public override void OnSLStatePostEnter(Animator animator,AnimatorStateInfo stateInfo,int layerIndex) { - if (_monoBehaviour.CheckForPowerAttack()) + if (_monoBehaviour.CheckForPowerAttack() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 0.1f; } @@ -51,12 +51,13 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat _monoBehaviour.MeleeAttackCombo1(); - if (_monoBehaviour.CheckForUpKey()) + if (_monoBehaviour.CheckForUpKey() && _monoBehaviour.currentWaveGauge>1) { animator.speed = 1.0f; _monoBehaviour._attack.DamageReset(_monoBehaviour._powerAttackdamage); _monoBehaviour.enableAttack(); _monoBehaviour.AttackableMove(_monoBehaviour._attackMove * _monoBehaviour.GetFacing()); + _monoBehaviour.currentWaveGauge -= 1f; } }