diff --git a/Assets/game/Enemies/SharpBlock/Animation/Idle.anim b/Assets/game/Enemies/SharpBlock/Animation/Idle.anim index 009974a1..887fcc66 100644 --- a/Assets/game/Enemies/SharpBlock/Animation/Idle.anim +++ b/Assets/game/Enemies/SharpBlock/Animation/Idle.anim @@ -17,39 +17,15 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: e26043e4f072793439364351ca59275f, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 2b5a071d4ec6ad14c87e8a1f87b82d6d, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - - {fileID: 21300000, guid: e26043e4f072793439364351ca59275f, type: 3} - - {fileID: 21300000, guid: 2b5a071d4ec6ad14c87e8a1f87b82d6d, type: 3} - - {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/game/Enemies/SharpBlock/Animation/Left.anim b/Assets/game/Enemies/SharpBlock/Animation/Left.anim index 17aad23a..ad91ab7f 100644 --- a/Assets/game/Enemies/SharpBlock/Animation/Left.anim +++ b/Assets/game/Enemies/SharpBlock/Animation/Left.anim @@ -17,39 +17,15 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: e26043e4f072793439364351ca59275f, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 2b5a071d4ec6ad14c87e8a1f87b82d6d, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} - - {fileID: 21300000, guid: e26043e4f072793439364351ca59275f, type: 3} - - {fileID: 21300000, guid: 2b5a071d4ec6ad14c87e8a1f87b82d6d, type: 3} - - {fileID: 21300000, guid: e4be732d386aa324b988b172505832d0, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/game/Enemies/SharpBlock/Animation/Right.anim b/Assets/game/Enemies/SharpBlock/Animation/Right.anim index 5f499fb7..e72c1a3d 100644 --- a/Assets/game/Enemies/SharpBlock/Animation/Right.anim +++ b/Assets/game/Enemies/SharpBlock/Animation/Right.anim @@ -17,39 +17,15 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300000, guid: d0c26433eb917814d92a3dade33d9386, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 979c5b1ec83ac6a4eb097b53afa76ef6, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 35406188dcc273842b49d5e76f72c249, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: d0c26433eb917814d92a3dade33d9386, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} + m_PPtrCurves: [] m_SampleRate: 4 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 21300000, guid: d0c26433eb917814d92a3dade33d9386, type: 3} - - {fileID: 21300000, guid: 979c5b1ec83ac6a4eb097b53afa76ef6, type: 3} - - {fileID: 21300000, guid: 35406188dcc273842b49d5e76f72c249, type: 3} - - {fileID: 21300000, guid: d0c26433eb917814d92a3dade33d9386, type: 3} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/game/Enemies/SharpBlock/Scripts/SharpBlock.cs b/Assets/game/Enemies/SharpBlock/Scripts/SharpBlock.cs index f607d9ba..78c98851 100644 --- a/Assets/game/Enemies/SharpBlock/Scripts/SharpBlock.cs +++ b/Assets/game/Enemies/SharpBlock/Scripts/SharpBlock.cs @@ -10,7 +10,7 @@ public class SharpBlock : MonoBehaviour [Header("Variables")] public float speed = 10; - public float timeDelayOnHit = 5.0f; + public float timeDelayOnHit = 3.0f; public bool isMovingRightOrUp = true; public bool horizontal = true; bool isChangingDirection = false; diff --git a/Assets/game/Scenes/level2.unity b/Assets/game/Scenes/level2.unity index bed9ea13..caeebc74 100644 --- a/Assets/game/Scenes/level2.unity +++ b/Assets/game/Scenes/level2.unity @@ -2542,12 +2542,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 734179d4d7ad3314cbf982dbc559d45b, type: 3} m_Name: m_EditorClassIdentifier: - audioSource: {fileID: 0} animator: {fileID: 406194637} speed: 10 - timeDelayOnHit: 5 + timeDelayOnHit: 3 isMovingRightOrUp: 1 - horizontal: 1 + horizontal: 0 --- !u!1 &417760883 GameObject: m_ObjectHideFlags: 0