diff --git a/Assets/Animations/Player/Attack1.anim b/Assets/Animations/Player/Attack1.anim new file mode 100644 index 0000000..5597305 --- /dev/null +++ b/Assets/Animations/Player/Attack1.anim @@ -0,0 +1,171 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack1 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.375 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack1 + classID: 1 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -99644152, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.0625 + value: {fileID: 1987541375, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.125 + value: {fileID: 2097042664, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.25 + value: {fileID: 1874731604, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.3125 + value: {fileID: 1874731604, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 270981512 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -99644152, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1987541375, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 2097042664, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1874731604, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1874731604, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.375 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.375 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack1 + classID: 1 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Attack1.anim.meta b/Assets/Animations/Player/Attack1.anim.meta new file mode 100644 index 0000000..a5d66da --- /dev/null +++ b/Assets/Animations/Player/Attack1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2811641ddb85e2249b6f992ad41a8a6f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/Attack2.anim b/Assets/Animations/Player/Attack2.anim new file mode 100644 index 0000000..6e9eba4 --- /dev/null +++ b/Assets/Animations/Player/Attack2.anim @@ -0,0 +1,189 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.375 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack2 + classID: 1 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -855921906, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.0625 + value: {fileID: -1724363469, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.125 + value: {fileID: -578883431, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.25 + value: {fileID: -1188692992, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.3125 + value: {fileID: -1188692992, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 2301593650 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -855921906, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -1724363469, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -578883431, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -1188692992, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -1188692992, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.375 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.25 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.375 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack2 + classID: 1 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Attack2.anim.meta b/Assets/Animations/Player/Attack2.anim.meta new file mode 100644 index 0000000..dfc7eb0 --- /dev/null +++ b/Assets/Animations/Player/Attack2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 49e6dffdf3b4c1244b6df3e7543b9833 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/Attack3.anim b/Assets/Animations/Player/Attack3.anim new file mode 100644 index 0000000..3a136fe --- /dev/null +++ b/Assets/Animations/Player/Attack3.anim @@ -0,0 +1,198 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack3 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3125 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.625 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack3 + classID: 1 + script: {fileID: 0} + flags: 16 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1381763101, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.0625 + value: {fileID: 1420738685, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.125 + value: {fileID: -922858807, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.3125 + value: {fileID: -531414463, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.375 + value: {fileID: -1567779232, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.4375 + value: {fileID: 2019116000, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.5 + value: {fileID: 2107643574, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - time: 0.5625 + value: {fileID: -1975760086, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 4264081572 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1381763101, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: 1420738685, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: -922858807, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: -531414463, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: -1567779232, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: 2019116000, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: 2107643574, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + - {fileID: -1975760086, guid: 9b2d8ec493ecc0548b920d1df6715c22, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.625 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3125 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.625 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Attack Area/Attack3 + classID: 1 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Attack3.anim.meta b/Assets/Animations/Player/Attack3.anim.meta new file mode 100644 index 0000000..cc091a3 --- /dev/null +++ b/Assets/Animations/Player/Attack3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd3b395056593bd46a964740709bbe82 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/Dead.anim b/Assets/Animations/Player/Dead.anim new file mode 100644 index 0000000..25700ae --- /dev/null +++ b/Assets/Animations/Player/Dead.anim @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dead + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1607951394, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.083333336 + value: {fileID: -442231518, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.16666667 + value: {fileID: -607143850, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.25 + value: {fileID: -788816318, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.33333334 + value: {fileID: -593540622, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.41666666 + value: {fileID: 1012355955, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.5 + value: {fileID: 475524212, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.5833333 + value: {fileID: 739013730, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.6666667 + value: {fileID: -970126310, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.75 + value: {fileID: -380031744, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.8333333 + value: {fileID: -1799249216, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.9166667 + value: {fileID: 19627472, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1607951394, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -442231518, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -607143850, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -788816318, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -593540622, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1012355955, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 475524212, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 739013730, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -970126310, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -380031744, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -1799249216, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 19627472, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Dead.anim.meta b/Assets/Animations/Player/Dead.anim.meta new file mode 100644 index 0000000..9bafbb4 --- /dev/null +++ b/Assets/Animations/Player/Dead.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d056f28e346e6aa43a2c5a2ddab367d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/Hurt.anim b/Assets/Animations/Player/Hurt.anim new file mode 100644 index 0000000..c682391 --- /dev/null +++ b/Assets/Animations/Player/Hurt.anim @@ -0,0 +1,504 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hurt + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -498698182, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.125 + value: {fileID: -608775070, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.25 + value: {fileID: -1930934472, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.375 + value: {fileID: 1361991382, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - time: 0.375 + value: {fileID: 1361991382, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 16 + 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: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -498698182, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -608775070, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: -1930934472, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1361991382, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + - {fileID: 1361991382, guid: cdbefa0daafec974e92c87cfff6ccd41, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4375 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3125 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4375 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Hurt.anim.meta b/Assets/Animations/Player/Hurt.anim.meta new file mode 100644 index 0000000..e9cbe91 --- /dev/null +++ b/Assets/Animations/Player/Hurt.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65755aea3f5ae3140b7b872906886382 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/Hurt2.anim b/Assets/Animations/Player/Hurt2.anim new file mode 100644 index 0000000..cfa46db --- /dev/null +++ b/Assets/Animations/Player/Hurt2.anim @@ -0,0 +1,833 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hurt2 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 8 + 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: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.25 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.25 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.75 + value: 0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/Hurt2.anim.meta b/Assets/Animations/Player/Hurt2.anim.meta new file mode 100644 index 0000000..0a0d0ea --- /dev/null +++ b/Assets/Animations/Player/Hurt2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a150d70c4018922439592ae8fa6bdb4e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/PlayerAnimation.controller b/Assets/Animations/Player/PlayerAnimation.controller index 9e73f2d..160ff4b 100644 --- a/Assets/Animations/Player/PlayerAnimation.controller +++ b/Assets/Animations/Player/PlayerAnimation.controller @@ -1,5 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8936378865330138902 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isDead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6083005172507015908} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &-8889831366594405607 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-7970556376103625521 AnimatorState: serializedVersion: 6 @@ -28,6 +75,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-7557809747468768245 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isDead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-7424027416017821799 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -78,6 +150,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-6083005172507015908 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Dead + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7557809747468768245} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: d056f28e346e6aa43a2c5a2ddab367d1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-5764387685955722790 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -103,6 +202,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5684860448798080945 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isAttack + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: attackTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4333346156920405656} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-5490589385027047186 AnimatorStateMachine: serializedVersion: 6 @@ -133,11 +260,79 @@ AnimatorStateMachine: m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 60, y: 60, z: 0} + m_AnyStatePosition: {x: 70, y: 60, z: 0} m_EntryPosition: {x: 80, y: 140, z: 0} m_ExitPosition: {x: 600, y: -60, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 765916445418618132} +--- !u!114 &-4437971195637420600 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da05faa2fe3211c419d7b67cc4c90104, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1101 &-4117869406689310589 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isAttack + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: attackTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1441654992368299996} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-3746431395070052565 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isAttack + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: attackTrigger + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2103959339926125204} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-3242604565884857377 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -163,6 +358,65 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1107 &-2112048006166571597 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6675698784763108932} + m_Position: {x: 340, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1441654992368299996} + m_Position: {x: 340, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4333346156920405656} + m_Position: {x: 340, y: -70, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2103959339926125204} + m_Position: {x: 340, y: -160, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 640, y: -70, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6675698784763108932} +--- !u!1102 &-731140517072676302 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hurt + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 5567109487287735891} + m_StateMachineBehaviours: + - {fileID: 4729216471989119531} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 65755aea3f5ae3140b7b872906886382, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-513009987451553866 AnimatorState: serializedVersion: 6 @@ -217,6 +471,30 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: hurt + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isDead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: isAttack + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attackTrigger + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -230,6 +508,30 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Hurt Layer + m_StateMachine: {fileID: 7536459769054977349} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Attack Layer + m_StateMachine: {fileID: -2112048006166571597} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1101 &123157073400567293 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -255,6 +557,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &720304603045228200 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &765916445418618132 AnimatorState: serializedVersion: 6 @@ -310,6 +634,137 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1386244822375463067 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2574888886372503162} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1441654992368299996 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5684860448798080945} + - {fileID: -8889831366594405607} + m_StateMachineBehaviours: + - {fileID: 3998736347036606116} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2811641ddb85e2249b6f992ad41a8a6f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &1966768221822059335 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2103959339926125204 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack3 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 720304603045228200} + m_StateMachineBehaviours: + - {fileID: -4437971195637420600} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: bd3b395056593bd46a964740709bbe82, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2574888886372503162 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: hurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -731140517072676302} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &2877092394628262389 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -335,6 +790,47 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!114 &3998736347036606116 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da05faa2fe3211c419d7b67cc4c90104, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1102 &4333346156920405656 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3746431395070052565} + - {fileID: 1966768221822059335} + m_StateMachineBehaviours: + - {fileID: 7897155610702880579} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 49e6dffdf3b4c1244b6df3e7543b9833, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &4397879908989452361 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -360,6 +856,40 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!114 &4729216471989119531 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df7dc2c906b439d4c82faf9de14fdfae, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1101 &5567109487287735891 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1386244822375463067} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &5944346172058871735 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -385,6 +915,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &6675698784763108932 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4117869406689310589} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &7351439026484933173 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -410,6 +967,35 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 0 +--- !u!1107 &7536459769054977349 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hurt Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1386244822375463067} + m_Position: {x: 330, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: -731140517072676302} + m_Position: {x: 330, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6083005172507015908} + m_Position: {x: 30, y: -70, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -8936378865330138902} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 350, y: -60, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1386244822375463067} --- !u!1101 &7694801422213193392 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -482,3 +1068,15 @@ BlendTree: m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 +--- !u!114 &7897155610702880579 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: da05faa2fe3211c419d7b67cc4c90104, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Art/blueman/char_blue_2.png b/Assets/Art/blueman/char_blue_2.png index a2720ad..3779e50 100644 Binary files a/Assets/Art/blueman/char_blue_2.png and b/Assets/Art/blueman/char_blue_2.png differ diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 04bcdf2..83e0721 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -298,6 +298,105 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &590861223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 590861224} + - component: {fileID: 590861226} + - component: {fileID: 590861225} + m_Layer: 7 + m_Name: Attack2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &590861224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590861223} + serializedVersion: 2 + 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: 1740582483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &590861225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590861223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afea60adadfe64544819ec508173f1ac, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 10 + attackRange: 0 + attackRate: 0 +--- !u!60 &590861226 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590861223} + m_Enabled: 1 + 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: 256 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.42888117, y: 1.5269115} + - {x: -0.69011915, y: 0.77736616} + - {x: -0.025765657, y: 0.46890724} + - {x: 0.8487228, y: 0.56257796} + - {x: 1.1520946, y: 0.767625} + - {x: 1.1850057, y: 1.2075634} + m_UseDelaunayMesh: 0 --- !u!1 &700694691 GameObject: m_ObjectHideFlags: 0 @@ -3480,7 +3579,8 @@ Transform: m_LocalPosition: {x: 0, y: 1.85, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1740582483} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!70 &887481106 @@ -3492,7 +3592,7 @@ CapsuleCollider2D: m_GameObject: {fileID: 887481103} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 9930d3d9bf689d84fbbbc53b8eb3db02, type: 2} + m_Material: {fileID: 6200000, guid: 1c648cb2b6306454d8e922a4ea41bb8a, type: 2} m_IncludeLayers: serializedVersion: 2 m_Bits: 0 @@ -3560,6 +3660,12 @@ MonoBehaviour: inputDirection: {x: 0, y: 0} speed: 300 jumpForce: 17 + isDead: 0 + isAttack: 0 + isHurt: 0 + hurtForce: 8 + Normal: {fileID: 6200000, guid: 1c648cb2b6306454d8e922a4ea41bb8a, type: 2} + Wall: {fileID: 6200000, guid: 9930d3d9bf689d84fbbbc53b8eb3db02, type: 2} --- !u!114 &887481109 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3623,10 +3729,52 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c5fa6c925c3402a40ab772e1f1d3afa5, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 33 + maxHealth: 60 currentHealth: 0 - invulnerableDuration: 2 + invulnerableDuration: 0.5 invulnerable: 0 + OnTakeDamage: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 887481111} + m_TargetAssemblyTypeName: PlayerAnimation, Assembly-CSharp + m_MethodName: PlayHurt + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 887481108} + m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp + m_MethodName: GetHurt + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + OnDie: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 887481108} + m_TargetAssemblyTypeName: PlayerController, Assembly-CSharp + m_MethodName: PlayerDead + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &887481113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3642,6 +3790,103 @@ MonoBehaviour: damage: 10 attackRange: 0 attackRate: 0 +--- !u!1 &898202320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898202321} + - component: {fileID: 898202322} + - component: {fileID: 898202323} + m_Layer: 7 + m_Name: Attack1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &898202321 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898202320} + serializedVersion: 2 + 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: 1740582483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &898202322 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898202320} + m_Enabled: 1 + 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: 256 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.7731458, y: 1.1910136} + - {x: -0.23571897, y: 1.7696183} + - {x: -0.48269218, y: 1.2800933} + - {x: 1.4184824, y: 0.71131325} + m_UseDelaunayMesh: 0 +--- !u!114 &898202323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898202320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afea60adadfe64544819ec508173f1ac, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 10 + attackRange: 0 + attackRate: 0 --- !u!1 &1021266681 GameObject: m_ObjectHideFlags: 0 @@ -4453,7 +4698,7 @@ Tilemap: - {fileID: 1369434452, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -714309378, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1306249692, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 7, y: 0, z: 0} @@ -4805,7 +5050,7 @@ Tilemap: - {fileID: 1051226569, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1588357252, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1843162688, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 6, y: 11, z: 0} @@ -4827,7 +5072,7 @@ Tilemap: - {fileID: 1961145818, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1737103796, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -23635172, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 5, y: 12, z: 0} @@ -4915,7 +5160,7 @@ Tilemap: - {fileID: 1369434452, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -714309378, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -1306249692, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7.0000005 + m_AnimationSpeed: 7 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 7, y: 14, z: 0} @@ -4926,7 +5171,7 @@ Tilemap: - {fileID: 1961145818, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: 1737103796, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - {fileID: -23635172, guid: d4dcc96007437b741bd8f3a3c7e02b45, type: 3} - m_AnimationSpeed: 7 + m_AnimationSpeed: 7.0000005 m_AnimationTimeOffset: 0 m_Flags: 0 - first: {x: 5, y: 15, z: 0} @@ -5530,6 +5775,139 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1671772094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671772095} + - component: {fileID: 1671772097} + - component: {fileID: 1671772096} + m_Layer: 7 + m_Name: Attack3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1671772095 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671772094} + serializedVersion: 2 + 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: 1740582483} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1671772096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671772094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afea60adadfe64544819ec508173f1ac, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 20 + attackRange: 0 + attackRate: 0 +--- !u!60 &1671772097 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671772094} + m_Enabled: 1 + 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: 256 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 1.1804827, y: 1.8362733} + - {x: 0.5771523, y: 2.0157504} + - {x: 0.8063212, y: 1.1622095} + - {x: 1.2759407, y: 0.2512995} + - {x: 1.8432873, y: 0.23265052} + - {x: 1.7362046, y: 1.3535299} + m_UseDelaunayMesh: 0 +--- !u!1 &1740582482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1740582483} + m_Layer: 7 + m_Name: Attack Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1740582483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740582482} + serializedVersion: 2 + 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: + - {fileID: 898202321} + - {fileID: 590861224} + - {fileID: 1671772095} + m_Father: {fileID: 887481105} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2075000702 GameObject: m_ObjectHideFlags: 0 @@ -5947,7 +6325,7 @@ CapsuleCollider2D: m_ExcludeLayers: serializedVersion: 2 m_Bits: 256 - m_LayerOverridePriority: 0 + m_LayerOverridePriority: 10 m_ForceSendLayers: serializedVersion: 2 m_Bits: 4294967295 @@ -5980,8 +6358,14 @@ MonoBehaviour: m_EditorClassIdentifier: maxHealth: 50 currentHealth: 0 - invulnerableDuration: 0 + invulnerableDuration: 0.5 invulnerable: 0 + OnTakeDamage: + m_PersistentCalls: + m_Calls: [] + OnDie: + m_PersistentCalls: + m_Calls: [] --- !u!114 &2091678388 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/General/Character.cs b/Assets/Scripts/General/Character.cs index 23983c7..496645f 100644 --- a/Assets/Scripts/General/Character.cs +++ b/Assets/Scripts/General/Character.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Events; public class Character : MonoBehaviour { @@ -13,6 +14,9 @@ public class Character : MonoBehaviour private float invulnerableCounter;//计数器 public bool invulnerable;//无敌 + public UnityEvent OnTakeDamage;//受伤事件 + public UnityEvent OnDie;//死亡事件 + private void Start() { currentHealth = maxHealth; @@ -42,10 +46,13 @@ public class Character : MonoBehaviour { currentHealth -= attacker.damage; TriggerInvulnerable(); + //执行受伤 + OnTakeDamage?.Invoke(attacker.transform); } else { currentHealth = 0;//触发死亡 + OnDie?.Invoke(); } } diff --git a/Assets/Scripts/Player/AttackFinish.cs b/Assets/Scripts/Player/AttackFinish.cs new file mode 100644 index 0000000..3125a77 --- /dev/null +++ b/Assets/Scripts/Player/AttackFinish.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AttackFinish : StateMachineBehaviour +{ + // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state + //override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // + //} + + // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks + //override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // + //} + + // OnStateExit is called when a transition ends and the state machine finishes evaluating this state + override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + animator.GetComponent().isAttack = false; + } + + // OnStateMove is called right after Animator.OnAnimatorMove() + //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that processes and affects root motion + //} + + // OnStateIK is called right after Animator.OnAnimatorIK() + //override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that sets up animation IK (inverse kinematics) + //} +} diff --git a/Assets/Scripts/Player/AttackFinish.cs.meta b/Assets/Scripts/Player/AttackFinish.cs.meta new file mode 100644 index 0000000..3d63db8 --- /dev/null +++ b/Assets/Scripts/Player/AttackFinish.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: da05faa2fe3211c419d7b67cc4c90104 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/HurtAnimation.cs b/Assets/Scripts/Player/HurtAnimation.cs new file mode 100644 index 0000000..17ce156 --- /dev/null +++ b/Assets/Scripts/Player/HurtAnimation.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HurtAnimation : StateMachineBehaviour +{ + // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state + //override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + + //} + + // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks + //override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // + //} + + // OnStateExit is called when a transition ends and the state machine finishes evaluating this state + override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + animator.GetComponent().isHurt = false; + } + + // OnStateMove is called right after Animator.OnAnimatorMove() + //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that processes and affects root motion + //} + + // OnStateIK is called right after Animator.OnAnimatorIK() + //override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that sets up animation IK (inverse kinematics) + //} +} diff --git a/Assets/Scripts/Player/HurtAnimation.cs.meta b/Assets/Scripts/Player/HurtAnimation.cs.meta new file mode 100644 index 0000000..3bae1f3 --- /dev/null +++ b/Assets/Scripts/Player/HurtAnimation.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df7dc2c906b439d4c82faf9de14fdfae +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerAnimation.cs b/Assets/Scripts/Player/PlayerAnimation.cs index 410cfea..729a0d1 100644 --- a/Assets/Scripts/Player/PlayerAnimation.cs +++ b/Assets/Scripts/Player/PlayerAnimation.cs @@ -8,12 +8,14 @@ public class PlayerAnimation : MonoBehaviour private Animator anim; private Rigidbody2D rb; private PhysicsCheck physicsCheck; + private PlayerController playerController; private void Awake() { anim = GetComponent(); rb = GetComponent(); physicsCheck = GetComponent(); + playerController = GetComponent(); } private void Update() @@ -26,5 +28,20 @@ public class PlayerAnimation : MonoBehaviour anim.SetFloat("velocityX", Mathf.Abs(rb.velocity.x)); anim.SetFloat("velocityY", rb.velocity.y); anim.SetBool("isGround", physicsCheck.isGround); + anim.SetBool("isDead", playerController.isDead); + anim.SetBool("isAttack", playerController.isAttack); + } + + //事件调用 + public void PlayHurt() + { + anim.SetTrigger("hurt"); + } + + public void PlayAttack() + { + anim.SetTrigger("attackTrigger"); + } + } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index f57fe9d..70f7bbf 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -11,18 +11,36 @@ public class PlayerController : MonoBehaviour private Rigidbody2D rb; private PhysicsCheck physicsCheck; + private PlayerAnimation playerAnimation; [Header("基本参数")] public float speed; - public float jumpForce; + [Header("状态")] + public bool isDead; + public bool isAttack; + + [Header("受伤反弹参数")] + public bool isHurt; + public float hurtForce;//反弹的力 + + [Header("物理材质")] + public PhysicsMaterial2D Normal; + public PhysicsMaterial2D Wall; + private CapsuleCollider2D coll; + private void Awake() { rb = GetComponent(); physicsCheck = GetComponent(); + playerAnimation = GetComponent(); + coll = GetComponent(); inputControl = new PlayerInputControl(); + //跳跃 inputControl.GamePlayerInput.Jump.started += Jump; + //攻击 + inputControl.GamePlayerInput.Attack.started += PlayerAttack; } @@ -47,11 +65,16 @@ public class PlayerController : MonoBehaviour void Update() { inputDirection = inputControl.GamePlayerInput.Move.ReadValue(); + CheckState();//检查切换光滑不光滑材质 } private void FixedUpdate() { - Move(); + if(!isHurt && !isAttack) + { + Move(); + } + } //移动 @@ -80,7 +103,37 @@ public class PlayerController : MonoBehaviour { rb.AddForce(transform.up * jumpForce, ForceMode2D.Impulse); } - - } + + //攻击 + private void PlayerAttack(InputAction.CallbackContext context) + { + playerAnimation.PlayAttack(); + isAttack = true; + } + + //受伤反弹 + public void GetHurt(Transform attacker) + { + isHurt = true; + rb.velocity = Vector2.zero; + Vector2 dir = new Vector2((transform.position.x - attacker.position.x),0).normalized;//归一取1，定方向 + + rb.AddForce(dir*hurtForce, ForceMode2D.Impulse); + } + + + //死亡暂停一切动作 + public void PlayerDead() + { + isDead = true; + inputControl.GamePlayerInput.Disable(); + } + + //切换材质 + public void CheckState() + { + coll.sharedMaterial = physicsCheck.isGround ? Normal : Wall; + } + } diff --git a/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D b/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D index 764ca1c..faf888c 100644 --- a/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D +++ b/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Normal - friction: 0 + friction: 0.4 bounciness: 0 diff --git a/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D.meta b/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D.meta index c1fe4d8..8b1724a 100644 --- a/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D.meta +++ b/Assets/Settings/PhyiscsMaterials/Normal.physicsMaterial2D.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9930d3d9bf689d84fbbbc53b8eb3db02 +guid: 1c648cb2b6306454d8e922a4ea41bb8a NativeFormatImporter: externalObjects: {} mainObjectFileID: 6200000 diff --git a/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D b/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D new file mode 100644 index 0000000..554efe1 --- /dev/null +++ b/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Wall + friction: 0 + bounciness: 0 diff --git a/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D.meta b/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D.meta new file mode 100644 index 0000000..c1fe4d8 --- /dev/null +++ b/Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9930d3d9bf689d84fbbbc53b8eb3db02 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/PlayerInputControl.cs b/Assets/Settings/PlayerInputControl.cs index 6e073f8..18fb81c 100644 --- a/Assets/Settings/PlayerInputControl.cs +++ b/Assets/Settings/PlayerInputControl.cs @@ -62,6 +62,15 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Attack"", + ""type"": ""Button"", + ""id"": ""9b75b534-6170-456b-b032-4b7ae466d72d"", + ""expectedControlType"": """", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -288,7 +297,7 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable { ""name"": """", ""id"": ""3223b6c8-cd3a-4bab-afb1-1da84399059a"", - ""path"": ""/space"", + ""path"": ""/k"", ""interactions"": """", ""processors"": """", ""groups"": "";Keyboard&Mouse"", @@ -306,6 +315,28 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable ""action"": ""Jump"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""bbb49e65-0427-476d-b3eb-e773395386fd"", + ""path"": ""/j"", + ""interactions"": """", + ""processors"": """", + ""groups"": "";Keyboard&Mouse"", + ""action"": ""Attack"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""9f0dfc8f-abe4-4c89-a14d-ee0a44cbe34e"", + ""path"": ""/buttonWest"", + ""interactions"": """", + ""processors"": """", + ""groups"": "";Gamepad"", + ""action"": ""Attack"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -895,6 +926,7 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable m_GamePlayerInput_Jump = m_GamePlayerInput.FindAction("Jump", throwIfNotFound: true); m_GamePlayerInput_Look = m_GamePlayerInput.FindAction("Look", throwIfNotFound: true); m_GamePlayerInput_Fire = m_GamePlayerInput.FindAction("Fire", throwIfNotFound: true); + m_GamePlayerInput_Attack = m_GamePlayerInput.FindAction("Attack", throwIfNotFound: true); // UI m_UI = asset.FindActionMap("UI", throwIfNotFound: true); m_UI_Navigate = m_UI.FindAction("Navigate", throwIfNotFound: true); @@ -978,6 +1010,7 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable private readonly InputAction m_GamePlayerInput_Jump; private readonly InputAction m_GamePlayerInput_Look; private readonly InputAction m_GamePlayerInput_Fire; + private readonly InputAction m_GamePlayerInput_Attack; public struct GamePlayerInputActions { private @PlayerInputControl m_Wrapper; @@ -986,6 +1019,7 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable public InputAction @Jump => m_Wrapper.m_GamePlayerInput_Jump; public InputAction @Look => m_Wrapper.m_GamePlayerInput_Look; public InputAction @Fire => m_Wrapper.m_GamePlayerInput_Fire; + public InputAction @Attack => m_Wrapper.m_GamePlayerInput_Attack; public InputActionMap Get() { return m_Wrapper.m_GamePlayerInput; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -1007,6 +1041,9 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable @Fire.started += instance.OnFire; @Fire.performed += instance.OnFire; @Fire.canceled += instance.OnFire; + @Attack.started += instance.OnAttack; + @Attack.performed += instance.OnAttack; + @Attack.canceled += instance.OnAttack; } private void UnregisterCallbacks(IGamePlayerInputActions instance) @@ -1023,6 +1060,9 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable @Fire.started -= instance.OnFire; @Fire.performed -= instance.OnFire; @Fire.canceled -= instance.OnFire; + @Attack.started -= instance.OnAttack; + @Attack.performed -= instance.OnAttack; + @Attack.canceled -= instance.OnAttack; } public void RemoveCallbacks(IGamePlayerInputActions instance) @@ -1209,6 +1249,7 @@ public partial class @PlayerInputControl: IInputActionCollection2, IDisposable void OnJump(InputAction.CallbackContext context); void OnLook(InputAction.CallbackContext context); void OnFire(InputAction.CallbackContext context); + void OnAttack(InputAction.CallbackContext context); } public interface IUIActions { diff --git a/Assets/Settings/PlayerInputControl.inputactions b/Assets/Settings/PlayerInputControl.inputactions index c31306d..35cbf90 100644 --- a/Assets/Settings/PlayerInputControl.inputactions +++ b/Assets/Settings/PlayerInputControl.inputactions @@ -40,6 +40,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Attack", + "type": "Button", + "id": "9b75b534-6170-456b-b032-4b7ae466d72d", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -266,7 +275,7 @@ { "name": "", "id": "3223b6c8-cd3a-4bab-afb1-1da84399059a", - "path": "/space", + "path": "/k", "interactions": "", "processors": "", "groups": ";Keyboard&Mouse", @@ -284,6 +293,28 @@ "action": "Jump", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "bbb49e65-0427-476d-b3eb-e773395386fd", + "path": "/j", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9f0dfc8f-abe4-4c89-a14d-ee0a44cbe34e", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Attack", + "isComposite": false, + "isPartOfComposite": false } ] },