diff --git a/RPG/Assets/Animations/P_ChargedAttack.anim b/RPG/Assets/Animations/P_ChargedAttack.anim new file mode 100644 index 0000000..64314df --- /dev/null +++ b/RPG/Assets/Animations/P_ChargedAttack.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_ChargedAttack + 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: 6f257f98eeccdf04da26f28b83067ed5, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: ff95915caecde394899da9508aeeb725, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 1b7e132892ab34242b26c73875d7a53b, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: f4f982a2775964246ab7f79eff0b361e, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: eea732f3b0689e34c9b54536d0c088d1, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 578f0a60d33ea9646a8bbb3107b8b910, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 9d26784af33813f4d9a3071cee411915, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: 86bfc2ec8b796584c83a40752ba8278a, 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: 6f257f98eeccdf04da26f28b83067ed5, type: 3} + - {fileID: 21300000, guid: ff95915caecde394899da9508aeeb725, type: 3} + - {fileID: 21300000, guid: 1b7e132892ab34242b26c73875d7a53b, type: 3} + - {fileID: 21300000, guid: f4f982a2775964246ab7f79eff0b361e, type: 3} + - {fileID: 21300000, guid: eea732f3b0689e34c9b54536d0c088d1, type: 3} + - {fileID: 21300000, guid: 578f0a60d33ea9646a8bbb3107b8b910, type: 3} + - {fileID: 21300000, guid: 9d26784af33813f4d9a3071cee411915, type: 3} + - {fileID: 21300000, guid: 86bfc2ec8b796584c83a40752ba8278a, 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/RPG/Assets/Animations/P_ChargedAttack.anim.meta b/RPG/Assets/Animations/P_ChargedAttack.anim.meta new file mode 100644 index 0000000..df99a35 --- /dev/null +++ b/RPG/Assets/Animations/P_ChargedAttack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a188d6d5cd8680408d79ec7471de8a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Animations/P_Death.anim b/RPG/Assets/Animations/P_Death.anim index f677038..428f56e 100644 --- a/RPG/Assets/Animations/P_Death.anim +++ b/RPG/Assets/Animations/P_Death.anim @@ -21,29 +21,29 @@ AnimationClip: - 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: 94c4c4bf3918c714b92846f9a608ee1c, type: 3} + - time: 0.4 value: {fileID: 21300000, guid: 387d873e05d99914281de6d3cfd591ed, type: 3} - - time: 0.3 + - time: 0.6 value: {fileID: 21300000, guid: 32640277e12a060419b012dac05a85d4, type: 3} - - time: 0.4 + - time: 0.8 value: {fileID: 21300000, guid: dd4b655b19ccb5e459220ab813470ea8, type: 3} - - time: 0.5 + - time: 1 value: {fileID: 21300000, guid: 27393ad7c64528a4eaa98160aedb7660, type: 3} - - time: 0.6 + - time: 1.2 value: {fileID: 21300000, guid: 39e8a2d4fec56b34fbdd34d784c0beb4, type: 3} - - time: 0.7 + - time: 1.4 value: {fileID: 21300000, guid: 31a1e6e5cc6128e4ba6d7edfb3f34559, type: 3} - - time: 0.8 + - time: 1.6 value: {fileID: 21300000, guid: e5ae94d39d880684dbb3f78fbf904767, type: 3} - - time: 0.9 + - time: 1.8 value: {fileID: 21300000, guid: cda7697700d163142a83c484e201c382, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 10 + m_SampleRate: 5 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -73,7 +73,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 2 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/RPG/Assets/Animations/P_Heal.anim b/RPG/Assets/Animations/P_Heal.anim index e5e745d..4b58ed6 100644 --- a/RPG/Assets/Animations/P_Heal.anim +++ b/RPG/Assets/Animations/P_Heal.anim @@ -20,17 +20,29 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 21300000, guid: 567caf10e2be9404bb0aa1b75c05b443, type: 3} + value: {fileID: 21300000, guid: 952280097aba2cd43a9cbdcc9635bcd0, type: 3} - time: 0.125 - value: {fileID: 21300000, guid: c8cc0879bb27d0540b36c5fab9f3b5f0, type: 3} + value: {fileID: 21300000, guid: e094b29c9d0dd0e42bd4269f27165156, type: 3} - time: 0.25 - value: {fileID: 21300000, guid: a6333c2d5552f624a8c4dffc6ad58f07, type: 3} + value: {fileID: 21300000, guid: 7f02dded345580142a42fd118af7e061, type: 3} - time: 0.375 - value: {fileID: 21300000, guid: 3621e3be8a578434ea30d317882cfeff, type: 3} + value: {fileID: 21300000, guid: 6ccdc4b4cb4638b4987af623e8b4c685, type: 3} - time: 0.5 - value: {fileID: 21300000, guid: 37ac561fe5bef7741b00134b15e05bb7, type: 3} + value: {fileID: 21300000, guid: cd4f0bf03608c4e458444ead725ab935, type: 3} - time: 0.625 - value: {fileID: 21300000, guid: 31a5fe8343be3804b9f862613040cc69, type: 3} + value: {fileID: 21300000, guid: f11bd7a736092b9428fc1d5f75d84aa0, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 4c4215473cc817d4db6a2b6ec22fdd1f, type: 3} + - time: 0.875 + value: {fileID: 21300000, guid: 7de7b4dd1e3324c40bb847b9ce3edc13, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 87374196e3308e649b6ac1979766f932, type: 3} + - time: 1.125 + value: {fileID: 21300000, guid: 1927cee495a407746914eca5695cc03b, type: 3} + - time: 1.25 + value: {fileID: 21300000, guid: 396fd25bbdb95dd40976e088238bc669, type: 3} + - time: 1.375 + value: {fileID: 21300000, guid: 705e86037f878984d9e9dac77e4b1ae2, type: 3} attribute: m_Sprite path: classID: 212 @@ -50,18 +62,24 @@ AnimationClip: 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} + - {fileID: 21300000, guid: 952280097aba2cd43a9cbdcc9635bcd0, type: 3} + - {fileID: 21300000, guid: e094b29c9d0dd0e42bd4269f27165156, type: 3} + - {fileID: 21300000, guid: 7f02dded345580142a42fd118af7e061, type: 3} + - {fileID: 21300000, guid: 6ccdc4b4cb4638b4987af623e8b4c685, type: 3} + - {fileID: 21300000, guid: cd4f0bf03608c4e458444ead725ab935, type: 3} + - {fileID: 21300000, guid: f11bd7a736092b9428fc1d5f75d84aa0, type: 3} + - {fileID: 21300000, guid: 4c4215473cc817d4db6a2b6ec22fdd1f, type: 3} + - {fileID: 21300000, guid: 7de7b4dd1e3324c40bb847b9ce3edc13, type: 3} + - {fileID: 21300000, guid: 87374196e3308e649b6ac1979766f932, type: 3} + - {fileID: 21300000, guid: 1927cee495a407746914eca5695cc03b, type: 3} + - {fileID: 21300000, guid: 396fd25bbdb95dd40976e088238bc669, type: 3} + - {fileID: 21300000, guid: 705e86037f878984d9e9dac77e4b1ae2, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.75 + m_StopTime: 1.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/RPG/Assets/Animations/P_Hurt.anim b/RPG/Assets/Animations/P_Hurt.anim index 0b1a92e..fbad3ec 100644 --- a/RPG/Assets/Animations/P_Hurt.anim +++ b/RPG/Assets/Animations/P_Hurt.anim @@ -60,7 +60,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/RPG/Assets/Animations/P_QuickAttack.anim b/RPG/Assets/Animations/P_QuickAttack.anim index f930cc1..21caa9f 100644 --- a/RPG/Assets/Animations/P_QuickAttack.anim +++ b/RPG/Assets/Animations/P_QuickAttack.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: P_Ember + m_Name: P_QuickAttack serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/RPG/Assets/Animations/P_Tackle.anim b/RPG/Assets/Animations/P_Tackle.anim index eaf2519..d535507 100644 --- a/RPG/Assets/Animations/P_Tackle.anim +++ b/RPG/Assets/Animations/P_Tackle.anim @@ -20,34 +20,20 @@ AnimationClip: 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 + - time: 0.2 value: {fileID: 21300000, guid: 9abb8f1c6e3416149959f6d8f2428b9b, type: 3} - - time: 0.75 + - time: 0.4 value: {fileID: 21300000, guid: 9ca64824d1d625d4cbd5d5e1b5adaa61, type: 3} - - time: 0.8333333 + - time: 0.6 value: {fileID: 21300000, guid: 52e8dc53ff2bb9b4cb891378d61aae57, type: 3} - - time: 0.9166667 + - time: 0.8 value: {fileID: 21300000, guid: ad4c73a6e8ad27f44bba0489b35de61d, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 12 + m_SampleRate: 5 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -62,13 +48,6 @@ AnimationClip: 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} diff --git a/RPG/Assets/Animations/Player.controller b/RPG/Assets/Animations/Player.controller index d021a7f..6a22fee 100644 --- a/RPG/Assets/Animations/Player.controller +++ b/RPG/Assets/Animations/Player.controller @@ -9,13 +9,37 @@ AnimatorController: m_Name: Player serializedVersion: 5 m_AnimatorParameters: - - m_Name: Run + - m_Name: QuickAttack m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: QuickAttack + - m_Name: Tackle + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Heal + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: FurySwipe + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Hurt + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Dead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -34,6 +58,178 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1101069915170105108 +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: Dead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102202413945558032} + 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 &1101098701590835234 +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: Tackle + 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.5 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101368318035741992 +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: FurySwipe + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102417892329311454} + 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 &1101406332821417212 +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: Heal + 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.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101525034031242046 +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: Heal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102761255378921292} + 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 &1101626211615616918 +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: Hurt + 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.5 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101633259583274046 +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: 1102617407213585026} + 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 &1101645478638438140 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -84,6 +280,56 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1101784573266790000 +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: FurySwipe + 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.625 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101890966564657776 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Hurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102270305872944342} + 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 @@ -93,7 +339,7 @@ AnimatorStateTransition: m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102124773476174550} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -106,6 +352,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1101974100016215274 +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: Tackle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102782312050714876} + 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!1102 &1102202413945558032 AnimatorState: serializedVersion: 5 @@ -142,7 +413,8 @@ AnimatorState: m_Name: P_Hurt m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 1101626211615616918} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -158,6 +430,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102417892329311454 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: P_ChargedAttack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101784573266790000} + 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: 8a188d6d5cd8680408d79ec7471de8a0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102571751961851502 AnimatorState: serializedVersion: 5 @@ -165,7 +464,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: P_Ember + m_Name: P_QuickAttack m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -185,6 +484,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102617407213585026 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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 &1102761255378921292 AnimatorState: serializedVersion: 5 @@ -195,7 +520,8 @@ AnimatorState: m_Name: P_Heal m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 1101406332821417212} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -223,6 +549,11 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 1101645478638438140} + - {fileID: 1101974100016215274} + - {fileID: 1101525034031242046} + - {fileID: 1101368318035741992} + - {fileID: 1101890966564657776} + - {fileID: 1101069915170105108} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -238,6 +569,33 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102782312050714876 +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: + - {fileID: 1101098701590835234} + 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!1107 &1107896377136882442 AnimatorStateMachine: serializedVersion: 5 @@ -249,26 +607,32 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102779875948788416} - m_Position: {x: -12, y: 144, z: 0} + m_Position: {x: -660, y: -120, z: 0} - serializedVersion: 1 m_State: {fileID: 1102761255378921292} - m_Position: {x: 384, y: 168, z: 0} + m_Position: {x: -444, y: -252, z: 0} - serializedVersion: 1 m_State: {fileID: 1102571751961851502} - m_Position: {x: 0, y: 36, z: 0} + m_Position: {x: -648, y: -228, z: 0} - serializedVersion: 1 m_State: {fileID: 1102202413945558032} - m_Position: {x: 456, y: 324, z: 0} + m_Position: {x: -564, y: 0, z: 0} - serializedVersion: 1 m_State: {fileID: 1102270305872944342} - m_Position: {x: 276, y: 276, z: 0} + m_Position: {x: -792, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102782312050714876} + m_Position: {x: -888, y: -240, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102417892329311454} + m_Position: {x: -300, y: -168, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: -156, y: -84, z: 0} - m_EntryPosition: {x: -192, y: 132, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_AnyStatePosition: {x: -804, y: -348, z: 0} + m_EntryPosition: {x: -840, y: -132, z: 0} + m_ExitPosition: {x: -768, y: 156, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1102779875948788416} diff --git a/RPG/Assets/EnemyAnimations.meta b/RPG/Assets/EnemyAnimations.meta new file mode 100644 index 0000000..2c68c65 --- /dev/null +++ b/RPG/Assets/EnemyAnimations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f5b230143caa464cbdfd0148f8790d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/EnemyAnimations/E_Attack.anim b/RPG/Assets/EnemyAnimations/E_Attack.anim new file mode 100644 index 0000000..940ba6d --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Attack.anim @@ -0,0 +1,92 @@ +%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: E_Attack + 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: 380c4645b62434a42811c746e9b4c68b, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: c00e6067d1be3d240b155f977e3c6060, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 14dec79343fa8984a92d17249cc2d457, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 27e3f298e1b9bbf41aee56a2c27022e0, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 0ab5da673f5bfed4196fd0a34e981526, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 8cd6e415ce2eedf4bbc56cb8b248dcd4, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, 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: 380c4645b62434a42811c746e9b4c68b, type: 3} + - {fileID: 21300000, guid: c00e6067d1be3d240b155f977e3c6060, type: 3} + - {fileID: 21300000, guid: 14dec79343fa8984a92d17249cc2d457, type: 3} + - {fileID: 21300000, guid: 27e3f298e1b9bbf41aee56a2c27022e0, type: 3} + - {fileID: 21300000, guid: 0ab5da673f5bfed4196fd0a34e981526, type: 3} + - {fileID: 21300000, guid: 8cd6e415ce2eedf4bbc56cb8b248dcd4, type: 3} + - {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, type: 3} + - {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, type: 3} + - {fileID: 21300000, guid: e955dad4cb66d4642b0a3b52ca63ef29, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.90000004 + 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/RPG/Assets/EnemyAnimations/E_Attack.anim.meta b/RPG/Assets/EnemyAnimations/E_Attack.anim.meta new file mode 100644 index 0000000..77c346c --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Attack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 48862c1bce961ae4bb2b92b3265733c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/EnemyAnimations/E_Dead.anim b/RPG/Assets/EnemyAnimations/E_Dead.anim new file mode 100644 index 0000000..5f00932 --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Dead.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: E_Dead + 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: 9e18e5221af9171449ec6afe1a46b567, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 36ff0d811676fac40bd845794b43fcf4, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 1bb859bbde4e23540ab21d9b1cad26ae, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 3828efd04b777d54b9b6d1995d889541, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 900ce75cad3d1694c8447363c317eb6d, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 67f215a9896af984dabdb1031d29690c, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 35febe75271a7db489d578f768733ba9, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: ed561b2f686ba074297b3da15c785782, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: 95893304d5727ad4a8af6ade2b99587d, type: 3} + - time: 0.9 + value: {fileID: 21300000, guid: 98bcb048327979342acded67551a0ce8, 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: 9e18e5221af9171449ec6afe1a46b567, type: 3} + - {fileID: 21300000, guid: 36ff0d811676fac40bd845794b43fcf4, type: 3} + - {fileID: 21300000, guid: 1bb859bbde4e23540ab21d9b1cad26ae, type: 3} + - {fileID: 21300000, guid: 3828efd04b777d54b9b6d1995d889541, type: 3} + - {fileID: 21300000, guid: 900ce75cad3d1694c8447363c317eb6d, type: 3} + - {fileID: 21300000, guid: 67f215a9896af984dabdb1031d29690c, type: 3} + - {fileID: 21300000, guid: 35febe75271a7db489d578f768733ba9, type: 3} + - {fileID: 21300000, guid: ed561b2f686ba074297b3da15c785782, type: 3} + - {fileID: 21300000, guid: 95893304d5727ad4a8af6ade2b99587d, type: 3} + - {fileID: 21300000, guid: 98bcb048327979342acded67551a0ce8, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/RPG/Assets/EnemyAnimations/E_Dead.anim.meta b/RPG/Assets/EnemyAnimations/E_Dead.anim.meta new file mode 100644 index 0000000..2454040 --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Dead.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1580d0b16bf16d24682f59ee212d5306 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/EnemyAnimations/E_Hurt.anim b/RPG/Assets/EnemyAnimations/E_Hurt.anim new file mode 100644 index 0000000..6403c84 --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_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: E_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: 9d3add0a84d9c26458e05262564786d1, type: 3} + - time: 0.125 + value: {fileID: 21300000, guid: 078cba988c980cb42be95469e2b1ad18, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 44c345a2ab62ee6408ff9b966ebcb559, type: 3} + - time: 0.375 + value: {fileID: 21300000, guid: a1ad1267f86e06a4da1092fd0a712c77, 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: 9d3add0a84d9c26458e05262564786d1, type: 3} + - {fileID: 21300000, guid: 078cba988c980cb42be95469e2b1ad18, type: 3} + - {fileID: 21300000, guid: 44c345a2ab62ee6408ff9b966ebcb559, type: 3} + - {fileID: 21300000, guid: a1ad1267f86e06a4da1092fd0a712c77, 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: 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/RPG/Assets/EnemyAnimations/E_Hurt.anim.meta b/RPG/Assets/EnemyAnimations/E_Hurt.anim.meta new file mode 100644 index 0000000..d214bc9 --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Hurt.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c024eb4186e2a054b90e920ebba9956c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/EnemyAnimations/E_Idle.anim b/RPG/Assets/EnemyAnimations/E_Idle.anim new file mode 100644 index 0000000..372fe9e --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Idle.anim @@ -0,0 +1,107 @@ +%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: E_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: 44a98abbddf46ed42b2511bd2999f2c5, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 7a6cc77bd57124e479eeff5dd06ac364, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 60e379a16d700d34a95bc8d181be04a1, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: f9ae10cfb9e662f419ce16ea874153da, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: d8698d894e7e01946883221129075060, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: e5e9fb521fe92b74cb9c0e5eb10c240e, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 111140632e99f5e4aac54caecc5c931b, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: def15f5a6fd78bd459cd86f8d7125db6, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 954d180dc32db2740bdf8020f54d4b92, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 617fc3f7fe112b34fb6ea31bf0d8d3c6, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: 050c4f8af0e9eee4ab92eed780f4c594, type: 3} + - time: 0.9166667 + value: {fileID: 21300000, guid: 18ce8293c4f3c7b498cec1aaf24737ed, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 7a69d2a0d01d3984aaa5d6e9796cf185, type: 3} + - time: 1.0833334 + value: {fileID: 21300000, guid: a0c2cc9da3b583843b1abee0fed76eb3, 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: 44a98abbddf46ed42b2511bd2999f2c5, type: 3} + - {fileID: 21300000, guid: 7a6cc77bd57124e479eeff5dd06ac364, type: 3} + - {fileID: 21300000, guid: 60e379a16d700d34a95bc8d181be04a1, type: 3} + - {fileID: 21300000, guid: f9ae10cfb9e662f419ce16ea874153da, type: 3} + - {fileID: 21300000, guid: d8698d894e7e01946883221129075060, type: 3} + - {fileID: 21300000, guid: e5e9fb521fe92b74cb9c0e5eb10c240e, type: 3} + - {fileID: 21300000, guid: 111140632e99f5e4aac54caecc5c931b, type: 3} + - {fileID: 21300000, guid: def15f5a6fd78bd459cd86f8d7125db6, type: 3} + - {fileID: 21300000, guid: 954d180dc32db2740bdf8020f54d4b92, type: 3} + - {fileID: 21300000, guid: 617fc3f7fe112b34fb6ea31bf0d8d3c6, type: 3} + - {fileID: 21300000, guid: 050c4f8af0e9eee4ab92eed780f4c594, type: 3} + - {fileID: 21300000, guid: 18ce8293c4f3c7b498cec1aaf24737ed, type: 3} + - {fileID: 21300000, guid: 7a69d2a0d01d3984aaa5d6e9796cf185, type: 3} + - {fileID: 21300000, guid: a0c2cc9da3b583843b1abee0fed76eb3, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.1666667 + 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/EnemyAnimations/E_Idle.anim.meta b/RPG/Assets/EnemyAnimations/E_Idle.anim.meta new file mode 100644 index 0000000..06db6af --- /dev/null +++ b/RPG/Assets/EnemyAnimations/E_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 06c3ffc876e6b5a4e9b55dc00f0865a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/EnemyAnimations/Enemy.controller b/RPG/Assets/EnemyAnimations/Enemy.controller new file mode 100644 index 0000000..3e0fe5e --- /dev/null +++ b/RPG/Assets/EnemyAnimations/Enemy.controller @@ -0,0 +1,307 @@ +%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: Enemy + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: EDead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: EHurt + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: EAttack + 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: 1107196688199509544} + 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 &1101328346348381784 +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: EHurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102765959320503236} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101584694540992774 +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: EDead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102180150596978962} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101744317989511542 +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: EAttack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102765959320503236} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.64285725 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101807688134903310 +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: EHurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102410806809194256} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101851545024304438 +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: EAttack + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102507741475534842} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102180150596978962 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: E_Dead + 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: 1580d0b16bf16d24682f59ee212d5306, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102410806809194256 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: E_Hurt + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101328346348381784} + 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: c024eb4186e2a054b90e920ebba9956c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102507741475534842 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: E_Attack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101744317989511542} + 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: 48862c1bce961ae4bb2b92b3265733c5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102765959320503236 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: E_Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101807688134903310} + - {fileID: 1101851545024304438} + - {fileID: 1101584694540992774} + 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: 06c3ffc876e6b5a4e9b55dc00f0865a7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107196688199509544 +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: 1102410806809194256} + m_Position: {x: 120, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102765959320503236} + m_Position: {x: 120, y: 84, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102180150596978962} + m_Position: {x: 372, y: 84, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102507741475534842} + m_Position: {x: 132, y: 192, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -36, y: -60, z: 0} + m_EntryPosition: {x: -36, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102765959320503236} diff --git a/RPG/Assets/EnemyAnimations/Enemy.controller.meta b/RPG/Assets/EnemyAnimations/Enemy.controller.meta new file mode 100644 index 0000000..dea895e --- /dev/null +++ b/RPG/Assets/EnemyAnimations/Enemy.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e1b70a346197e942b632950ff108cb9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RPG/Assets/Scenes/Main.unity b/RPG/Assets/Scenes/Main.unity index 92d8877..f6bdbf0 100644 --- a/RPG/Assets/Scenes/Main.unity +++ b/RPG/Assets/Scenes/Main.unity @@ -2809,6 +2809,7 @@ MonoBehaviour: enemyBattleStation: {fileID: 0} speed: 5 animator: {fileID: 2941739106146785020} + Eanimator: {fileID: 5496076527738379961} dialogueText: {fileID: 1527616797} playerHUD: {fileID: 788420864} enemyHUD: {fileID: 530814537} @@ -3754,7 +3755,9 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Ember + m_Text: 'Fury + + Swipes' --- !u!222 &1958336210 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4077,11 +4080,11 @@ MonoBehaviour: unitName: Mage unitLevel: 2 damage0: 0 - damage: 5 + damage: 12 damage2: 0 damage3: 0 - maxHP: 40 - currentHP: 40 + maxHP: 35 + currentHP: 35 --- !u!1 &5496076527738379959 GameObject: m_ObjectHideFlags: 0 @@ -4093,6 +4096,7 @@ GameObject: - component: {fileID: 8706353574450535620} - component: {fileID: 3598997452934569435} - component: {fileID: 5496076527738379960} + - component: {fileID: 5496076527738379961} m_Layer: 0 m_Name: Enemy m_TagString: Untagged @@ -4148,6 +4152,25 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!95 &5496076527738379961 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496076527738379959} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 8e1b70a346197e942b632950ff108cb9, 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 &5739334669602764026 SpriteRenderer: m_ObjectHideFlags: 0 @@ -4208,8 +4231,6 @@ GameObject: - component: {fileID: 5739334669602764028} - component: {fileID: 5739334669602764026} - component: {fileID: 2941739106146785020} - - component: {fileID: 5739334669602764031} - - component: {fileID: 5739334669602764030} m_Layer: 0 m_Name: Player m_TagString: Player @@ -4251,43 +4272,6 @@ Transform: m_Father: {fileID: 917018502} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!70 &5739334669602764030 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5739334669602764027} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.1963665, y: -0.16556369} - m_Size: {x: 0.5176369, y: 0.6254458} - m_Direction: 0 ---- !u!50 &5739334669602764031 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5739334669602764027} - m_BodyType: 0 - m_Simulated: 0 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 --- !u!4 &8706353574450535620 Transform: m_ObjectHideFlags: 0 @@ -4295,7 +4279,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5496076527738379959} - m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalRotation: {x: -0, y: -1, z: 0, w: 0} m_LocalPosition: {x: 20.25, y: -2.6, z: 1.8805058} m_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] diff --git a/RPG/Assets/Scripts/BattleSystem.cs b/RPG/Assets/Scripts/BattleSystem.cs index 8de381b..1592ac4 100644 --- a/RPG/Assets/Scripts/BattleSystem.cs +++ b/RPG/Assets/Scripts/BattleSystem.cs @@ -23,6 +23,7 @@ public class BattleSystem : MonoBehaviour public float speed = 5f; public Animator animator; + public Animator Eanimator; public Text dialogueText; @@ -66,20 +67,32 @@ public class BattleSystem : MonoBehaviour { dialogueText.text = enemyUnit.unitName + "'s turn"; yield return new WaitForSeconds(1.5f); - float i = Random.Range(0f, 10f); if (i <= 8) { dialogueText.text = enemyUnit.unitName + " attacks!"; //Animation wait time - yield return new WaitForSeconds(1.5f); + yield return new WaitForSeconds(.5f); + enemyPrefab.transform.Translate(speed * 1, 0, 0); + Eanimator.SetBool("EAttack", true); bool isDead = playerUnit.TakeDamage(enemyUnit.damage); playerHUD.SetHP(playerUnit.currentHP); - yield return new WaitForSeconds(.5f); + animator.SetBool("Hurt", true); + yield return new WaitForSeconds(1.2f); + animator.SetBool("Hurt", false); + Eanimator.SetBool("EAttack", false); + enemyPrefab.transform.Translate(-speed, 0, 0); + + + + if (isDead) { + animator.SetBool("Dead", true); + yield return new WaitForSeconds(2.1f); state = BattleState.LOST; + EndBattle(); } else { @@ -87,6 +100,8 @@ public class BattleSystem : MonoBehaviour StartCoroutine(PlayerTurn()); } } + + //Healing else { dialogueText.text = enemyUnit.unitName + " heals!"; @@ -134,8 +149,10 @@ public class BattleSystem : MonoBehaviour bool isDead = enemyUnit.TakeDamage(playerUnit.damage); dialogueText.text = "The quick attack is successful!"; enemyHUD.SetHP(enemyUnit.currentHP); - yield return new WaitForSeconds(1f); - + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.51f); + Eanimator.SetBool("EHurt", false); + //return animator.SetBool("QuickAttack", false); playerPrefab.transform.Translate(-speed, 0, 0); @@ -144,6 +161,9 @@ public class BattleSystem : MonoBehaviour //check if enemy dead if (isDead) { + Eanimator.SetBool("EDead", true); + yield return new WaitForSeconds(1.5f); + state = BattleState.WON; EndBattle(); } @@ -170,8 +190,17 @@ public class BattleSystem : MonoBehaviour playerPrefab.transform.Translate(speed * 1, 0, 0); dialogueText.text = "Tackle!"; //swing + + animator.SetBool("Tackle", true); + + + yield return new WaitForSeconds(1.5f); + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.51f); + + Eanimator.SetBool("EHurt", false); animator.SetBool("Tackle", false); //Stop Swinging and reuturn playerPrefab.transform.Translate(-speed, 0, 0); @@ -180,8 +209,8 @@ public class BattleSystem : MonoBehaviour //see if hit or miss - float i = Random.Range(0f, 10f); - if (i <= 7) + float i = Random.Range(0, 10); + if (i <= 8) { //Damage enemy @@ -193,6 +222,8 @@ public class BattleSystem : MonoBehaviour //check if enemy dead if (isDead) { + Eanimator.SetBool("EDead", true); + yield return new WaitForSeconds(1.5f); state = BattleState.WON; EndBattle(); } @@ -208,12 +239,14 @@ public class BattleSystem : MonoBehaviour { bool isDead = enemyUnit.TakeDamage(playerUnit.damage0); yield return new WaitForSeconds(.10f); - dialogueText.text = "The Tackle missed"; + dialogueText.text = "The Tackle did no damage"; yield return new WaitForSeconds(1f); //check if enemy dead if (isDead) { + Eanimator.SetBool("EDead", true); + yield return new WaitForSeconds(1.5f); state = BattleState.WON; EndBattle(); } @@ -236,19 +269,64 @@ public class BattleSystem : MonoBehaviour StartCoroutine(PlayerAttack3()); } - IEnumerator PlayerAttack3() + IEnumerator PlayerAttack3() //Fury Swipe { //Damage enemy - bool isDead = enemyUnit.TakeDamage(playerUnit.damage3); - enemyHUD.SetHP(enemyUnit.currentHP); + //Run to Enemy + playerPrefab.transform.Translate(speed * 1, 0, 0); + dialogueText.text = "Fury Swipes!"; + yield return new WaitForSeconds(.50f); + animator.SetBool("FurySwipe", true); + //animate here - yield return new WaitForSeconds(1.0f); - dialogueText.text = "The long range attack is successful!"; + + //1 + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.50f); + Eanimator.SetBool("EHurt", false); + + yield return new WaitForSeconds(.50f); + + //2 + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.50f); + Eanimator.SetBool("EHurt", false); + + yield return new WaitForSeconds(.50f); + + //3 + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.50f); + Eanimator.SetBool("EHurt", false); + + yield return new WaitForSeconds(.50f); + + //4 + Eanimator.SetBool("EHurt", true); + yield return new WaitForSeconds(.50f); + Eanimator.SetBool("EHurt", false); + + + + + + yield return new WaitForSeconds(1f); + + + dialogueText.text = "The attack was successful!"; + bool isDead = enemyUnit.TakeDamage(Random.Range(5, 15)); + enemyHUD.SetHP(enemyUnit.currentHP); + animator.SetBool("FurySwipe", false); + playerPrefab.transform.Translate(-speed, 0, 0); + + yield return new WaitForSeconds(1f); //check if enemy dead if (isDead) { + Eanimator.SetBool("EDead", true); + yield return new WaitForSeconds(1.5f); state = BattleState.WON; EndBattle(); } @@ -268,13 +346,15 @@ public class BattleSystem : MonoBehaviour StartCoroutine(PlayerHeal()); } - IEnumerator PlayerHeal() + IEnumerator PlayerHeal() //Heal { yield return new WaitForSeconds(.5f); - playerUnit.Heal(5); + playerUnit.Heal(10); playerHUD.SetHP(playerUnit.currentHP); - yield return new WaitForSeconds(.01f); + animator.SetBool("Heal", true); + yield return new WaitForSeconds(1.75f); dialogueText.text = "You feel renewed strength!"; + animator.SetBool("Heal", false); state = BattleState.ENEMYTURN; yield return new WaitForSeconds(1f); StartCoroutine(EnemyTurn());