From c16e5bb751a4f6200455c3a0947640ea676e30f9 Mon Sep 17 00:00:00 2001 From: xhxy <2290327506@qq.com> Date: Sun, 23 Feb 2025 15:37:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8D=95=E7=9A=84=E6=94=BB=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Animations/Player/Attack1.anim | 171 ++++ Assets/Animations/Player/Attack1.anim.meta | 8 + Assets/Animations/Player/Attack2.anim | 189 ++++ Assets/Animations/Player/Attack2.anim.meta | 8 + Assets/Animations/Player/Attack3.anim | 198 +++++ Assets/Animations/Player/Attack3.anim.meta | 8 + Assets/Animations/Player/Dead.anim | 105 +++ Assets/Animations/Player/Dead.anim.meta | 8 + Assets/Animations/Player/Hurt.anim | 504 +++++++++++ Assets/Animations/Player/Hurt.anim.meta | 8 + Assets/Animations/Player/Hurt2.anim | 833 ++++++++++++++++++ Assets/Animations/Player/Hurt2.anim.meta | 8 + .../Player/PlayerAnimation.controller | 600 ++++++++++++- Assets/Art/blueman/char_blue_2.png | Bin 19081 -> 19278 bytes Assets/Scenes/SampleScene.unity | 406 ++++++++- Assets/Scripts/General/Character.cs | 7 + Assets/Scripts/Player/AttackFinish.cs | 36 + Assets/Scripts/Player/AttackFinish.cs.meta | 11 + Assets/Scripts/Player/HurtAnimation.cs | 36 + Assets/Scripts/Player/HurtAnimation.cs.meta | 11 + Assets/Scripts/Player/PlayerAnimation.cs | 17 + Assets/Scripts/Player/PlayerController.cs | 61 +- .../PhyiscsMaterials/Normal.physicsMaterial2D | 2 +- .../Normal.physicsMaterial2D.meta | 2 +- .../PhyiscsMaterials/Wall.physicsMaterial2D | 11 + .../Wall.physicsMaterial2D.meta | 8 + Assets/Settings/PlayerInputControl.cs | 43 +- .../Settings/PlayerInputControl.inputactions | 33 +- 28 files changed, 3312 insertions(+), 20 deletions(-) create mode 100644 Assets/Animations/Player/Attack1.anim create mode 100644 Assets/Animations/Player/Attack1.anim.meta create mode 100644 Assets/Animations/Player/Attack2.anim create mode 100644 Assets/Animations/Player/Attack2.anim.meta create mode 100644 Assets/Animations/Player/Attack3.anim create mode 100644 Assets/Animations/Player/Attack3.anim.meta create mode 100644 Assets/Animations/Player/Dead.anim create mode 100644 Assets/Animations/Player/Dead.anim.meta create mode 100644 Assets/Animations/Player/Hurt.anim create mode 100644 Assets/Animations/Player/Hurt.anim.meta create mode 100644 Assets/Animations/Player/Hurt2.anim create mode 100644 Assets/Animations/Player/Hurt2.anim.meta create mode 100644 Assets/Scripts/Player/AttackFinish.cs create mode 100644 Assets/Scripts/Player/AttackFinish.cs.meta create mode 100644 Assets/Scripts/Player/HurtAnimation.cs create mode 100644 Assets/Scripts/Player/HurtAnimation.cs.meta create mode 100644 Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D create mode 100644 Assets/Settings/PhyiscsMaterials/Wall.physicsMaterial2D.meta 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 a2720add0d2d504831e2576d30afb2eb7e8e034b..3779e50b38cc6313164b16eac721dc073563033b 100644 GIT binary patch delta 13849 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 ax`ug7(LNyUe{O6TDK delta 13684 zcmYj&Wmr_*`}G-8rB$SnM(OSb6{HnJ8U&@g8DIbv1`!ZPLMZ_i7&@d&8bP{;?oLUG zchB>CKm56_`M_|_?tQOyuY1uG4~vL{eUQMp;TbFSo>P=hjMqv~M3hNfl21@fSVU5i zhe=34P=a4Tf?rUWS5Qn!L_kVNsCe5J2jxOYL+b0~Dy8XSZTHGg#nSU7%7Ksp^#xY| zwQ!B2bQd=Yzx449G1#>T^$)rbBwvF<5;+jP_;+bLJ%W*y&5T7|67|DaOZ$lVVX%ph zq||tNcLnrN^rZZ-$x;ncDi~r0={*k`DbCgM$MX zaKpqDEbifz2C65=_Q}qA6_WMIGaU^lW_?EZpIJc>nAxTU?oS0|s`bP!Dm8uZfVTrb zVP}K^;8eq8+u6pd^9HZVRCw(?5DjoEcPfVY6qPI6PG&L<6qCylrUv-tDZVOqi5%uUNlMa#^;gy_eaX<$%sA#OBawSU z*Ps4y=_s|iF{N?&kWwe7Krf?i)C5Blx5l{J>8*5;$DhghOG3Q1ZJXP6vpy6vJrPFN z&$qEsUQup1bN_7KLq>LkkNX@FzP3Wutvv)-(B5qhsVVqIx~6HKG5fi8+D3J9>1R0+*+KRhPG9KXDSm}F#{7^| z9HJVUaDHnq`V&z*ZF%u6!^pI=!z)O1OAU$;|L`oO2R1Vn$eu3OU@Zcr&`rDgydYf%`NA~PM$Y!z4ZmS!28i~mx6i?C;A;VlA9;5E5m5~B@bh_^j)!3&x|%|3`#UoF zW+t|8m}i%0ANh0Vd>!Rb&kFx092c)I#LxC} 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 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 } ] },