From e0f2a00703d37040cd7397ccbaf423af341fd4a4 Mon Sep 17 00:00:00 2001 From: Adam P Skawinski Date: Thu, 5 Mar 2020 14:34:15 -0500 Subject: [PATCH] Battle System All battle systems and moves are done, music in menus is done (not control) just need to add animations --- .../Player_Idle.anim} | 36 +-- .../Idle => Animations}/Player_Idle.anim.meta | 2 +- RPG/Assets/Prefabs/Enemy.prefab | 26 ++- RPG/Assets/Prefabs/Player.prefab | 181 +++++++++++++++ .../Player.prefab.meta} | 5 +- RPG/Assets/Scenes/Main.unity | 64 +++++- RPG/Assets/Scripts/BattleSystem.cs | 212 +++++++++++++----- RPG/Assets/Scripts/Unit.cs | 2 + .../Enemies/PNG/Knight/Idle/Player.controller | 158 ++----------- .../PNG/Knight/Idle/Player_Attack.anim | 80 ------- .../PNG/Knight/Idle/Player_Attack.anim.meta | 8 - .../PNG/Knight/Idle/Player_AttackSpecial.anim | 89 -------- .../Idle/Player_AttackSpecial.anim.meta | 8 - .../Enemies/PNG/Knight/Idle/Player_Death.anim | 95 -------- .../PNG/Knight/Idle/Player_HighJump.anim | 101 --------- .../PNG/Knight/Idle/Player_HighJump.anim.meta | 8 - .../PNG/Knight/Idle/Player_Hurt.anim.meta | 8 - .../Enemies/PNG/Knight/Idle/Player_Idle.anim | 101 --------- .../Enemies/PNG/Knight/Idle/Player_Jump.anim | 86 ------- .../PNG/Knight/Idle/Player_Jump.anim.meta | 8 - .../Enemies/PNG/Knight/Idle/Player_Run.anim | 89 -------- .../PNG/Knight/Idle/Player_Run.anim.meta | 8 - .../PNG/Knight/Idle/Player_Run_Attack.anim | 89 -------- .../Knight/Idle/Player_Run_Attack.anim.meta | 8 - 24 files changed, 452 insertions(+), 1020 deletions(-) rename RPG/Assets/{_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim => Animations/Player_Idle.anim} (52%) rename RPG/Assets/{_Sprites & Stuff/Enemies/PNG/Knight/Idle => Animations}/Player_Idle.anim.meta (79%) create mode 100644 RPG/Assets/Prefabs/Player.prefab rename RPG/Assets/{_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim.meta => Prefabs/Player.prefab.meta} (52%) delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim.meta delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim delete mode 100644 RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim.meta diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim b/RPG/Assets/Animations/Player_Idle.anim similarity index 52% rename from RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim rename to RPG/Assets/Animations/Player_Idle.anim index 68a13b9..b68cc8a 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim +++ b/RPG/Assets/Animations/Player_Idle.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Player_Hurt + m_Name: Player_Idle serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -17,45 +17,21 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 21300000, guid: 97f2637821df9f24ca2d64c801542f75, type: 3} - - time: 0.14285715 - value: {fileID: 21300000, guid: c78797b63e9dd654d9a9dd13d4d2121c, type: 3} - - time: 0.2857143 - value: {fileID: 21300000, guid: 804435a74fd83ff4480ebc3beaa42acf, type: 3} - - time: 0.42857143 - value: {fileID: 21300000, guid: 80c2460bca2c65c4cafa28f1c3a31a97, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - m_SampleRate: 7 + m_PPtrCurves: [] + m_SampleRate: 60 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} + genericBindings: [] + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5714286 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim.meta b/RPG/Assets/Animations/Player_Idle.anim.meta similarity index 79% rename from RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim.meta rename to RPG/Assets/Animations/Player_Idle.anim.meta index cdfacc1..5e43980 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim.meta +++ b/RPG/Assets/Animations/Player_Idle.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 848004cc1e67a534d88c444d14bfc548 +guid: 72e75614c5c0ee84fa6ca251b0446d95 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/RPG/Assets/Prefabs/Enemy.prefab b/RPG/Assets/Prefabs/Enemy.prefab index 0860e01..88bb712 100644 --- a/RPG/Assets/Prefabs/Enemy.prefab +++ b/RPG/Assets/Prefabs/Enemy.prefab @@ -89,6 +89,7 @@ GameObject: m_Component: - component: {fileID: 2405723475983736982} - component: {fileID: 7513063758604067209} + - component: {fileID: 5277848429525194744} m_Layer: 0 m_Name: Enemy m_TagString: Untagged @@ -126,5 +127,26 @@ MonoBehaviour: unitName: Mage unitLevel: 2 damage: 5 - maxHP: 30 - currentHP: 30 + 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 new file mode 100644 index 0000000..dc5a094 --- /dev/null +++ b/RPG/Assets/Prefabs/Player.prefab @@ -0,0 +1,181 @@ +%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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7833863944867809333} + - component: {fileID: 7833863944867809332} + - component: {fileID: 7833863944867809330} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7833863944867809333 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 2.5, y: 2.5, z: 1} + m_Children: + - {fileID: 8368252609744019118} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7833863944867809332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7833863944867809331} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2daded3814e565c4f901c5b1aaee1ecb, type: 3} + m_Name: + m_EditorClassIdentifier: + unitName: Player + unitLevel: 999 + damage: 7 + damage2: 15 + damage3: 10 + maxHP: 30 + currentHP: 30 +--- !u!212 &7833863944867809330 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7833863944867809331} + 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: 0} + 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim.meta b/RPG/Assets/Prefabs/Player.prefab.meta similarity index 52% rename from RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim.meta rename to RPG/Assets/Prefabs/Player.prefab.meta index 5e53f7b..d222701 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim.meta +++ b/RPG/Assets/Prefabs/Player.prefab.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 1bc7e773484ccaf42a7f2f810fa6cad8 -NativeFormatImporter: +guid: b775ee847150e754580ab2ba977a7cdf +PrefabImporter: externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/RPG/Assets/Scenes/Main.unity b/RPG/Assets/Scenes/Main.unity index bc510ae..02e77df 100644 --- a/RPG/Assets/Scenes/Main.unity +++ b/RPG/Assets/Scenes/Main.unity @@ -190,7 +190,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 14980342} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1201609850} + m_MethodName: OnAttack3Button + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &14980342 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1370,6 +1381,36 @@ 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 @@ -1525,7 +1566,18 @@ MonoBehaviour: m_TargetGraphic: {fileID: 723733538} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1201609850} + m_MethodName: OnAttack2Button + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &723733538 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2459,7 +2511,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Quick Attack + m_Text: Tackle --- !u!222 &974332934 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2749,14 +2801,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3210528623230964c9f47e780b8cf78e, type: 3} m_Name: m_EditorClassIdentifier: - playerPrefab: {fileID: 1991335222145836323, guid: b775ee847150e754580ab2ba977a7cdf, + playerPrefab: {fileID: 7833863944867809331, guid: b775ee847150e754580ab2ba977a7cdf, type: 3} enemyPrefab: {fileID: 1581901224397169381, guid: 65bb19a3b94f2ec44bda95264bff11c3, type: 3} playerBattleStation: {fileID: 0} enemyBattleStation: {fileID: 0} - animator: {fileID: 3599188608928752076, guid: b775ee847150e754580ab2ba977a7cdf, - type: 3} dialogueText: {fileID: 1527616797} playerHUD: {fileID: 788420864} enemyHUD: {fileID: 530814537} @@ -3702,7 +3752,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Quick Attack + m_Text: Ember --- !u!222 &1958336210 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/RPG/Assets/Scripts/BattleSystem.cs b/RPG/Assets/Scripts/BattleSystem.cs index bd777ae..2be0a7a 100644 --- a/RPG/Assets/Scripts/BattleSystem.cs +++ b/RPG/Assets/Scripts/BattleSystem.cs @@ -18,7 +18,6 @@ public class BattleSystem : MonoBehaviour Unit playerUnit; Unit enemyUnit; - public Animator animator; public Text dialogueText; @@ -53,19 +52,77 @@ public class BattleSystem : MonoBehaviour StartCoroutine(PlayerTurn()); } + + + IEnumerator EnemyTurn() + { + 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); + bool isDead = playerUnit.TakeDamage(enemyUnit.damage); + playerHUD.SetHP(playerUnit.currentHP); + yield return new WaitForSeconds(.5f); + + if (isDead) + { + state = BattleState.LOST; + } + else + { + state = BattleState.PLAYERTURN; + StartCoroutine(PlayerTurn()); + } + } + else + { + dialogueText.text = enemyUnit.unitName + " heals!"; + enemyUnit.Heal(10); + enemyHUD.SetHP(enemyUnit.currentHP); + yield return new WaitForSeconds(1.5f); + + state = BattleState.PLAYERTURN; + StartCoroutine(PlayerTurn()); + } + } + + + + + IEnumerator PlayerTurn() + { + + dialogueText.text = "Choose an action:"; + yield return new WaitForSeconds(.5f); + } + + + + //Player Options + public void OnAttackButton() + { + if (state != BattleState.PLAYERTURN) + return; + + StartCoroutine(PlayerAttack()); + } + + + IEnumerator PlayerAttack() { //Damage enemy bool isDead = enemyUnit.TakeDamage(playerUnit.damage); enemyHUD.SetHP(enemyUnit.currentHP); - animator.SetBool("Attacking", true); + //animate here yield return new WaitForSeconds(1.0f); - dialogueText.text = "The attack is successful!"; - animator.SetBool("Attacking", false); - - state = BattleState.ENEMYTURN; - - yield return new WaitForSeconds(2f); + dialogueText.text = "The quick attack is successful!"; + yield return new WaitForSeconds(1f); //check if enemy dead if (isDead) @@ -79,59 +136,108 @@ public class BattleSystem : MonoBehaviour state = BattleState.ENEMYTURN; StartCoroutine(EnemyTurn()); } - + } - IEnumerator EnemyTurn() + public void OnAttack2Button() { - dialogueText.text = enemyUnit.unitName + "'s turn"; - yield return new WaitForSeconds(1.5f); + if (state != BattleState.PLAYERTURN) + return; + + StartCoroutine(PlayerAttack2()); + } + + IEnumerator PlayerAttack2() + { + float i = Random.Range(0f, 10f); + if (i <= 7) + { + //Damage enemy + bool isDead = enemyUnit.TakeDamage(playerUnit.damage2); + enemyHUD.SetHP(enemyUnit.currentHP); + //animate here + yield return new WaitForSeconds(1.0f); + dialogueText.text = "The Tackle is successful!"; + yield return new WaitForSeconds(1f); + + //check if enemy dead + if (isDead) + { + state = BattleState.WON; + EndBattle(); + } + + else + { + state = BattleState.ENEMYTURN; + StartCoroutine(EnemyTurn()); + } + } - dialogueText.text = enemyUnit.unitName + " attacks!"; + else + { + bool isDead = enemyUnit.TakeDamage(playerUnit.damage0); + yield return new WaitForSeconds(1.0f); + dialogueText.text = "The Tackle missed"; + yield return new WaitForSeconds(1f); + + //check if enemy dead + if (isDead) + { + state = BattleState.WON; + EndBattle(); + } + + else + { + state = BattleState.ENEMYTURN; + StartCoroutine(EnemyTurn()); + } + } - yield return new WaitForSeconds(2f); - bool isDead = playerUnit.TakeDamage(enemyUnit.damage); - playerHUD.SetHP(playerUnit.currentHP); + } - yield return new WaitForSeconds(.5f); + public void OnAttack3Button() + { + if (state != BattleState.PLAYERTURN) + return; + + StartCoroutine(PlayerAttack3()); + } + IEnumerator PlayerAttack3() + { + //Damage enemy + bool isDead = enemyUnit.TakeDamage(playerUnit.damage3); + enemyHUD.SetHP(enemyUnit.currentHP); + //animate here + yield return new WaitForSeconds(1.0f); + dialogueText.text = "The long range attack is successful!"; + yield return new WaitForSeconds(1f); + + //check if enemy dead if (isDead) { - state = BattleState.LOST; + state = BattleState.WON; + EndBattle(); } + else { - state = BattleState.PLAYERTURN; - - PlayerTurn(); + state = BattleState.ENEMYTURN; + StartCoroutine(EnemyTurn()); } - } - void EndBattle() - { - //change state - if (state == BattleState.WON) - { - dialogueText.text = "You won"; - } - - else if (state == BattleState.LOST) - { - dialogueText.text = "You lost"; - } - } - - IEnumerator PlayerTurn() + public void OnHealButton() { - - dialogueText.text = "Choose an action:"; - yield return new WaitForSeconds(.5f); + if (state != BattleState.PLAYERTURN) + return; + StartCoroutine(PlayerHeal()); } - IEnumerator PlayerHeal() { yield return new WaitForSeconds(.5f); @@ -142,24 +248,22 @@ public class BattleSystem : MonoBehaviour state = BattleState.ENEMYTURN; yield return new WaitForSeconds(1f); StartCoroutine(EnemyTurn()); - - - } - public void OnAttackButton() - { - if (state != BattleState.PLAYERTURN) - return; - StartCoroutine(PlayerAttack()); - } - public void OnHealButton() + void EndBattle() { - if (state != BattleState.PLAYERTURN) - return; + //change state + if (state == BattleState.WON) + { + dialogueText.text = "You won!"; + } + + else if (state == BattleState.LOST) + { + dialogueText.text = "You lost!"; + } - StartCoroutine(PlayerHeal()); } } diff --git a/RPG/Assets/Scripts/Unit.cs b/RPG/Assets/Scripts/Unit.cs index 015b568..4b125ef 100644 --- a/RPG/Assets/Scripts/Unit.cs +++ b/RPG/Assets/Scripts/Unit.cs @@ -8,8 +8,10 @@ public class Unit : MonoBehaviour public string unitName; public int unitLevel; + public int damage0; public int damage; public int damage2; + public int damage3; public int maxHP; public int currentHP; diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller index 87f176d..dc581cf 100644 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller +++ b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player.controller @@ -9,7 +9,7 @@ AnimatorController: m_Name: Player serializedVersion: 5 m_AnimatorParameters: - - m_Name: Attacking + - m_Name: Run m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -28,7 +28,7 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1101449112006842384 +--- !u!1101 &1101272220661139254 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -37,10 +37,10 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Attacking + m_ConditionEvent: Run m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102310623440575442} + m_DstState: {fileID: 1102272874589869658} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -53,7 +53,7 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &1101470502379958286 +--- !u!1101 &1101619083475817350 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -62,86 +62,34 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Attacking + m_ConditionEvent: Run m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1102169725461993464} + m_DstState: {fileID: 1102895410009337628} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.8333333 + m_ExitTime: 0.8076923 m_HasExitTime: 0 m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &1102110848281027924 +--- !u!1102 &1102272874589869658 AnimatorState: serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Player_AttackSpecial - 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: 5d92b47c69edfbb41bfb4c27f39dbf19, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102131811358484924 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_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: 1bc7e773484ccaf42a7f2f810fa6cad8, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102169725461993464 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_Run_Attack + m_Name: Player_Idle 0 m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 1101449112006842384} + - {fileID: 1101619083475817350} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -151,76 +99,24 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f165e2637f8e08049a62e01e4793765d, type: 2} + m_Motion: {fileID: 7400000, guid: 72e75614c5c0ee84fa6ca251b0446d95, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &1102310623440575442 +--- !u!1102 &1102895410009337628 AnimatorState: serializedVersion: 5 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Player_Idle + m_Name: Player_Run m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 1101470502379958286} - 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: 848004cc1e67a534d88c444d14bfc548, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102401007289545622 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_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: c21955dd549ae34478c49f625fb93be8, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &1102800702297541230 -AnimatorState: - serializedVersion: 5 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Player_Attack - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] + - {fileID: 1101272220661139254} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -230,7 +126,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 4b235f319634f6b42bd4dff34c42acdc, type: 2} + m_Motion: {fileID: 7400000, guid: 6b01b9ec04880e34b978ab5777015d8b, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -246,23 +142,11 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: 1102310623440575442} - m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102169725461993464} - m_Position: {x: 204, y: 84, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102131811358484924} - m_Position: {x: 444, y: 192, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102401007289545622} - m_Position: {x: 204, y: -96, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1102800702297541230} - m_Position: {x: 410, y: 390, z: 0} + m_State: {fileID: 1102895410009337628} + m_Position: {x: 144, y: 96, z: 0} - serializedVersion: 1 - m_State: {fileID: 1102110848281027924} - m_Position: {x: 445, y: 455, z: 0} + m_State: {fileID: 1102272874589869658} + m_Position: {x: 156, y: 12, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -272,4 +156,4 @@ AnimatorStateMachine: m_EntryPosition: {x: -84, y: 96, z: 0} m_ExitPosition: {x: 744, y: 252, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102310623440575442} + m_DefaultState: {fileID: 1102272874589869658} diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim deleted file mode 100644 index 3938ac4..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim +++ /dev/null @@ -1,80 +0,0 @@ -%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: Player_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: d888fc7a444b5b6489a04632aef49dea, type: 3} - - time: 0.1 - value: {fileID: 21300000, guid: 1bc4305561243534c8f7c7b1f7d774e2, type: 3} - - time: 0.2 - value: {fileID: 21300000, guid: 4e85d6ab9c1b8ac43a196b9254237a28, type: 3} - - time: 0.3 - value: {fileID: 21300000, guid: e5ca5d0f2cd58294fb086f1bec3d6be5, type: 3} - - time: 0.4 - value: {fileID: 21300000, guid: 2419995bc6bee824fb99c51c53b449ba, 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: d888fc7a444b5b6489a04632aef49dea, type: 3} - - {fileID: 21300000, guid: 1bc4305561243534c8f7c7b1f7d774e2, type: 3} - - {fileID: 21300000, guid: 4e85d6ab9c1b8ac43a196b9254237a28, type: 3} - - {fileID: 21300000, guid: e5ca5d0f2cd58294fb086f1bec3d6be5, type: 3} - - {fileID: 21300000, guid: 2419995bc6bee824fb99c51c53b449ba, 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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim.meta deleted file mode 100644 index e5b7f60..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Attack.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4b235f319634f6b42bd4dff34c42acdc -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim deleted file mode 100644 index 2acbbee..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim +++ /dev/null @@ -1,89 +0,0 @@ -%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: Player_AttackSpecial - 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.1 - value: {fileID: 21300000, guid: b9bbaad9383ea664baf46201b5df0304, type: 3} - - time: 0.2 - value: {fileID: 21300000, guid: aaf01d7ac8cb1a245aa3c03ff6da99d5, type: 3} - - time: 0.3 - value: {fileID: 21300000, guid: 298cd4cebde7a1049abf7e9ac60effd4, type: 3} - - time: 0.4 - value: {fileID: 21300000, guid: 8c1410b3b020d4f489ceef4e52a5275f, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 87aaadba1440b67458d2334446b9faf0, type: 3} - - time: 0.6 - value: {fileID: 21300000, guid: 7d79bb723e8699741bc805df415f24a6, type: 3} - - time: 0.7 - value: {fileID: 21300000, guid: a36fd68299c1d074eb9fc955cd57961a, 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: 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: 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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim.meta deleted file mode 100644 index 99ceaeb..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_AttackSpecial.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5d92b47c69edfbb41bfb4c27f39dbf19 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim deleted file mode 100644 index a56c63d..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Death.anim +++ /dev/null @@ -1,95 +0,0 @@ -%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: Player_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.125 - value: {fileID: 21300000, guid: 94c4c4bf3918c714b92846f9a608ee1c, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 387d873e05d99914281de6d3cfd591ed, type: 3} - - time: 0.375 - value: {fileID: 21300000, guid: 32640277e12a060419b012dac05a85d4, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: dd4b655b19ccb5e459220ab813470ea8, type: 3} - - time: 0.625 - value: {fileID: 21300000, guid: 27393ad7c64528a4eaa98160aedb7660, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: 39e8a2d4fec56b34fbdd34d784c0beb4, type: 3} - - time: 0.875 - value: {fileID: 21300000, guid: 31a1e6e5cc6128e4ba6d7edfb3f34559, type: 3} - - time: 1 - value: {fileID: 21300000, guid: e5ae94d39d880684dbb3f78fbf904767, type: 3} - - time: 1.125 - value: {fileID: 21300000, guid: cda7697700d163142a83c484e201c382, 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: 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.25 - 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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim deleted file mode 100644 index 94f1696..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim +++ /dev/null @@ -1,101 +0,0 @@ -%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: Player_HighJump - 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: 952280097aba2cd43a9cbdcc9635bcd0, type: 3} - - time: 0.125 - value: {fileID: 21300000, guid: e094b29c9d0dd0e42bd4269f27165156, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 7f02dded345580142a42fd118af7e061, type: 3} - - time: 0.375 - value: {fileID: 21300000, guid: 6ccdc4b4cb4638b4987af623e8b4c685, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: cd4f0bf03608c4e458444ead725ab935, type: 3} - - time: 0.625 - 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 - 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: 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: 1.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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim.meta deleted file mode 100644 index 219c77d..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_HighJump.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6fe91e1109836824991b514ebc810b63 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim.meta deleted file mode 100644 index 2fa7905..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Hurt.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c21955dd549ae34478c49f625fb93be8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim deleted file mode 100644 index 722d096..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Idle.anim +++ /dev/null @@ -1,101 +0,0 @@ -%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: Player_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: bcf8f425c2342014898fd97105674c67, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 1d74867836965d3469a56134f847923b, type: 3} - - time: 0.375 - value: {fileID: 21300000, guid: fc2ded30a0ccd974bafa8d9e8c0eeb7e, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: d4efd91c6d4b3de499e39e4ab7b13df3, type: 3} - - time: 0.625 - value: {fileID: 21300000, guid: ab22828c375e376499c401613c20aad6, type: 3} - - time: 0.75 - value: {fileID: 21300000, guid: 9dde7a52aa6fd2a4299acb14dab6c422, type: 3} - - time: 0.875 - value: {fileID: 21300000, guid: 207efd9c898252841a79e57b78a97dc7, type: 3} - - time: 1 - value: {fileID: 21300000, guid: 3241747d976332b42925b61b2ce12208, type: 3} - - time: 1.125 - value: {fileID: 21300000, guid: 022c8bd79a7dcfa4f997deecb8688e72, type: 3} - - time: 1.25 - value: {fileID: 21300000, guid: 3416b2b3cf7adbb438e80c9081d31c5a, type: 3} - - time: 1.375 - 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: 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.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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim deleted file mode 100644 index fa42a58..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim +++ /dev/null @@ -1,86 +0,0 @@ -%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: Player_Jump - 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: 9a48bacf978f50c40a05b5b2a1dd646e, type: 3} - - time: 0.083333336 - value: {fileID: 21300000, guid: 10989ddeee333ca4f99feca9102c7f65, type: 3} - - time: 0.16666667 - value: {fileID: 21300000, guid: d3c7f47ce0c4dbf4395f0b48b11e995b, type: 3} - - time: 0.25 - value: {fileID: 21300000, guid: 45d481dfd561497468593dd161dd5726, type: 3} - - time: 0.33333334 - value: {fileID: 21300000, guid: 0ec5b1fd2c88f7d4f97e6de00130feec, type: 3} - - time: 0.41666666 - value: {fileID: 21300000, guid: 9421885f79c9f11419225d55d4e5a14d, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: f115dad695c65b141a82379ed2ad9c78, 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: 9a48bacf978f50c40a05b5b2a1dd646e, type: 3} - - {fileID: 21300000, guid: 10989ddeee333ca4f99feca9102c7f65, type: 3} - - {fileID: 21300000, guid: d3c7f47ce0c4dbf4395f0b48b11e995b, type: 3} - - {fileID: 21300000, guid: 45d481dfd561497468593dd161dd5726, type: 3} - - {fileID: 21300000, guid: 0ec5b1fd2c88f7d4f97e6de00130feec, type: 3} - - {fileID: 21300000, guid: 9421885f79c9f11419225d55d4e5a14d, type: 3} - - {fileID: 21300000, guid: f115dad695c65b141a82379ed2ad9c78, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.5833333 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim.meta deleted file mode 100644 index dc39d04..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Jump.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 735b42d61f43b054a9693073285ad54f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim deleted file mode 100644 index 002b607..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim +++ /dev/null @@ -1,89 +0,0 @@ -%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: Player_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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim.meta deleted file mode 100644 index 9d9b81c..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 39b16292b24fac949b75d62f37ef2433 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim deleted file mode 100644 index 910773f..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim +++ /dev/null @@ -1,89 +0,0 @@ -%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: Player_Run_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: 6f257f98eeccdf04da26f28b83067ed5, type: 3} - - time: 0.1 - value: {fileID: 21300000, guid: ff95915caecde394899da9508aeeb725, type: 3} - - time: 0.2 - value: {fileID: 21300000, guid: 1b7e132892ab34242b26c73875d7a53b, type: 3} - - time: 0.3 - value: {fileID: 21300000, guid: f4f982a2775964246ab7f79eff0b361e, type: 3} - - time: 0.4 - value: {fileID: 21300000, guid: eea732f3b0689e34c9b54536d0c088d1, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: 578f0a60d33ea9646a8bbb3107b8b910, type: 3} - - time: 0.6 - value: {fileID: 21300000, guid: 9d26784af33813f4d9a3071cee411915, type: 3} - - time: 0.7 - value: {fileID: 21300000, guid: 86bfc2ec8b796584c83a40752ba8278a, 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: 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.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/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim.meta b/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim.meta deleted file mode 100644 index 76506e3..0000000 --- a/RPG/Assets/_Sprites & Stuff/Enemies/PNG/Knight/Idle/Player_Run_Attack.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f165e2637f8e08049a62e01e4793765d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: