diff --git a/Assets/Animation.meta b/Assets/Animation.meta new file mode 100644 index 0000000000000000000000000000000000000000..9a2c002a598b19715709a19dd9b7c5adba32fb70 --- /dev/null +++ b/Assets/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0a2c1f99827d154a98f443264413d0b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/ninjaAttack.anim b/Assets/Animation/ninjaAttack.anim new file mode 100644 index 0000000000000000000000000000000000000000..201f1db112f6d5c2b232a046f289f0085800572d --- /dev/null +++ b/Assets/Animation/ninjaAttack.anim @@ -0,0 +1,95 @@ +%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: ninjaAttack + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: a805739803a104047a2050219807c0d5, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: f4e5b66d4b5edac458e095e562310286, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 87cb66b2215eab9488bc76c50d88ffcc, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: edc22d64ab3fa5c43aecb89fce9b7547, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 87bdc3ac941a3c04dbdaed004efb6667, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 615c695c73a0c1f468aaab8b1b0130ee, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 4c7d1ca58938c784f915d44a862440ba, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 1fe5ea99b83bc994d9c22e40b415243c, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 3c56787d22b788c46b080f7e4ec9563f, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 5181195335aef9745b208cbfb962adf2, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: a805739803a104047a2050219807c0d5, type: 3} + - {fileID: 21300000, guid: f4e5b66d4b5edac458e095e562310286, type: 3} + - {fileID: 21300000, guid: 87cb66b2215eab9488bc76c50d88ffcc, type: 3} + - {fileID: 21300000, guid: edc22d64ab3fa5c43aecb89fce9b7547, type: 3} + - {fileID: 21300000, guid: 87bdc3ac941a3c04dbdaed004efb6667, type: 3} + - {fileID: 21300000, guid: 615c695c73a0c1f468aaab8b1b0130ee, type: 3} + - {fileID: 21300000, guid: 4c7d1ca58938c784f915d44a862440ba, type: 3} + - {fileID: 21300000, guid: 1fe5ea99b83bc994d9c22e40b415243c, type: 3} + - {fileID: 21300000, guid: 3c56787d22b788c46b080f7e4ec9563f, type: 3} + - {fileID: 21300000, guid: 5181195335aef9745b208cbfb962adf2, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Player.controller.meta b/Assets/Animation/ninjaAttack.anim.meta similarity index 78% rename from Assets/Player.controller.meta rename to Assets/Animation/ninjaAttack.anim.meta index 6645f0ead3ec0b518e76f6c92780b3c3fe80f960..0395a505c90f6ccecedfc689f723bf8d1c58b84a 100644 --- a/Assets/Player.controller.meta +++ b/Assets/Animation/ninjaAttack.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 159a6568865771d4986909834017e595 +guid: c7b3c9dae05c77749abc278daf78fa95 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Animation/ninjaIdle.anim b/Assets/Animation/ninjaIdle.anim new file mode 100644 index 0000000000000000000000000000000000000000..d53adeca1c147aa32d045ae81027ae9a412df737 --- /dev/null +++ b/Assets/Animation/ninjaIdle.anim @@ -0,0 +1,95 @@ +%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: ninjaIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 39606f8802bf0134189f4443eebed123, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 17f90cb79d0ee304e834de76103e4b9a, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 90626621e772fa64ab64004da571dfef, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 90f0f5e4cac22524fa54706bdd86c661, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 702407947c94f684b89ab1ff0a0880d4, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 3af3a7608c0366b4e8134353d7ebf7d6, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: d6caf313cc94d4942b82f8fd69fca522, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 57876c3ea1dc2d042b7b361bb048cea4, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: b0e0e5e4fddf3594ab4de6cc91ba3620, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 211d8a6f59bec0c40b2b041deea58961, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: 39606f8802bf0134189f4443eebed123, type: 3} + - {fileID: 21300000, guid: 17f90cb79d0ee304e834de76103e4b9a, type: 3} + - {fileID: 21300000, guid: 90626621e772fa64ab64004da571dfef, type: 3} + - {fileID: 21300000, guid: 90f0f5e4cac22524fa54706bdd86c661, type: 3} + - {fileID: 21300000, guid: 702407947c94f684b89ab1ff0a0880d4, type: 3} + - {fileID: 21300000, guid: 3af3a7608c0366b4e8134353d7ebf7d6, type: 3} + - {fileID: 21300000, guid: d6caf313cc94d4942b82f8fd69fca522, type: 3} + - {fileID: 21300000, guid: 57876c3ea1dc2d042b7b361bb048cea4, type: 3} + - {fileID: 21300000, guid: b0e0e5e4fddf3594ab4de6cc91ba3620, type: 3} + - {fileID: 21300000, guid: 211d8a6f59bec0c40b2b041deea58961, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/playerAnimation.anim.meta b/Assets/Animation/ninjaIdle.anim.meta similarity index 78% rename from Assets/playerAnimation.anim.meta rename to Assets/Animation/ninjaIdle.anim.meta index b6338bb1ca84141feb5d5bb3d7e12a6afb5cbec8..b18e635ec282c2a54a1f1137a1d77e8ed0ec3c1e 100644 --- a/Assets/playerAnimation.anim.meta +++ b/Assets/Animation/ninjaIdle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34a19abfadf59f14bbeed6b2e06e51d0 +guid: 1e84d8adb8d0d9c41ac6cabdfa3c3d1b NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Animation/ninjaLandingJump.anim b/Assets/Animation/ninjaLandingJump.anim new file mode 100644 index 0000000000000000000000000000000000000000..d1792ca875a3c44387e9880797e40a8cb45863d6 --- /dev/null +++ b/Assets/Animation/ninjaLandingJump.anim @@ -0,0 +1,74 @@ +%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: ninjaLandingJump + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 46d9a19f6fc54f74c901697150585b2d, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: bdde4930ddefd6d4e8a83200ea19ed67, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: aba9f9e2cf730e64b813bdcb79f9ddc2, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: 46d9a19f6fc54f74c901697150585b2d, type: 3} + - {fileID: 21300000, guid: bdde4930ddefd6d4e8a83200ea19ed67, type: 3} + - {fileID: 21300000, guid: aba9f9e2cf730e64b813bdcb79f9ddc2, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + 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/Animation/ninjaLandingJump.anim.meta b/Assets/Animation/ninjaLandingJump.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..5cde8714d236870a937b1b409852649f826fabff --- /dev/null +++ b/Assets/Animation/ninjaLandingJump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89964423aed1f3d42b0417217b66f506 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/ninjaRun.anim b/Assets/Animation/ninjaRun.anim new file mode 100644 index 0000000000000000000000000000000000000000..e8b48b319973aa80e7804cf67baa6d64548c7944 --- /dev/null +++ b/Assets/Animation/ninjaRun.anim @@ -0,0 +1,95 @@ +%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: ninjaRun + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 68bbeae97249aff45ba3ef6ef4d095fb, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 8eaca8d1100bc8442928bd3341ae6c4c, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 0876c879b9b916f47b80350d023304b0, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: bdf3a988efce28044a2d0e68fc7b05df, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 4aa7ca416b4c97c4c93570cc634243ce, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: b64fd314489445943a917b7ea9e2b211, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 0a6b889659033e44d8243c72b2a917bb, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 9b7144f030d835340903d197730e4352, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: c24c2c78c7d18914eaddc338c1fa5014, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: bfd4f0668dc2e724b8c062c067da9e72, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: 68bbeae97249aff45ba3ef6ef4d095fb, type: 3} + - {fileID: 21300000, guid: 8eaca8d1100bc8442928bd3341ae6c4c, type: 3} + - {fileID: 21300000, guid: 0876c879b9b916f47b80350d023304b0, type: 3} + - {fileID: 21300000, guid: bdf3a988efce28044a2d0e68fc7b05df, type: 3} + - {fileID: 21300000, guid: 4aa7ca416b4c97c4c93570cc634243ce, type: 3} + - {fileID: 21300000, guid: b64fd314489445943a917b7ea9e2b211, type: 3} + - {fileID: 21300000, guid: 0a6b889659033e44d8243c72b2a917bb, type: 3} + - {fileID: 21300000, guid: 9b7144f030d835340903d197730e4352, type: 3} + - {fileID: 21300000, guid: c24c2c78c7d18914eaddc338c1fa5014, type: 3} + - {fileID: 21300000, guid: bfd4f0668dc2e724b8c062c067da9e72, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/ninjaRun.anim.meta b/Assets/Animation/ninjaRun.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..b3189d0f03d2b7d4abb441fade791570d3ca0c3c --- /dev/null +++ b/Assets/Animation/ninjaRun.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3359a7db29a74874296d2e33cbc24fc8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/ninjaTakeOffJump.anim b/Assets/Animation/ninjaTakeOffJump.anim new file mode 100644 index 0000000000000000000000000000000000000000..c1a612a9b2340f644d0b2cfde9ccf11bfebcb76b --- /dev/null +++ b/Assets/Animation/ninjaTakeOffJump.anim @@ -0,0 +1,86 @@ +%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: ninjaTakeOffJump + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 64e254b76c7b2e9498a383ca9e63e84e, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: d6e2b3884a03c2648b9360e13e7e8285, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 03949023c1d83ca4a80a0c7c2b98c7d5, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: da0933e6224424e4cab3e59dd2b39c9c, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 19b7317d30e71da4792e4095681a8ec5, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: b7341d747b3044e408bae4a828d1bdc2, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 0303a85ec4b03704484dd9057794259f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: 64e254b76c7b2e9498a383ca9e63e84e, type: 3} + - {fileID: 21300000, guid: d6e2b3884a03c2648b9360e13e7e8285, type: 3} + - {fileID: 21300000, guid: 03949023c1d83ca4a80a0c7c2b98c7d5, type: 3} + - {fileID: 21300000, guid: da0933e6224424e4cab3e59dd2b39c9c, type: 3} + - {fileID: 21300000, guid: 19b7317d30e71da4792e4095681a8ec5, type: 3} + - {fileID: 21300000, guid: b7341d747b3044e408bae4a828d1bdc2, type: 3} + - {fileID: 21300000, guid: 0303a85ec4b03704484dd9057794259f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5833333 + 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/Animation/ninjaTakeOffJump.anim.meta b/Assets/Animation/ninjaTakeOffJump.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..883f3a22a4c83e067d1db5d4e5156caacdd7c097 --- /dev/null +++ b/Assets/Animation/ninjaTakeOffJump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 674e062a6de775b41a87849ad08c9ff2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/playerIdle.anim b/Assets/Animation/playerIdle.anim new file mode 100644 index 0000000000000000000000000000000000000000..8732c410a901099cd3b36f43e0763a445fdd50cb --- /dev/null +++ b/Assets/Animation/playerIdle.anim @@ -0,0 +1,95 @@ +%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: playerIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 6d0eecc3cbcc4674c8e75c09d1a79a87, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: bd242c176c4ab2140a420be3263baa93, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: c814fb16e9e087b45be6037b747b5487, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7236092acb44c624c9f69dce80051918, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 67241594c8bf2cd4aa1c7226bb8c21a5, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 6edc7c9de68800e4586a71c8b6aecfd1, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 3c28a2f9bffa0a64b95c4b84acdd50ec, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: bcfdd53e087dad44cb9602c85b101544, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 4bf224e01baf1a2418967a97ed5c669e, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} + - {fileID: 21300000, guid: 6d0eecc3cbcc4674c8e75c09d1a79a87, type: 3} + - {fileID: 21300000, guid: bd242c176c4ab2140a420be3263baa93, type: 3} + - {fileID: 21300000, guid: c814fb16e9e087b45be6037b747b5487, type: 3} + - {fileID: 21300000, guid: 7236092acb44c624c9f69dce80051918, type: 3} + - {fileID: 21300000, guid: 67241594c8bf2cd4aa1c7226bb8c21a5, type: 3} + - {fileID: 21300000, guid: 6edc7c9de68800e4586a71c8b6aecfd1, type: 3} + - {fileID: 21300000, guid: 3c28a2f9bffa0a64b95c4b84acdd50ec, type: 3} + - {fileID: 21300000, guid: bcfdd53e087dad44cb9602c85b101544, type: 3} + - {fileID: 21300000, guid: 4bf224e01baf1a2418967a97ed5c669e, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/playerIdle.anim.meta b/Assets/Animation/playerIdle.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..2558b8e0404935dbda1b901d836961fcbafc8ae9 --- /dev/null +++ b/Assets/Animation/playerIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3dc71b89a10da734899422d9929c48cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animation/playerRun.anim b/Assets/Animation/playerRun.anim new file mode 100644 index 0000000000000000000000000000000000000000..fb64a79281a52baa11ece3bc23742db4d6cbb448 --- /dev/null +++ b/Assets/Animation/playerRun.anim @@ -0,0 +1,89 @@ +%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: playerRun + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: f92d0da5a3b66a14ba086774496b5b95, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: d816314ed195188489e2a34c8428cf4a, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: cf15841620044a94085fd5328dae872c, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 8e181e1f66620104cbb9fe02b1f4aec8, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7d3f64311c5b019429dc55d928de5c97, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 4d217222fe7bdb24491261480c1acfce, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: fd3c4675b52b05e4c85793daf449f4da, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 2fec1730f3a55ee4cab1590522c5b531, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: 21300000, guid: f92d0da5a3b66a14ba086774496b5b95, type: 3} + - {fileID: 21300000, guid: d816314ed195188489e2a34c8428cf4a, type: 3} + - {fileID: 21300000, guid: cf15841620044a94085fd5328dae872c, type: 3} + - {fileID: 21300000, guid: 8e181e1f66620104cbb9fe02b1f4aec8, type: 3} + - {fileID: 21300000, guid: 7d3f64311c5b019429dc55d928de5c97, type: 3} + - {fileID: 21300000, guid: 4d217222fe7bdb24491261480c1acfce, type: 3} + - {fileID: 21300000, guid: fd3c4675b52b05e4c85793daf449f4da, type: 3} + - {fileID: 21300000, guid: 2fec1730f3a55ee4cab1590522c5b531, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6666666 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animation/playerRun.anim.meta b/Assets/Animation/playerRun.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..40858ce6e9d1190a08b262318c4448e38785ebb3 --- /dev/null +++ b/Assets/Animation/playerRun.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95c970dd2f5887d4e8a59ad28f32cda0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/playerAnimation.anim b/Assets/Animation/playerShoot.anim similarity index 56% rename from Assets/playerAnimation.anim rename to Assets/Animation/playerShoot.anim index eea389368eafcc5b92fd75739ddd3d22c38c2031..cd2278846719a0f9419317f69663c7eabb26f531 100644 --- a/Assets/playerAnimation.anim +++ b/Assets/Animation/playerShoot.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: playerAnimation + m_Name: playerShoot serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -17,26 +17,47 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 7a969b510259d6047957946afca6df0e, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 678a67eaf4f905640881af205c2aa268, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 3d103984f11d9644c90ff3a0ebe48d47, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 7a969b510259d6047957946afca6df0e, type: 3} + - {fileID: 21300000, guid: 678a67eaf4f905640881af205c2aa268, type: 3} + - {fileID: 21300000, guid: 3d103984f11d9644c90ff3a0ebe48d47, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animation/playerShoot.anim.meta b/Assets/Animation/playerShoot.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..973d35046b27774b81e32e058865279e2feb9c06 --- /dev/null +++ b/Assets/Animation/playerShoot.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f38bf1a999af8a5468cc368d6d321918 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Controllers.meta b/Assets/Controllers.meta new file mode 100644 index 0000000000000000000000000000000000000000..aad6bdd630ac36b98896db3e15caa3ae307cb648 --- /dev/null +++ b/Assets/Controllers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68522f3727908a547a4143defe9999f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Controllers/ninjaController.controller b/Assets/Controllers/ninjaController.controller new file mode 100644 index 0000000000000000000000000000000000000000..d9ca485d7e6b4ab818070bd5e1a88067dbab1e55 --- /dev/null +++ b/Assets/Controllers/ninjaController.controller @@ -0,0 +1,544 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4104953041510363367 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Ground Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6478821644471549245} + m_Position: {x: 270, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9206826790104616030} + m_Position: {x: 270, y: -90, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8757101855426908601} + m_Position: {x: 520, y: -50, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 300, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6478821644471549245} +--- !u!1102 &-3467489440299986949 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaTakeOffJump + m_Speed: 2 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4649646402238143403} + 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: 674e062a6de775b41a87849ad08c9ff2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2750527149318302217 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6478821644471549245} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-1646590061683490797 +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: 6478821644471549245} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: land + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: jump + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Ground Layer + m_StateMachine: {fileID: -4104953041510363367} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Air Layer + m_StateMachine: {fileID: 7154062383764428655} + 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 &1813562110959745939 +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: jump + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3467489440299986949} + 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 &2097405843599489432 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8757101855426908601} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2626968986103404844 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8757101855426908601} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &3210710875622676033 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9206826790104616030} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3615195604900471236 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DefaultState + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1813562110959745939} + - {fileID: 4721066529624175812} + 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 &4649646402238143403 +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: land + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8538013826061114879} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4721066529624175812 +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: land + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8538013826061114879} + 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!1107 &5510009715024865186 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New Layer + m_ChildStates: [] + 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: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!1101 &6473651098639722908 +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: land + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3615195604900471236} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &6478821644471549245 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 3210710875622676033} + - {fileID: 2626968986103404844} + 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: 1e84d8adb8d0d9c41ac6cabdfa3c3d1b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6757196797127259408 +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: 8538013826061114879} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &7154062383764428655 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Air Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -3467489440299986949} + m_Position: {x: 330, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8538013826061114879} + m_Position: {x: 370, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3615195604900471236} + m_Position: {x: 130, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 30, z: 0} + m_EntryPosition: {x: 50, y: 230, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3615195604900471236} +--- !u!1102 &8538013826061114879 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaLandingJump + m_Speed: 2 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6473651098639722908} + 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: 89964423aed1f3d42b0417217b66f506, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8757101855426908601 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaAttack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1646590061683490797} + 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: c7b3c9dae05c77749abc278daf78fa95, type: 2} + m_Tag: Attack + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &9206826790104616030 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ninjaRun + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2750527149318302217} + - {fileID: 2097405843599489432} + 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: 3359a7db29a74874296d2e33cbc24fc8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Controllers/ninjaController.controller.meta b/Assets/Controllers/ninjaController.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..7002fb6d1bbaff4a8f4c1f6cc5be8fa7ae566fec --- /dev/null +++ b/Assets/Controllers/ninjaController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 966cb5f2947b30b4696d1df9a1994d93 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Controllers/playerController.controller b/Assets/Controllers/playerController.controller new file mode 100644 index 0000000000000000000000000000000000000000..81ab3a242fa99c2232893936824f7db0a8ad3de9 --- /dev/null +++ b/Assets/Controllers/playerController.controller @@ -0,0 +1,295 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7654628809644160378 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5634014957788690948} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7413178974947128656 +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: -5634014957788690948} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5634014957788690948 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: playerIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2094028458599610866} + - {fileID: 5045501328823632892} + 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: 3dc71b89a10da734899422d9929c48cc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2094028458599610866 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3263275201667069914} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: playerController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: attack + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 6050125275684246952} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &95972745225458208 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5640031179733756403} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2798110474426065236 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: playerRun 0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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 &3263275201667069914 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: playerRun + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7654628809644160378} + - {fileID: 95972745225458208} + 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: 95c970dd2f5887d4e8a59ad28f32cda0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &5045501328823632892 +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: attack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5640031179733756403} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &5640031179733756403 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: playerShoot + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7413178974947128656} + 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: f38bf1a999af8a5468cc368d6d321918, type: 2} + m_Tag: Attack + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &6050125275684246952 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5634014957788690948} + m_Position: {x: 220, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3263275201667069914} + m_Position: {x: 220, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5640031179733756403} + m_Position: {x: 500, y: 200, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 30, y: 320, z: 0} + m_EntryPosition: {x: 240, y: 420, z: 0} + m_ExitPosition: {x: 560, y: 320, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5634014957788690948} diff --git a/Assets/Controllers/playerController.controller.meta b/Assets/Controllers/playerController.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..68406c82b324d00c6066338dfababd28ea71980f --- /dev/null +++ b/Assets/Controllers/playerController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 396c847e7c4d23143969a89c577e99ee +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player.controller b/Assets/Player.controller deleted file mode 100644 index b2f7915a37d1740c5e67eab6d089f4d1f274ab58..0000000000000000000000000000000000000000 --- a/Assets/Player.controller +++ /dev/null @@ -1,98 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-9091926673427191573 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: playerAnimation - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 34a19abfadf59f14bbeed6b2e06e51d0, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-8275599808322341642 -AnimatorStateMachine: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 9218627909262526708} - m_Position: {x: 200, y: 0, 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: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 9218627909262526708} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -8275599808322341642} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &9218627909262526708 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 54e5d68f3bca88d4095ac279262b8df7, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000000000000000000000000000000000000..0e6db7f82f43c7faf9d8f829b083f57588d67cbd --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,286 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4401632815337494130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4401632815337494131} + m_Layer: 0 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4401632815337494131 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632815337494130} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.62, y: -2.31, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4401632816114505562} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4401632815422488661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4401632815422488658} + m_Layer: 0 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4401632815422488658 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632815422488661} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.28, y: -2.35, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 4401632816114505562} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4401632816114505567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4401632816114505562} + - component: {fileID: 4401632816114505565} + - component: {fileID: 4401632816114505564} + - component: {fileID: 4401632816114505563} + - component: {fileID: 4401632816114505561} + - component: {fileID: 4401632816114505560} + - component: {fileID: 4401632816114505558} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4401632816114505562 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.76, y: -0.29, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_Children: + - {fileID: 4401632817120869584} + - {fileID: 4401632815337494131} + - {fileID: 4401632815422488658} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4401632816114505565 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1903785921 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.41, y: 5.42} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &4401632816114505564 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 396c847e7c4d23143969a89c577e99ee, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!50 &4401632816114505563 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 3 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!61 &4401632816114505561 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.4790434, y: 0.848588} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 6.41, y: 5.42} + newSize: {x: 6.41, y: 5.42} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 2.1123188, y: 2.9016118} + m_EdgeRadius: 0 +--- !u!58 &4401632816114505560 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.31432787, y: -1.2302271} + serializedVersion: 2 + m_Radius: 1.1330795 +--- !u!114 &4401632816114505558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632816114505567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61b62a727f829a2458499734186a5aa5, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 5 + groundPoints: + - {fileID: 4401632817120869584} + - {fileID: 4401632815337494131} + - {fileID: 4401632815422488658} + groundRadius: 0.2 + whatIsGround: + serializedVersion: 2 + m_Bits: 4294967295 + airControl: 0 + jumpForce: 500 +--- !u!1 &4401632817120869587 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4401632817120869584} + m_Layer: 0 + m_Name: GroundPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4401632817120869584 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4401632817120869587} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.85, y: -2.34, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4401632816114505562} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..9371aa97131a5f848fef53ad37b1d288a7326657 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4a095a170879ef843bb10ef027976aa4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 0c1dd051fa6871cd4d060d76554c1b8f52e92814..fcf661526868ae4e4e98c3827caafc57b42801d5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -229,188 +229,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5850837521427315171} m_PrefabAsset: {fileID: 0} ---- !u!1 &182737903 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 182737905} - - component: {fileID: 182737904} - - component: {fileID: 182737906} - - component: {fileID: 182737907} - - component: {fileID: 182737908} - - component: {fileID: 182737909} - - component: {fileID: 182737910} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &182737904 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1903785921 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 6.41, y: 5.42} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &182737905 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -10.124, y: -0.34, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &182737906 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 159a6568865771d4986909834017e595, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!50 &182737907 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 2 - m_Material: {fileID: 0} - m_Interpolate: 1 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!61 &182737908 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.432662, y: 0.76935047} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 6.41, y: 5.42} - newSize: {x: 6.41, y: 5.42} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.9226012, y: 3.1919503} - m_EdgeRadius: 0 ---- !u!114 &182737909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61b62a727f829a2458499734186a5aa5, type: 3} - m_Name: - m_EditorClassIdentifier: - moveSpeed: 3 - hitPoints: 100 ---- !u!58 &182737910 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 182737903} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.38336277, y: -1.3900001} - serializedVersion: 2 - m_Radius: 1.0936434 --- !u!1 &218394891 GameObject: m_ObjectHideFlags: 0 @@ -492,6 +310,36 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &243249519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243249520} + m_Layer: 0 + m_Name: GameObject (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &243249520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243249519} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.08, y: -1.9, z: -430.8203} + m_LocalScale: {x: 3.333333, y: 3.333333, z: 1} + m_Children: [] + m_Father: {fileID: 1176708701} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &266696092 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4421181584670360695, guid: 5b60b2a68abb7a845b543016ab7d1a48, @@ -848,7 +696,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 633550878} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.71, y: 1.87, z: 123.767555} + m_LocalPosition: {x: 1.655, y: 1.75, z: 123.767555} m_LocalScale: {x: 1.162075, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1790401737} @@ -885,11 +733,42 @@ Transform: - {fileID: 1092454205} - {fileID: 135328766} - {fileID: 8350302323164953206} + - {fileID: 967734566} - {fileID: 1565046906} - {fileID: 12869490} m_Father: {fileID: 2055408438} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &819209779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 819209780} + m_Layer: 0 + m_Name: GameObject (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &819209780 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 819209779} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.85, y: -1.95, z: -430.8203} + m_LocalScale: {x: 3.333333, y: 3.333333, z: 1} + m_Children: [] + m_Father: {fileID: 1176708701} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &845648451 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5850837523215050033, guid: 2f0e35b8e195c47449cbe7c84052166c, @@ -922,6 +801,114 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.2, y: 0.8} m_EdgeRadius: 0 +--- !u!1 &967734565 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 967734566} + - component: {fileID: 967734567} + - component: {fileID: 967734568} + m_Layer: 0 + m_Name: Crate + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &967734566 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967734565} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.42, y: -1.05, z: 123.767555} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 684720565} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &967734567 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967734565} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -925667517 + m_SortingLayer: -4 + m_SortingOrder: 20 + m_Sprite: {fileID: 21300000, guid: 330f3f1a89f08f4419b3e089e8e5c670, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.06, y: 1.06} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &967734568 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 967734565} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + 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.5, y: 0.5} + oldSize: {x: 1.06, y: 1.06} + newSize: {x: 1.06, y: 1.06} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.06, y: 1.06} + m_EdgeRadius: 0 --- !u!1 &1052337760 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4421181585178732158, guid: 5b60b2a68abb7a845b543016ab7d1a48, @@ -1076,6 +1063,200 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1092454204} m_PrefabAsset: {fileID: 0} +--- !u!1 &1176708694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1176708701} + - component: {fileID: 1176708700} + - component: {fileID: 1176708699} + - component: {fileID: 1176708698} + - component: {fileID: 1176708697} + - component: {fileID: 1176708696} + - component: {fileID: 1176708695} + m_Layer: 0 + m_Name: Ninja + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!58 &1176708695 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.04, y: -1.07} + serializedVersion: 2 + m_Radius: 1.0887177 +--- !u!61 &1176708696 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.10371405, y: 0.44942677} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 2.32, y: 4.39} + newSize: {x: 2.32, y: 4.39} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.9397165, y: 3.2837193} + m_EdgeRadius: 0 +--- !u!50 &1176708697 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 3 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &1176708698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0fe98c147c1923048b8e0ff88e56b70b, type: 3} + m_Name: + m_EditorClassIdentifier: + moveSpeed: 5 + groundPoints: + - {fileID: 1551638640} + - {fileID: 819209780} + - {fileID: 243249520} + groundRadius: 0.2 + whatIsGround: + serializedVersion: 2 + m_Bits: 4294967295 + airControl: 0 + jumpForce: 500 +--- !u!95 &1176708699 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 966cb5f2947b30b4696d1df9a1994d93, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &1176708700 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1903785921 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 39606f8802bf0134189f4443eebed123, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.32, y: 4.39} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1176708701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176708694} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.09, y: 0.87, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_Children: + - {fileID: 1551638640} + - {fileID: 819209780} + - {fileID: 243249520} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1256931213 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4612021869123852365, guid: d9eccbbfaa97cda45bebc9e80d911a67, @@ -1300,6 +1481,36 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.28, y: 1.28} m_EdgeRadius: 0 +--- !u!1 &1551638639 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551638640} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1551638640 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551638639} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.98, y: -1.95, z: -430.8203} + m_LocalScale: {x: 3.333333, y: 3.333333, z: 1} + m_Children: [] + m_Father: {fileID: 1176708701} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1565046905 GameObject: m_ObjectHideFlags: 0 @@ -1329,7 +1540,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 684720565} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1565046907 SpriteRenderer: @@ -1534,7 +1745,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1846697780} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 21.57, y: 1.944, z: 0} + m_LocalPosition: {x: 23.49, y: 1.74, z: 0} m_LocalScale: {x: 1.081, y: 0.997, z: 1} m_Children: [] m_Father: {fileID: 1790401737} @@ -1888,7 +2099,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2019784381} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -19.280329, y: -5.036184, z: 167.58691} + m_LocalPosition: {x: -17.45, y: -5.48, z: 167.58691} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 315343938} @@ -2161,7 +2372,7 @@ PrefabInstance: - target: {fileID: 4612021868107726216, guid: d9eccbbfaa97cda45bebc9e80d911a67, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4612021868107726216, guid: d9eccbbfaa97cda45bebc9e80d911a67, type: 3} @@ -2351,6 +2562,36 @@ PrefabInstance: propertyPath: m_SortingLayer value: -4 objectReference: {fileID: 0} + - target: {fileID: 4421181585004155270, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.5548 + objectReference: {fileID: 0} + - target: {fileID: 4421181585004155270, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalScale.x + value: 0.7711716 + objectReference: {fileID: 0} + - target: {fileID: 4421181585033008571, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.5646 + objectReference: {fileID: 0} + - target: {fileID: 4421181585033008571, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalScale.x + value: 0.74362946 + objectReference: {fileID: 0} + - target: {fileID: 4421181585033008571, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalPosition.y + value: -4.586 + objectReference: {fileID: 0} + - target: {fileID: 4421181585033008571, guid: 5b60b2a68abb7a845b543016ab7d1a48, + type: 3} + propertyPath: m_LocalScale.y + value: 0.836068 + objectReference: {fileID: 0} - target: {fileID: 4421181585364391517, guid: 5b60b2a68abb7a845b543016ab7d1a48, type: 3} propertyPath: m_SortingLayerID diff --git a/Assets/Scripts/Ninja.cs b/Assets/Scripts/Ninja.cs new file mode 100644 index 0000000000000000000000000000000000000000..5cbd9f7cd1a0319bd2d011df54518aefb8a24f88 --- /dev/null +++ b/Assets/Scripts/Ninja.cs @@ -0,0 +1,135 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Ninja : MonoBehaviour +{ + public float moveSpeed = 5f; + private Rigidbody2D myRigidBody; + private bool facingRight; + private bool attack; + private Animator myAnimator; + + [SerializeField] + private Transform[] groundPoints; + + + [SerializeField] + private float groundRadius; + + [SerializeField] + private LayerMask whatIsGround; + + private bool isGrounded; + private bool jump; + + [SerializeField] + private bool airControl; + + [SerializeField] + private float jumpForce; + + // Start is called before the first frame update + void Start() + { + myRigidBody = gameObject.GetComponent<Rigidbody2D>(); + if(myRigidBody == null) { + Debug.LogError("Player::Start cant find RigidBody2D </sadface>"); + } + facingRight = true; + myAnimator = GetComponent<Animator>(); + } + + // Update is called once per frame + void Update(){ + HandleInput(); + } + + void FixedUpdate() { + float horizontalMove = Input.GetAxis("Horizontal"); + + isGrounded = IsGrounded(); + + HandleMovement(horizontalMove); + + FlipHandle(horizontalMove); + + HandleAttacks(); + + HandleLayers(); + + ResetValues(); + } + + void HandleMovement(float horizontalMove){ + if (myRigidBody.velocity.y < 0){ + myAnimator.SetBool("land", true); + } + if (isGrounded && jump) { + isGrounded = false; + myRigidBody.AddForce(new Vector2(0, jumpForce)); + myAnimator.SetTrigger("jump"); + } + if (!this.myAnimator.GetCurrentAnimatorStateInfo(0).IsTag("Attack")){ + myRigidBody.velocity = new Vector2(horizontalMove * moveSpeed, myRigidBody.velocity.y); + } + myAnimator.SetFloat("speed", Mathf.Abs(horizontalMove)); + } + + void HandleAttacks(){ + if (attack && !this.myAnimator.GetCurrentAnimatorStateInfo(0).IsTag("Attack")){ + myAnimator.SetTrigger("attack"); + myRigidBody.velocity = Vector2.zero; + } + } + + void HandleInput(){ + if (Input.GetKeyDown(KeyCode.Q)){ + attack = true; + } + if (Input.GetKeyDown(KeyCode.Space)){ + jump = true; + } + } + + void FlipHandle(float horizontalMove){ + if (horizontalMove > 0 && !facingRight || horizontalMove < 0 && facingRight){ + facingRight = !facingRight; + + Vector3 scale = transform.localScale; + scale.x *= -1; + + transform.localScale = scale; + } + } + + void ResetValues(){ + attack = false; + jump = false; + } + + bool IsGrounded(){ + if (myRigidBody.velocity.y <= 0){ + foreach (Transform point in groundPoints){ + Collider2D[] colliders = Physics2D.OverlapCircleAll(point.position, groundRadius, whatIsGround); + + for (int i = 0; i < colliders.Length; ++i){ + if (colliders[i].gameObject != gameObject){ + myAnimator.ResetTrigger("jump"); + myAnimator.SetBool("land", false); + return true; + } + } + } + } + return false; + } + + void HandleLayers(){ + if (!isGrounded){ + myAnimator.SetLayerWeight(1, 1); + }else{ + myAnimator.SetLayerWeight(1, 0); + } + } +} diff --git a/Assets/Scripts/Ninja.cs.meta b/Assets/Scripts/Ninja.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..61247fcd68bf717de86c6f06101c2fc6ff899d82 --- /dev/null +++ b/Assets/Scripts/Ninja.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0fe98c147c1923048b8e0ff88e56b70b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 869422481d86adde6a258ce0a3af067c350df735..51f33cc1a272729e4bb01aff6a9fa334cda89d03 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -4,49 +4,117 @@ using UnityEngine; public class Player : MonoBehaviour { - public float moveSpeed = 5f; - public float hitPoints = 100f; - private Rigidbody2D rb; + public float moveSpeed = 5f; + private Rigidbody2D myRigidBody; + private bool facingRight; + private bool attack; + private Animator myAnimator; + + [SerializeField] + private Transform[] groundPoints; + + + [SerializeField] + private float groundRadius; + + [SerializeField] + private LayerMask whatIsGround; + + private bool isGrounded; + private bool jump; + + [SerializeField] + private bool airControl; + + [SerializeField] + private float jumpForce; + // Start is called before the first frame update void Start() { - rb = gameObject.GetComponent<Rigidbody2D>(); - if(rb == null) { + myRigidBody = gameObject.GetComponent<Rigidbody2D>(); + if(myRigidBody == null) { Debug.LogError("Player::Start cant find RigidBody2D </sadface>"); } + facingRight = true; + myAnimator = GetComponent<Animator>(); } // Update is called once per frame - void Update() - { - if (Input.GetAxisRaw("Horizontal") != 0 || Input.GetAxisRaw("Vertical") != 0) { - // convert user input into world movement - float horizontalMovement = Input.GetAxisRaw("Horizontal") * moveSpeed * Time.deltaTime; - float verticalMovement = Input.GetAxisRaw("Vertical") * moveSpeed * Time.deltaTime; + void Update(){ + HandleInput(); + } + + void FixedUpdate() { + float horizontalMove = Input.GetAxis("Horizontal"); + + isGrounded = IsGrounded(); - //assign movement to a single vector3 - Vector3 directionOfMovement = new Vector3(horizontalMovement, verticalMovement, 0); + HandleMovement(horizontalMove); - // apply movement to player's transform - gameObject.transform.Translate(directionOfMovement); + FlipHandle(horizontalMove); + + HandleAttacks(); + + ResetValues(); + } + + void HandleMovement(float horizontalMove){ + if (isGrounded && jump) { + isGrounded = false; + myRigidBody.AddForce(new Vector2(0, jumpForce)); } + if (!this.myAnimator.GetCurrentAnimatorStateInfo(0).IsTag("Attack")){ + myRigidBody.velocity = new Vector2(horizontalMove * moveSpeed, myRigidBody.velocity.y); + } + myAnimator.SetFloat("speed", Mathf.Abs(horizontalMove)); } - // this is called at a fixed interval for use with physics objects like the RigidBody2D - void FixedUpdate() { - // // check if user has pressed some input keys - // if (Input.GetAxisRaw("Horizontal") != 0 || Input.GetAxisRaw("Vertical") != 0) { - - // // convert user input into world movement - // float horizontalMovement = Input.GetAxisRaw("Horizontal") * moveSpeed; - // float verticalMovement = Input.GetAxisRaw("Vertical") * moveSpeed; - - // //assign world movements to a Veoctor2 - // Vector2 directionOfMovement = new Vector2(horizontalMovement, verticalMovement); - - // // apply movement to player's transform - // rb.AddForce(directionOfMovement); - // } + void HandleAttacks(){ + if (attack && !this.myAnimator.GetCurrentAnimatorStateInfo(0).IsTag("Attack")){ + myAnimator.SetTrigger("attack"); + myRigidBody.velocity = Vector2.zero; + } + } + + void HandleInput(){ + if (Input.GetKeyDown(KeyCode.Q)){ + attack = true; + } + if (Input.GetKeyDown(KeyCode.Space)){ + jump = true; + } + } + + void FlipHandle(float horizontalMove){ + if (horizontalMove > 0 && !facingRight || horizontalMove < 0 && facingRight){ + facingRight = !facingRight; + + Vector3 scale = transform.localScale; + scale.x *= -1; + + transform.localScale = scale; + } + } + + void ResetValues(){ + attack = false; + jump = false; + } + + bool IsGrounded(){ + if (myRigidBody.velocity.y <= 0){ + foreach (Transform point in groundPoints){ + Collider2D[] colliders = Physics2D.OverlapCircleAll(point.position, groundRadius, whatIsGround); + + for (int i = 0; i < colliders.Length; ++i){ + if (colliders[i].gameObject != gameObject){ + return true; + } + } + } + } + return false; } } diff --git a/Assets/Sounds/Animation/Player.anim b/Assets/Sounds/Animation/Player.anim index 6c492a42c2ec311c20a2b8a9231f636869f290e4..6654cb2f8e26398a3cf35f04afd0fa8f4f548a40 100644 --- a/Assets/Sounds/Animation/Player.anim +++ b/Assets/Sounds/Animation/Player.anim @@ -21,22 +21,6 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} - - time: 0.1 - value: {fileID: 21300000, guid: f92d0da5a3b66a14ba086774496b5b95, type: 3} - - time: 0.2 - value: {fileID: 21300000, guid: d816314ed195188489e2a34c8428cf4a, type: 3} - - time: 0.3 - value: {fileID: 21300000, guid: cf15841620044a94085fd5328dae872c, type: 3} - - time: 0.4 - value: {fileID: 21300000, guid: 8e181e1f66620104cbb9fe02b1f4aec8, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 7d3f64311c5b019429dc55d928de5c97, type: 3} - - time: 0.6 - value: {fileID: 21300000, guid: 4d217222fe7bdb24491261480c1acfce, type: 3} - - time: 0.7 - value: {fileID: 21300000, guid: fd3c4675b52b05e4c85793daf449f4da, type: 3} - - time: 0.8 - value: {fileID: 21300000, guid: 2fec1730f3a55ee4cab1590522c5b531, type: 3} attribute: m_Sprite path: classID: 212 @@ -57,20 +41,12 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: 21300000, guid: 09f7f5def0d512c4eb369fccb9aabdca, type: 3} - - {fileID: 21300000, guid: f92d0da5a3b66a14ba086774496b5b95, type: 3} - - {fileID: 21300000, guid: d816314ed195188489e2a34c8428cf4a, type: 3} - - {fileID: 21300000, guid: cf15841620044a94085fd5328dae872c, type: 3} - - {fileID: 21300000, guid: 8e181e1f66620104cbb9fe02b1f4aec8, type: 3} - - {fileID: 21300000, guid: 7d3f64311c5b019429dc55d928de5c97, type: 3} - - {fileID: 21300000, guid: 4d217222fe7bdb24491261480c1acfce, type: 3} - - {fileID: 21300000, guid: fd3c4675b52b05e4c85793daf449f4da, type: 3} - - {fileID: 21300000, guid: 2fec1730f3a55ee4cab1590522c5b531, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.81666666 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 1e8791cfd69f6c61c949cf928ee8588554da9a45..a0af65092de20b9dd25b6050045c4dfd66a1288b 100644 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/Artifacts/a3/a3e9980c721bef749bedd036088756f2 b/Library/Artifacts/03/0319e39d1e7b0d5e9e430b8cf60e9bd6 similarity index 97% rename from Library/Artifacts/a3/a3e9980c721bef749bedd036088756f2 rename to Library/Artifacts/03/0319e39d1e7b0d5e9e430b8cf60e9bd6 index ff89dd53bac9c87d72fd78b7aedd23377284a31d..a8819d3ea0cde856e3e78d51927e0d4dbc42197f 100644 Binary files a/Library/Artifacts/a3/a3e9980c721bef749bedd036088756f2 and b/Library/Artifacts/03/0319e39d1e7b0d5e9e430b8cf60e9bd6 differ diff --git a/Library/Artifacts/10/10ba97e4d15d731eae96ef53ca4ff423 b/Library/Artifacts/10/10ba97e4d15d731eae96ef53ca4ff423 new file mode 100644 index 0000000000000000000000000000000000000000..d696473535b4bd76571d490b097a48903cdcb002 Binary files /dev/null and b/Library/Artifacts/10/10ba97e4d15d731eae96ef53ca4ff423 differ diff --git a/Library/Artifacts/bd/bd27099b1548efa32ec4134be8645228 b/Library/Artifacts/11/11d1306e6524bf16d75701062b3bc221 similarity index 80% rename from Library/Artifacts/bd/bd27099b1548efa32ec4134be8645228 rename to Library/Artifacts/11/11d1306e6524bf16d75701062b3bc221 index d55a39a7b85a6de846199c535b78c97b2d9b5998..2ccb7c3e7a76b93dbb3dec101c951a9ae5bd763f 100644 Binary files a/Library/Artifacts/bd/bd27099b1548efa32ec4134be8645228 and b/Library/Artifacts/11/11d1306e6524bf16d75701062b3bc221 differ diff --git a/Library/Artifacts/8e/8ea4655fec536f2fe681146865a93932 b/Library/Artifacts/18/18809ab76721ebee66773b9e07375647 similarity index 86% rename from Library/Artifacts/8e/8ea4655fec536f2fe681146865a93932 rename to Library/Artifacts/18/18809ab76721ebee66773b9e07375647 index cbe80974f2b589c1711b4ee78e56e8fb60cc1f1a..375cc640919ba686e8cd84ff926f91bd1e3a679a 100644 Binary files a/Library/Artifacts/8e/8ea4655fec536f2fe681146865a93932 and b/Library/Artifacts/18/18809ab76721ebee66773b9e07375647 differ diff --git a/Library/Artifacts/1f/1fe144f0980569afc2c81a96fa9b0ef3 b/Library/Artifacts/1f/1fe144f0980569afc2c81a96fa9b0ef3 new file mode 100644 index 0000000000000000000000000000000000000000..b4be67bafb334175bbe0151b06e01711b6f5ea4b Binary files /dev/null and b/Library/Artifacts/1f/1fe144f0980569afc2c81a96fa9b0ef3 differ diff --git a/Library/Artifacts/26/26640bfb5dfa2503767ab61c0543748b b/Library/Artifacts/26/26640bfb5dfa2503767ab61c0543748b new file mode 100644 index 0000000000000000000000000000000000000000..25a822b691edb7f8d366ab5e411c585dcf6e1a38 Binary files /dev/null and b/Library/Artifacts/26/26640bfb5dfa2503767ab61c0543748b differ diff --git a/Library/Artifacts/a9/a997a923a35ce527a93fdebfa5f2a012 b/Library/Artifacts/27/279388820d2e634f3bcc1caaacc2ffba similarity index 86% rename from Library/Artifacts/a9/a997a923a35ce527a93fdebfa5f2a012 rename to Library/Artifacts/27/279388820d2e634f3bcc1caaacc2ffba index 39e5d4e79f30178b4d9d949c7fabf2a02c9b6161..dc3d4b20c55c486665a9770b33b10ba019f55e24 100644 Binary files a/Library/Artifacts/a9/a997a923a35ce527a93fdebfa5f2a012 and b/Library/Artifacts/27/279388820d2e634f3bcc1caaacc2ffba differ diff --git a/Library/Artifacts/92/923e3e2b51572ef79062fa32b4f8c87b b/Library/Artifacts/31/3127f2c6256abb775f4f1afc6dbf79f4 similarity index 73% rename from Library/Artifacts/92/923e3e2b51572ef79062fa32b4f8c87b rename to Library/Artifacts/31/3127f2c6256abb775f4f1afc6dbf79f4 index fa60f219737076307a8be62f038b92ebc34d977c..bb48482415ff911690619b8e91c363220a260e11 100644 Binary files a/Library/Artifacts/92/923e3e2b51572ef79062fa32b4f8c87b and b/Library/Artifacts/31/3127f2c6256abb775f4f1afc6dbf79f4 differ diff --git a/Library/Artifacts/31/313658af468da60cfd995c8e8c759aad b/Library/Artifacts/31/313658af468da60cfd995c8e8c759aad new file mode 100644 index 0000000000000000000000000000000000000000..846aa51fbbba71cb1aa88e576a8fe99505711d0b Binary files /dev/null and b/Library/Artifacts/31/313658af468da60cfd995c8e8c759aad differ diff --git a/Library/Artifacts/36/361de7ad90fda656467b96a122b19d56 b/Library/Artifacts/36/361de7ad90fda656467b96a122b19d56 new file mode 100644 index 0000000000000000000000000000000000000000..b1228dd05da71c7577987f7fd14ab654e6549d41 Binary files /dev/null and b/Library/Artifacts/36/361de7ad90fda656467b96a122b19d56 differ diff --git a/Library/Artifacts/37/37e3d7b6f0992379d5840877ec9b758d b/Library/Artifacts/37/37e3d7b6f0992379d5840877ec9b758d new file mode 100644 index 0000000000000000000000000000000000000000..f483b91984d8146778dfd266893858540f75faf4 Binary files /dev/null and b/Library/Artifacts/37/37e3d7b6f0992379d5840877ec9b758d differ diff --git a/Library/Artifacts/3d/3dceaaaf0856116b241f384308685c7f b/Library/Artifacts/3d/3dceaaaf0856116b241f384308685c7f new file mode 100644 index 0000000000000000000000000000000000000000..54618301195d72b69e02e12b675747bfd983d5db Binary files /dev/null and b/Library/Artifacts/3d/3dceaaaf0856116b241f384308685c7f differ diff --git a/Library/Artifacts/6a/6a34786580b817afc3a388f6004b8198 b/Library/Artifacts/3f/3f2f2669dec89630c0324fe85a196718 similarity index 87% rename from Library/Artifacts/6a/6a34786580b817afc3a388f6004b8198 rename to Library/Artifacts/3f/3f2f2669dec89630c0324fe85a196718 index f3f274822d90b57132a2686dc72fb965ac8dba07..1ffd9d09c399ae6eb119234a26c24ed4a92e6630 100644 Binary files a/Library/Artifacts/6a/6a34786580b817afc3a388f6004b8198 and b/Library/Artifacts/3f/3f2f2669dec89630c0324fe85a196718 differ diff --git a/Library/Artifacts/3f/3f8e5639d9b26e3fdfa916668fdffac0 b/Library/Artifacts/3f/3f8e5639d9b26e3fdfa916668fdffac0 new file mode 100644 index 0000000000000000000000000000000000000000..75254af8278d8187e0fbe03604b73406797438f2 Binary files /dev/null and b/Library/Artifacts/3f/3f8e5639d9b26e3fdfa916668fdffac0 differ diff --git a/Library/Artifacts/49/496b1777f26a5140cd80839c8874dcc9 b/Library/Artifacts/49/496b1777f26a5140cd80839c8874dcc9 new file mode 100644 index 0000000000000000000000000000000000000000..253579e07c69bd0f3332a2191d30ba6717549baa Binary files /dev/null and b/Library/Artifacts/49/496b1777f26a5140cd80839c8874dcc9 differ diff --git a/Library/Artifacts/54/54efeed6826dace9daec8ce8169f20cb b/Library/Artifacts/54/54efeed6826dace9daec8ce8169f20cb new file mode 100644 index 0000000000000000000000000000000000000000..150fdbb6ba8dbad82a3f4a4fc7a3af778ffad8bc Binary files /dev/null and b/Library/Artifacts/54/54efeed6826dace9daec8ce8169f20cb differ diff --git a/Library/Artifacts/59/592d47ad8f9d996fe81856d528a6b078 b/Library/Artifacts/59/592d47ad8f9d996fe81856d528a6b078 new file mode 100644 index 0000000000000000000000000000000000000000..4c0fcb9300fec54f42e6d12f644fcfa08bd8764e Binary files /dev/null and b/Library/Artifacts/59/592d47ad8f9d996fe81856d528a6b078 differ diff --git a/Library/Artifacts/f0/f0b98bba556f81133b79d7defdb6247e b/Library/Artifacts/60/606bdb53465d41236281c99df6d89e03 similarity index 86% rename from Library/Artifacts/f0/f0b98bba556f81133b79d7defdb6247e rename to Library/Artifacts/60/606bdb53465d41236281c99df6d89e03 index 3743d066d2390638fc07ef10ba182dff25ffeeac..a9ddc4fd77b9932bbf22bf809782d6e4b85be2c9 100644 Binary files a/Library/Artifacts/f0/f0b98bba556f81133b79d7defdb6247e and b/Library/Artifacts/60/606bdb53465d41236281c99df6d89e03 differ diff --git a/Library/Artifacts/62/629745e2877269d5712ee25a4b5b3ddf b/Library/Artifacts/62/629745e2877269d5712ee25a4b5b3ddf new file mode 100644 index 0000000000000000000000000000000000000000..58ea2938050ef408d0d2eb3e15b294b6201bf6d1 Binary files /dev/null and b/Library/Artifacts/62/629745e2877269d5712ee25a4b5b3ddf differ diff --git a/Library/Artifacts/6c/6c0f7c0aed706aa8262af5f615206e3a b/Library/Artifacts/6c/6c0f7c0aed706aa8262af5f615206e3a new file mode 100644 index 0000000000000000000000000000000000000000..b2ddcc63599305dde49938f4cddad3f03fcc84eb Binary files /dev/null and b/Library/Artifacts/6c/6c0f7c0aed706aa8262af5f615206e3a differ diff --git a/Library/Artifacts/78/78a3de5db88b92f2dee4f08681ef7b7d b/Library/Artifacts/78/78a3de5db88b92f2dee4f08681ef7b7d new file mode 100644 index 0000000000000000000000000000000000000000..c2cd04d94fb2a71d330c409abff36d98c2ff3c42 Binary files /dev/null and b/Library/Artifacts/78/78a3de5db88b92f2dee4f08681ef7b7d differ diff --git a/Library/Artifacts/82/82207d3058e28d621c6885829b67f3ba b/Library/Artifacts/82/82207d3058e28d621c6885829b67f3ba new file mode 100644 index 0000000000000000000000000000000000000000..d9f89acbf0e7b26263321209b8ef0d925b8bb248 Binary files /dev/null and b/Library/Artifacts/82/82207d3058e28d621c6885829b67f3ba differ diff --git a/Library/Artifacts/87/87eddcd04ab3f957f75e4f3e723e985b b/Library/Artifacts/87/87eddcd04ab3f957f75e4f3e723e985b new file mode 100644 index 0000000000000000000000000000000000000000..ea1f861a7d6f3a7f7be0fe97d9b869efe498feeb Binary files /dev/null and b/Library/Artifacts/87/87eddcd04ab3f957f75e4f3e723e985b differ diff --git a/Library/Artifacts/8d/8d4194012c6ea85b3bdb9a327a079833 b/Library/Artifacts/8d/8d4194012c6ea85b3bdb9a327a079833 new file mode 100644 index 0000000000000000000000000000000000000000..405a16e759dff5d1233f12964292c024f5687e35 Binary files /dev/null and b/Library/Artifacts/8d/8d4194012c6ea85b3bdb9a327a079833 differ diff --git a/Library/Artifacts/93/932cfe4a9c565352dff711bbd3731493 b/Library/Artifacts/93/932cfe4a9c565352dff711bbd3731493 new file mode 100644 index 0000000000000000000000000000000000000000..e962d419c286d043c271b6ff9889fee04b858a36 Binary files /dev/null and b/Library/Artifacts/93/932cfe4a9c565352dff711bbd3731493 differ diff --git a/Library/Artifacts/9a/9a612c98b50050383461cc44ff680e88 b/Library/Artifacts/9a/9a612c98b50050383461cc44ff680e88 new file mode 100644 index 0000000000000000000000000000000000000000..53c7685913057d6075842db94199863d181ddc5b Binary files /dev/null and b/Library/Artifacts/9a/9a612c98b50050383461cc44ff680e88 differ diff --git a/Library/Artifacts/a6/a68c0aff4425662beb6a634cc0b0af87 b/Library/Artifacts/a6/a68c0aff4425662beb6a634cc0b0af87 new file mode 100644 index 0000000000000000000000000000000000000000..f7890a9268bd970525bb4a215ac8edcd36c5a42a Binary files /dev/null and b/Library/Artifacts/a6/a68c0aff4425662beb6a634cc0b0af87 differ diff --git a/Library/Artifacts/b0/b0c2d1da4bb0dab1c312d149408cdef0 b/Library/Artifacts/b0/b0c2d1da4bb0dab1c312d149408cdef0 new file mode 100644 index 0000000000000000000000000000000000000000..b1d07c0d86bebb64e99b9b38c6088bffa2df5818 Binary files /dev/null and b/Library/Artifacts/b0/b0c2d1da4bb0dab1c312d149408cdef0 differ diff --git a/Library/Artifacts/b7/b703a51a02536fa4b6507b5b4771491d b/Library/Artifacts/b7/b703a51a02536fa4b6507b5b4771491d new file mode 100644 index 0000000000000000000000000000000000000000..6287eb9ed2418598a143cd7f9d71233f974fd515 Binary files /dev/null and b/Library/Artifacts/b7/b703a51a02536fa4b6507b5b4771491d differ diff --git a/Library/Artifacts/cd/cd0f7ef0665dcaf5adf3200155c0a249 b/Library/Artifacts/cd/cd0f7ef0665dcaf5adf3200155c0a249 new file mode 100644 index 0000000000000000000000000000000000000000..d89db07dcfb31a86fb0ab880a0b2805f8248db23 Binary files /dev/null and b/Library/Artifacts/cd/cd0f7ef0665dcaf5adf3200155c0a249 differ diff --git a/Library/Artifacts/1c/1cf25b8ff22f469961b828f7376d45b5 b/Library/Artifacts/d6/d68e3f4ebbe28ad8a38990137164cd24 similarity index 82% rename from Library/Artifacts/1c/1cf25b8ff22f469961b828f7376d45b5 rename to Library/Artifacts/d6/d68e3f4ebbe28ad8a38990137164cd24 index beb17dca08beb3cb9fecc8502254f01ba9f190cf..8398a84cf5f3d5b96c0dca7ca1c2f3997d5dfa17 100644 Binary files a/Library/Artifacts/1c/1cf25b8ff22f469961b828f7376d45b5 and b/Library/Artifacts/d6/d68e3f4ebbe28ad8a38990137164cd24 differ diff --git a/Library/Artifacts/e9/e90965579ca7b68aed59d9519d350ed4 b/Library/Artifacts/e9/e90965579ca7b68aed59d9519d350ed4 deleted file mode 100644 index 2663ad020cae6ee2c14e5f3be30419f2ea7dbf34..0000000000000000000000000000000000000000 Binary files a/Library/Artifacts/e9/e90965579ca7b68aed59d9519d350ed4 and /dev/null differ diff --git a/Library/Artifacts/ea/ea13ea89e9b902f2733370e80e19eae4 b/Library/Artifacts/ea/ea13ea89e9b902f2733370e80e19eae4 new file mode 100644 index 0000000000000000000000000000000000000000..1b41ec5b1ecc14446e5ab25d68ea4d25a1d4efc6 Binary files /dev/null and b/Library/Artifacts/ea/ea13ea89e9b902f2733370e80e19eae4 differ diff --git a/Library/Artifacts/f7/f76667bf8cad9de514b39c6808863cec b/Library/Artifacts/f7/f76667bf8cad9de514b39c6808863cec new file mode 100644 index 0000000000000000000000000000000000000000..18d7615e777ffa6e2c6a7e9848079fdde22ecd45 Binary files /dev/null and b/Library/Artifacts/f7/f76667bf8cad9de514b39c6808863cec differ diff --git a/Library/Artifacts/fa/fa884b8abdaaff72b6d558d4901741df b/Library/Artifacts/fa/fa884b8abdaaff72b6d558d4901741df new file mode 100644 index 0000000000000000000000000000000000000000..6c9136474aca2b9e09856a85e57b53f8961fd41d Binary files /dev/null and b/Library/Artifacts/fa/fa884b8abdaaff72b6d558d4901741df differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index 7b39b7000c7b6767f3965f6c32c204f7d360b223..b74eb9565e216c6516295a7fcb29dc7eb7243071 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 9} - m_MinSize: {x: 875, y: 300} + m_MinSize: {x: 875, y: 542} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -34,23 +34,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 393 - width: 823 - height: 242 + y: 437 + width: 746 + height: 198 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 21} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,14 +68,14 @@ MonoBehaviour: - {fileID: 2} m_Position: serializedVersion: 2 - x: 265 + x: 344 y: 0 - width: 823 + width: 746 height: 635 m_MinSize: {x: 202, y: 342} m_MaxSize: {x: 4002, y: 8042} vertical: 1 - controlID: 17 + controlID: 63 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,7 +93,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 291 - width: 265 + width: 344 height: 344 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -121,12 +121,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 265 + width: 344 height: 635 m_MinSize: {x: 231, y: 492} m_MaxSize: {x: 10001, y: 14042} vertical: 1 - controlID: 127 + controlID: 89 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -151,7 +151,7 @@ MonoBehaviour: m_MinSize: {x: 709, y: 492} m_MaxSize: {x: 18004, y: 14042} vertical: 0 - controlID: 15 + controlID: 61 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,9 +167,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1088 + x: 1090 y: 0 - width: 278 + width: 276 height: 635 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -195,10 +195,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 265 + width: 344 height: 291 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -290,12 +290,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1088 + width: 1090 height: 635 m_MinSize: {x: 433, y: 492} m_MaxSize: {x: 14003, y: 14042} vertical: 0 - controlID: 16 + controlID: 62 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -313,8 +313,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 823 - height: 393 + width: 746 + height: 437 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} @@ -333,26 +333,112 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animation - m_Image: {fileID: 1561878555887300916, guid: 0000000000000000d000000000000000, + m_Text: Animator + m_Image: {fileID: 663490763026382308, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 - y: 466 - width: 820 - height: 221 + x: 344 + y: 510 + width: 744 + height: 177 m_ViewDataDictionary: {fileID: 0} + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 6050125275684246952, guid: 396c847e7c4d23143969a89c577e99ee, type: 2} + - {fileID: -4104953041510363367, guid: 966cb5f2947b30b4696d1df9a1994d93, type: 2} + - {fileID: 7154062383764428655, guid: 966cb5f2947b30b4696d1df9a1994d93, type: 2} + - {fileID: 5510009715024865186, guid: 966cb5f2947b30b4696d1df9a1994d93, type: 2} + m_ValueSerializationHelper: + - e00: 0.3483871 + e01: 0 + e02: 0 + e03: 84.8871 + e10: 0 + e11: 0.3483871 + e12: 0 + e13: -40.741936 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5247899 + e01: 0 + e02: 0 + e03: -10.871582 + e10: 0 + e11: 0.5247899 + e12: 0 + e13: 62.97479 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.47912914 + e01: 0 + e02: 0 + e03: 40.621613 + e10: 0 + e11: 0.47912914 + e12: 0 + e13: 4.791298 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.2652056 + e01: 0 + e02: 0 + e03: 134.44827 + e10: 0 + e11: 0.2652056 + e12: 0 + e13: 65.53006 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 966cb5f2947b30b4696d1df9a1994d93, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 7154062383764428655, guid: 966cb5f2947b30b4696d1df9a1994d93, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -1194 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 1 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -374,10 +460,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 468 - y: 181 - width: 973 - height: 501 + x: 344 + y: 73 + width: 744 + height: 416 m_ViewDataDictionary: {fileID: 0} --- !u!114 &16 MonoBehaviour: @@ -402,7 +488,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 364 - width: 264 + width: 343 height: 323 m_ViewDataDictionary: {fileID: 0} m_SearchFilter: @@ -418,20 +504,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Animation m_ViewMode: 1 - m_StartGridSize: 64 + m_StartGridSize: 16 m_LastFolders: - - Assets/Scripts - m_LastFoldersGridSize: -1 + - Assets/Animation + m_LastFoldersGridSize: 16 m_LastProjectPath: C:\Users\user\Desktop\IF3210-2020-Unity-13517078 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 16360000 - m_LastClickedID: 13846 - m_ExpandedIDs: 00000000f0350000f2350000f835000000ca9a3b + scrollPos: {x: 0, y: 53} + m_SelectedIDs: 8e3e0000 + m_LastClickedID: 16014 + m_ExpandedIDs: 000000007236000074360000763600007e3600008636000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -459,7 +545,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f0350000f2350000f4350000f6350000f8350000 + m_ExpandedIDs: 00000000723600007436000076360000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -487,7 +573,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000aa3600000000000050400000 + m_ExpandedInstanceIDs: c6230000aa3600000000000050400000d0d8ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -512,7 +598,7 @@ MonoBehaviour: m_ResourceFile: m_NewAssetIndexInList: -1 m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 + m_GridSize: 16 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 115 --- !u!114 &17 @@ -536,9 +622,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1088 + x: 1090 y: 73 - width: 277 + width: 275 height: 614 m_ViewDataDictionary: {fileID: 0} m_OpenAddComponentMenu: 0 @@ -576,15 +662,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 264 + width: 343 height: 270 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 64} - m_SelectedIDs: 00340000 - m_LastClickedID: 13312 - m_ExpandedIDs: fcfaffff10fbffff36fbffff56fbffff6afbffff6cfbffff06340000143400002e340000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 36340000 + m_LastClickedID: 13366 + m_ExpandedIDs: 7430ffff08fbffff58fbffff7a340000b0340000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -629,10 +715,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 + x: 344 y: 73 - width: 821 - height: 372 + width: 744 + height: 416 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: 9ce713125221ad845a73a569b5192088 @@ -644,9 +730,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -9.4106865, y: -0.40504217, z: -389.1302} + m_Target: {x: -5.3684077, y: 0.8938798, z: -433.0627} speed: 2 - m_Value: {x: -9.406996, y: -0.3982145, z: -389.11627} + m_Value: {x: -5.3684077, y: 0.8938798, z: -433.0627} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -696,9 +782,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.2346997 + m_Target: 6.126366 speed: 2 - m_Value: 3.0954065 + m_Value: 6.126366 m_Ortho: m_Target: 1 speed: 2 @@ -744,10 +830,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 + x: 344 y: 73 - width: 821 - height: 372 + width: 744 + height: 416 m_ViewDataDictionary: {fileID: 0} m_SerializedViewsNames: [] m_SerializedViewsValues: [] @@ -755,7 +841,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 821, y: 351} + m_TargetSize: {x: 744, y: 395} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -769,10 +855,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -410.5 - m_HBaseRangeMax: 410.5 - m_VBaseRangeMin: -175.5 - m_VBaseRangeMax: 175.5 + m_HBaseRangeMin: -372 + m_HBaseRangeMax: 372 + m_VBaseRangeMin: -197.5 + m_VBaseRangeMax: 197.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -790,23 +876,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 821 - height: 351 + width: 744 + height: 395 m_Scale: {x: 1, y: 1} - m_Translation: {x: 410.5, y: 175.5} + m_Translation: {x: 372, y: 197.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -410.5 - y: -175.5 - width: 821 - height: 351 + x: -372 + y: -197.5 + width: 744 + height: 395 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 821, y: 372} + m_LastWindowPixelSize: {x: 744, y: 416} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -833,8 +919,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 265 - y: 466 - width: 821 - height: 221 + x: 344 + y: 510 + width: 744 + height: 177 m_ViewDataDictionary: {fileID: 0} diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 5befbae8c66121606f5c1ce8d35793a42fa3b3c1..475ba552ebf077e3f049a2e33b8fee8f30cd2157 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 69dfea59326357120b5f86d4ec652afc2da7766f..b38b6e0d1d7a6de3a5c2ebd247f5200ddfe8dd2d 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index 0fce02f78f443da7bd39f08a5c89b7cfbfa20e69..7e4b764968c560e76267e113ad53da9a87a85e2d 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index 8cf80515076bb1e49643252b00276a35c3766550..949e810e777c596fa22905f7a0d2a64b5a45c7e0 100644 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/StateCache/SceneView/9ce713-mainStage.json b/Library/StateCache/SceneView/9ce713-mainStage.json index d24756a9751c8548fa24695fbdeee785d14d03bc..7d4f045e372f2708eac7b07b4ee25854ab237787 100644 --- a/Library/StateCache/SceneView/9ce713-mainStage.json +++ b/Library/StateCache/SceneView/9ce713-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-9.410686492919922,"y":-0.4050421714782715,"z":-389.13018798828127},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.2346997261047365,"orthographic":true} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-5.368407726287842,"y":0.893879771232605,"z":-433.0627136230469},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":6.126366138458252,"orthographic":true} \ No newline at end of file diff --git a/Library/expandedItems b/Library/expandedItems index 47d4d1c0345a225d926b33b4cbb8ac6357e5231a..8caff17ccf81e7d400527cc7891954a383a274f4 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ