From 97e98a3b28461669f53742acc294c67f3d6d257c Mon Sep 17 00:00:00 2001 From: Adam P Skawinski Date: Thu, 5 Mar 2020 16:11:20 -0500 Subject: [PATCH] Animations No longer Prefabs, animations now work --- RPG/Assets/Animations/P_Death.anim | 95 ++++++ RPG/Assets/Animations/P_Death.anim.meta | 8 + RPG/Assets/Animations/P_Ember.anim | 89 +++++ RPG/Assets/Animations/P_Ember.anim.meta | 8 + RPG/Assets/Animations/P_Heal.anim | 83 +++++ RPG/Assets/Animations/P_Heal.anim.meta | 8 + RPG/Assets/Animations/P_Hurt.anim | 77 +++++ RPG/Assets/Animations/P_Hurt.anim.meta | 8 + RPG/Assets/Animations/P_Idle.anim | 104 ++++++ RPG/Assets/Animations/P_Idle.anim.meta | 8 + RPG/Assets/Animations/P_Run.anim | 89 +++++ RPG/Assets/Animations/P_Run.anim.meta | 8 + RPG/Assets/Animations/P_Tackle.anim | 101 ++++++ RPG/Assets/Animations/P_Tackle.anim.meta | 8 + RPG/Assets/Animations/Player.controller | 326 +++++++++++++++++++ RPG/Assets/Animations/Player.controller.meta | 8 + RPG/Assets/Prefabs/Enemy.prefab | 21 +- RPG/Assets/Prefabs/Player.prefab | 94 +----- RPG/Assets/Scenes/Main.unity | 289 ++++++++++++++-- RPG/Assets/Scripts/BattleSystem.cs | 26 +- 20 files changed, 1309 insertions(+), 149 deletions(-) create mode 100644 RPG/Assets/Animations/P_Death.anim create mode 100644 RPG/Assets/Animations/P_Death.anim.meta create mode 100644 RPG/Assets/Animations/P_Ember.anim create mode 100644 RPG/Assets/Animations/P_Ember.anim.meta create mode 100644 RPG/Assets/Animations/P_Heal.anim create mode 100644 RPG/Assets/Animations/P_Heal.anim.meta create mode 100644 RPG/Assets/Animations/P_Hurt.anim create mode 100644 RPG/Assets/Animations/P_Hurt.anim.meta create mode 100644 RPG/Assets/Animations/P_Idle.anim create mode 100644 RPG/Assets/Animations/P_Idle.anim.meta create mode 100644 RPG/Assets/Animations/P_Run.anim create mode 100644 RPG/Assets/Animations/P_Run.anim.meta create mode 100644 RPG/Assets/Animations/P_Tackle.anim create mode 100644 RPG/Assets/Animations/P_Tackle.anim.meta create mode 100644 RPG/Assets/Animations/Player.controller create mode 100644 RPG/Assets/Animations/Player.controller.meta diff --git a/RPG/Assets/Animations/P_Death.anim b/RPG/Assets/Animations/P_Death.anim new file mode 100644 index 0000000..effb386 --- /dev/null +++ b/RPG/Assets/Animations/P_Death.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: P_Death + 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: 79d84b30b3613954c8a2361bd40405a6, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 94c4c4bf3918c714b92846f9a608ee1c, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 387d873e05d99914281de6d3cfd591ed, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 32640277e12a060419b012dac05a85d4, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: dd4b655b19ccb5e459220ab813470ea8, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 27393ad7c64528a4eaa98160aedb7660, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 39e8a2d4fec56b34fbdd34d784c0beb4, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: 31a1e6e5cc6128e4ba6d7edfb3f34559, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: e5ae94d39d880684dbb3f78fbf904767, type: 3} + - time: 0.9 + value: {fileID: 21300000, guid: cda7697700d163142a83c484e201c382, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 10 + 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: 79d84b30b3613954c8a2361bd40405a6, type: 3} + - {fileID: 21300000, guid: 94c4c4bf3918c714b92846f9a608ee1c, type: 3} + - {fileID: 21300000, guid: 387d873e05d99914281de6d3cfd591ed, type: 3} + - {fileID: 21300000, guid: 32640277e12a060419b012dac05a85d4, type: 3} + - {fileID: 21300000, guid: dd4b655b19ccb5e459220ab813470ea8, type: 3} + - {fileID: 21300000, guid: 27393ad7c64528a4eaa98160aedb7660, type: 3} + - {fileID: 21300000, guid: 39e8a2d4fec56b34fbdd34d784c0beb4, type: 3} + - {fileID: 21300000, guid: 31a1e6e5cc6128e4ba6d7edfb3f34559, type: 3} + - {fileID: 21300000, guid: e5ae94d39d880684dbb3f78fbf904767, type: 3} + - {fileID: 21300000, guid: cda7697700d163142a83c484e201c382, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 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/RPG/Assets/Animations/P_Death.anim.meta b/RPG/Assets/Animations/P_Death.anim.meta new file mode 100644 index 0000000..18032fc --- /dev/null +++ b/RPG/Assets/Animations/P_Death.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 789e8c909944d694d8c8a22c16a73c6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Ember.anim b/RPG/Assets/Animations/P_Ember.anim new file mode 100644 index 0000000..74a95d9 --- /dev/null +++ b/RPG/Assets/Animations/P_Ember.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: P_Ember + 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: dcd06665e48579e4788ea74afafafe5d, type: 3} + - time: 0.125 + value: {fileID: 21300000, guid: b9bbaad9383ea664baf46201b5df0304, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: aaf01d7ac8cb1a245aa3c03ff6da99d5, type: 3} + - time: 0.375 + value: {fileID: 21300000, guid: 298cd4cebde7a1049abf7e9ac60effd4, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 8c1410b3b020d4f489ceef4e52a5275f, type: 3} + - time: 0.625 + value: {fileID: 21300000, guid: 87aaadba1440b67458d2334446b9faf0, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 7d79bb723e8699741bc805df415f24a6, type: 3} + - time: 0.875 + value: {fileID: 21300000, guid: a36fd68299c1d074eb9fc955cd57961a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: dcd06665e48579e4788ea74afafafe5d, type: 3} + - {fileID: 21300000, guid: b9bbaad9383ea664baf46201b5df0304, type: 3} + - {fileID: 21300000, guid: aaf01d7ac8cb1a245aa3c03ff6da99d5, type: 3} + - {fileID: 21300000, guid: 298cd4cebde7a1049abf7e9ac60effd4, type: 3} + - {fileID: 21300000, guid: 8c1410b3b020d4f489ceef4e52a5275f, type: 3} + - {fileID: 21300000, guid: 87aaadba1440b67458d2334446b9faf0, type: 3} + - {fileID: 21300000, guid: 7d79bb723e8699741bc805df415f24a6, type: 3} + - {fileID: 21300000, guid: a36fd68299c1d074eb9fc955cd57961a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 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/RPG/Assets/Animations/P_Ember.anim.meta b/RPG/Assets/Animations/P_Ember.anim.meta new file mode 100644 index 0000000..c986250 --- /dev/null +++ b/RPG/Assets/Animations/P_Ember.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96e9d071d4feea745a2c1a0440999557 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Heal.anim b/RPG/Assets/Animations/P_Heal.anim new file mode 100644 index 0000000..e28daf2 --- /dev/null +++ b/RPG/Assets/Animations/P_Heal.anim @@ -0,0 +1,83 @@ +%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: P_Heal + 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: 567caf10e2be9404bb0aa1b75c05b443, type: 3} + - time: 0.125 + value: {fileID: 21300000, guid: c8cc0879bb27d0540b36c5fab9f3b5f0, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: a6333c2d5552f624a8c4dffc6ad58f07, type: 3} + - time: 0.375 + value: {fileID: 21300000, guid: 3621e3be8a578434ea30d317882cfeff, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 37ac561fe5bef7741b00134b15e05bb7, type: 3} + - time: 0.625 + value: {fileID: 21300000, guid: 31a5fe8343be3804b9f862613040cc69, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 567caf10e2be9404bb0aa1b75c05b443, type: 3} + - {fileID: 21300000, guid: c8cc0879bb27d0540b36c5fab9f3b5f0, type: 3} + - {fileID: 21300000, guid: a6333c2d5552f624a8c4dffc6ad58f07, type: 3} + - {fileID: 21300000, guid: 3621e3be8a578434ea30d317882cfeff, type: 3} + - {fileID: 21300000, guid: 37ac561fe5bef7741b00134b15e05bb7, type: 3} + - {fileID: 21300000, guid: 31a5fe8343be3804b9f862613040cc69, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.75 + 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/RPG/Assets/Animations/P_Heal.anim.meta b/RPG/Assets/Animations/P_Heal.anim.meta new file mode 100644 index 0000000..aa3e66a --- /dev/null +++ b/RPG/Assets/Animations/P_Heal.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 541cd0806c6730b418dd62de7e79a3ab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Hurt.anim b/RPG/Assets/Animations/P_Hurt.anim new file mode 100644 index 0000000..fbad3ec --- /dev/null +++ b/RPG/Assets/Animations/P_Hurt.anim @@ -0,0 +1,77 @@ +%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: P_Hurt + 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: 97f2637821df9f24ca2d64c801542f75, type: 3} + - time: 0.125 + value: {fileID: 21300000, guid: c78797b63e9dd654d9a9dd13d4d2121c, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 804435a74fd83ff4480ebc3beaa42acf, type: 3} + - time: 0.375 + value: {fileID: 21300000, guid: 80c2460bca2c65c4cafa28f1c3a31a97, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 97f2637821df9f24ca2d64c801542f75, type: 3} + - {fileID: 21300000, guid: c78797b63e9dd654d9a9dd13d4d2121c, type: 3} + - {fileID: 21300000, guid: 804435a74fd83ff4480ebc3beaa42acf, type: 3} + - {fileID: 21300000, guid: 80c2460bca2c65c4cafa28f1c3a31a97, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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/RPG/Assets/Animations/P_Hurt.anim.meta b/RPG/Assets/Animations/P_Hurt.anim.meta new file mode 100644 index 0000000..3871f79 --- /dev/null +++ b/RPG/Assets/Animations/P_Hurt.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 235d3e08ab179e54bacb9459bef1fecd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Idle.anim b/RPG/Assets/Animations/P_Idle.anim new file mode 100644 index 0000000..4f77b5e --- /dev/null +++ b/RPG/Assets/Animations/P_Idle.anim @@ -0,0 +1,104 @@ +%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: P_Idle + 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: 8e090a323c3366a4e8406c26cf7a122f, type: 3} + - time: 0.125 + value: {fileID: 21300000, guid: 8e090a323c3366a4e8406c26cf7a122f, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: bcf8f425c2342014898fd97105674c67, type: 3} + - time: 0.375 + value: {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3} + - time: 0.625 + value: {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3} + - time: 0.875 + value: {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3} + - time: 1.125 + value: {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3} + - time: 1.25 + value: {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3} + - time: 1.375 + value: {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3} + - time: 1.5 + value: {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 8 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 8e090a323c3366a4e8406c26cf7a122f, type: 3} + - {fileID: 21300000, guid: 8e090a323c3366a4e8406c26cf7a122f, type: 3} + - {fileID: 21300000, guid: bcf8f425c2342014898fd97105674c67, type: 3} + - {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3} + - {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3} + - {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3} + - {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3} + - {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3} + - {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3} + - {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3} + - {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3} + - {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3} + - {fileID: 21300000, guid: 3e23c0de9f1711d4ca396d8660d97a35, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.625 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/RPG/Assets/Animations/P_Idle.anim.meta b/RPG/Assets/Animations/P_Idle.anim.meta new file mode 100644 index 0000000..e68a1e7 --- /dev/null +++ b/RPG/Assets/Animations/P_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab64fd87a82663148a0c5acc37bb8bd1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Run.anim b/RPG/Assets/Animations/P_Run.anim new file mode 100644 index 0000000..ab56740 --- /dev/null +++ b/RPG/Assets/Animations/P_Run.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: P_Run + 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: 557821c0b2219cf4da72a05e94b51b5f, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 10 + 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: 557821c0b2219cf4da72a05e94b51b5f, type: 3} + - {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3} + - {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3} + - {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3} + - {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3} + - {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3} + - {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3} + - {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8 + 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/RPG/Assets/Animations/P_Run.anim.meta b/RPG/Assets/Animations/P_Run.anim.meta new file mode 100644 index 0000000..c553cb0 --- /dev/null +++ b/RPG/Assets/Animations/P_Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba8e97d026b43f8478bdeb9a45e42119 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Tackle.anim b/RPG/Assets/Animations/P_Tackle.anim new file mode 100644 index 0000000..b51c5b5 --- /dev/null +++ b/RPG/Assets/Animations/P_Tackle.anim @@ -0,0 +1,101 @@ +%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: P_Tackle + 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: 557821c0b2219cf4da72a05e94b51b5f, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3} + - time: 0.9166667 + value: {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, 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: 557821c0b2219cf4da72a05e94b51b5f, type: 3} + - {fileID: 21300000, guid: 2b1e98da62868a848ba19504d73e9e71, type: 3} + - {fileID: 21300000, guid: 3c86dea0c0088744591cb92c38ac55f5, type: 3} + - {fileID: 21300000, guid: 5d7da9768b68b464b9c3b87878e9cc50, type: 3} + - {fileID: 21300000, guid: 073be82b0e9bcc94bae10a19bc3f0d0b, type: 3} + - {fileID: 21300000, guid: 62336ffdd817f974eb7711570a31b884, type: 3} + - {fileID: 21300000, guid: c2b9d7f0840191b4a8da64cd8ad4be37, type: 3} + - {fileID: 21300000, guid: 63a6e249f870c5143b2315084b88ab98, type: 3} + - {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3} + - {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3} + - {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3} + - {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 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/RPG/Assets/Animations/P_Tackle.anim.meta b/RPG/Assets/Animations/P_Tackle.anim.meta new file mode 100644 index 0000000..3bcc96c --- /dev/null +++ b/RPG/Assets/Animations/P_Tackle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1831ac87bd69c3747a5edec553e5237d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/Player.controller b/RPG/Assets/Animations/Player.controller new file mode 100644 index 0000000..aa6ac9e --- /dev/null +++ b/RPG/Assets/Animations/Player.controller @@ -0,0 +1,326 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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_Name: Run + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107896377136882442} + 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 &1101493965354743250 +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: Run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102248514777427172} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.84615386 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101952481130829154 +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: 1102124773476174550} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101962941386886002 +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: Run + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102779875948788416} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.6875 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102124773476174550 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Tackle + 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: 1831ac87bd69c3747a5edec553e5237d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102202413945558032 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Death + 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: 789e8c909944d694d8c8a22c16a73c6b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102248514777427172 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Run + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101962941386886002} + 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: ba8e97d026b43f8478bdeb9a45e42119, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102270305872944342 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Hurt + 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: 235d3e08ab179e54bacb9459bef1fecd, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102571751961851502 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Ember + 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: 96e9d071d4feea745a2c1a0440999557, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102761255378921292 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Heal + 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: 541cd0806c6730b418dd62de7e79a3ab, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102779875948788416 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101493965354743250} + 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: ab64fd87a82663148a0c5acc37bb8bd1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107896377136882442 +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: 1102779875948788416} + m_Position: {x: -12, y: 144, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102124773476174550} + m_Position: {x: 456, y: -84, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102761255378921292} + m_Position: {x: 384, y: 168, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102571751961851502} + m_Position: {x: 420, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102202413945558032} + m_Position: {x: 456, y: 324, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102270305872944342} + m_Position: {x: 276, y: 276, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102248514777427172} + m_Position: {x: -12, y: 60, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -72, y: -72, z: 0} + m_EntryPosition: {x: -192, y: 132, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102779875948788416} diff --git a/RPG/Assets/Animations/Player.controller.meta b/RPG/Assets/Animations/Player.controller.meta new file mode 100644 index 0000000..06c7812 --- /dev/null +++ b/RPG/Assets/Animations/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d13dd6ec386bac41b31d541996e7b2e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Prefabs/Enemy.prefab b/RPG/Assets/Prefabs/Enemy.prefab index 88bb712..291d235 100644 --- a/RPG/Assets/Prefabs/Enemy.prefab +++ b/RPG/Assets/Prefabs/Enemy.prefab @@ -89,7 +89,6 @@ GameObject: m_Component: - component: {fileID: 2405723475983736982} - component: {fileID: 7513063758604067209} - - component: {fileID: 5277848429525194744} m_Layer: 0 m_Name: Enemy m_TagString: Untagged @@ -126,27 +125,9 @@ MonoBehaviour: m_EditorClassIdentifier: unitName: Mage unitLevel: 2 + damage0: 0 damage: 5 damage2: 0 damage3: 0 maxHP: 40 currentHP: 40 ---- !u!95 &5277848429525194744 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1581901224397169381} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b975f432d6a561e4fb87e667a0044bc2, 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 diff --git a/RPG/Assets/Prefabs/Player.prefab b/RPG/Assets/Prefabs/Player.prefab index 67b7a79..3f4cd35 100644 --- a/RPG/Assets/Prefabs/Player.prefab +++ b/RPG/Assets/Prefabs/Player.prefab @@ -1,84 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1587894515556746329 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8368252609744019118} - - component: {fileID: 4539579211750614903} - m_Layer: 0 - m_Name: knight - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8368252609744019118 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1587894515556746329} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7833863944867809333} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4539579211750614903 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1587894515556746329} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: b2a056eebccf5e741ad242c3eea51dd7, 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.28, y: 1.28} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &7833863944867809331 GameObject: m_ObjectHideFlags: 0 @@ -90,7 +11,7 @@ GameObject: - component: {fileID: 7833863944867809333} - component: {fileID: 7833863944867809332} - component: {fileID: 7833863944867809330} - - component: {fileID: 6018718191495086512} + - component: {fileID: 847353583968365108} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -106,10 +27,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7833863944867809331} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.5, y: -2.8, z: 0} + m_LocalPosition: {x: -3.84, y: -2.9, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} - m_Children: - - {fileID: 8368252609744019118} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -170,7 +90,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: b2a056eebccf5e741ad242c3eea51dd7, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -178,10 +98,10 @@ SpriteRenderer: m_Size: {x: 1.28, y: 1.28} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &6018718191495086512 +--- !u!95 &847353583968365108 Animator: serializedVersion: 3 m_ObjectHideFlags: 0 @@ -191,7 +111,7 @@ Animator: m_GameObject: {fileID: 7833863944867809331} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3d13dd6ec386bac41b31d541996e7b2e, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/RPG/Assets/Scenes/Main.unity b/RPG/Assets/Scenes/Main.unity index 02e77df..2951c7f 100644 --- a/RPG/Assets/Scenes/Main.unity +++ b/RPG/Assets/Scenes/Main.unity @@ -1381,36 +1381,6 @@ MonoBehaviour: nameText: {fileID: 2138608183} levelText: {fileID: 1659165333} hpSlider: {fileID: 256439786} ---- !u!1 &646503366 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 646503367} - m_Layer: 0 - m_Name: Players - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &646503367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 646503366} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.3980055, y: -1.5289184, z: -1.8352623} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &666675497 GameObject: m_ObjectHideFlags: 0 @@ -2246,6 +2216,38 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 899019764} m_CullTransparentMesh: 0 +--- !u!1 &917018501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 917018502} + m_Layer: 0 + m_Name: Players + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &917018502 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917018501} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -18.788927, y: -0.1890161, z: -1.8805058} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5739334669602764029} + - {fileID: 8706353574450535620} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &944572716 GameObject: m_ObjectHideFlags: 0 @@ -2801,12 +2803,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3210528623230964c9f47e780b8cf78e, type: 3} m_Name: m_EditorClassIdentifier: - playerPrefab: {fileID: 7833863944867809331, guid: b775ee847150e754580ab2ba977a7cdf, - type: 3} - enemyPrefab: {fileID: 1581901224397169381, guid: 65bb19a3b94f2ec44bda95264bff11c3, - type: 3} + playerPrefab: {fileID: 5739334669602764027} + enemyPrefab: {fileID: 5496076527738379959} playerBattleStation: {fileID: 0} enemyBattleStation: {fileID: 0} + animator: {fileID: 2941739106146785020} dialogueText: {fileID: 1527616797} playerHUD: {fileID: 788420864} enemyHUD: {fileID: 530814537} @@ -4041,3 +4042,223 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2138608181} m_CullTransparentMesh: 0 +--- !u!95 &2941739106146785020 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739334669602764027} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3d13dd6ec386bac41b31d541996e7b2e, 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!114 &3598997452934569435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496076527738379959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2daded3814e565c4f901c5b1aaee1ecb, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: Mage + unitLevel: 2 + damage0: 0 + damage: 5 + damage2: 0 + damage3: 0 + maxHP: 40 + currentHP: 40 +--- !u!1 &5496076527738379959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8706353574450535620} + - component: {fileID: 3598997452934569435} + - component: {fileID: 5496076527738379960} + m_Layer: 0 + m_Name: Enemy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &5496076527738379960 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496076527738379959} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: b7ca7010b0f72d2408bb42416dbf9179, 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.28, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!212 &5739334669602764026 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739334669602764027} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: b2a056eebccf5e741ad242c3eea51dd7, 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.28, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5739334669602764027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5739334669602764029} + - component: {fileID: 5739334669602764028} + - component: {fileID: 5739334669602764026} + - component: {fileID: 2941739106146785020} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &5739334669602764028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739334669602764027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2daded3814e565c4f901c5b1aaee1ecb, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: Player + unitLevel: 999 + damage0: 0 + damage: 7 + damage2: 15 + damage3: 10 + maxHP: 30 + currentHP: 30 +--- !u!4 &5739334669602764029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5739334669602764027} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 14.948927, y: -2.710984, z: 1.8805058} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_Children: [] + m_Father: {fileID: 917018502} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &8706353574450535620 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496076527738379959} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 22.73, y: -2.6209838, z: 1.8805058} + m_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_Children: [] + m_Father: {fileID: 917018502} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0} diff --git a/RPG/Assets/Scripts/BattleSystem.cs b/RPG/Assets/Scripts/BattleSystem.cs index 3d3f5a5..27f7c43 100644 --- a/RPG/Assets/Scripts/BattleSystem.cs +++ b/RPG/Assets/Scripts/BattleSystem.cs @@ -20,7 +20,7 @@ public class BattleSystem : MonoBehaviour Unit playerUnit; Unit enemyUnit; - + public Animator animator; public Text dialogueText; @@ -37,10 +37,14 @@ public class BattleSystem : MonoBehaviour IEnumerator SetupBattle () { - GameObject playerGO = Instantiate(playerPrefab, playerBattleStation); + playerPrefab.SetActive(false); + GameObject playerGO = playerPrefab; + playerPrefab.SetActive(true); playerUnit = playerGO.GetComponent(); - GameObject enemyGO = Instantiate(enemyPrefab, enemyBattleStation); + enemyPrefab.SetActive(false); + GameObject enemyGO = enemyPrefab; + enemyPrefab.SetActive(true); enemyUnit = enemyGO.GetComponent(); dialogueText.text = "A hostile " + enemyUnit.unitName + " approaches..."; @@ -100,7 +104,7 @@ public class BattleSystem : MonoBehaviour { dialogueText.text = "Choose an action:"; - yield return new WaitForSeconds(.5f); + yield return new WaitForSeconds(1f); } @@ -110,7 +114,6 @@ public class BattleSystem : MonoBehaviour { if (state != BattleState.PLAYERTURN) return; - StartCoroutine(PlayerAttack()); } @@ -118,12 +121,19 @@ public class BattleSystem : MonoBehaviour IEnumerator PlayerAttack() { - //Damage enemy + + //Run to enemy + animator.SetBool("Run", true); + yield return new WaitForSeconds(2.0f); + + //Tackle Enemy + animator.SetBool("QuickAttack", true); bool isDead = enemyUnit.TakeDamage(playerUnit.damage); enemyHUD.SetHP(enemyUnit.currentHP); - //animate here - yield return new WaitForSeconds(1.0f); + yield return new WaitForSeconds(2.5f); dialogueText.text = "The quick attack is successful!"; + animator.SetBool("QuickAttack", false); + animator.SetBool("Run", false); yield return new WaitForSeconds(1f); //check if enemy dead