From c2977d355def1406457db4ff3985babbf37253d1 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 10:20:34 -0500 Subject: [PATCH] finished fixing events control --- Assets/Prefabs/{Bug.prefab => GioBug.prefab} | 38 +++- .../{Bug.prefab.meta => GioBug.prefab.meta} | 0 Assets/Scenes/LevelOne.unity | 199 +++++++++++------- Assets/Scripts/BugMovement.cs | 15 ++ Assets/Scripts/EventControls.cs | 70 ++++-- Assets/Scripts/Player.cs | 1 + Assets/Sprites/Player/Player.controller | 30 +-- 7 files changed, 243 insertions(+), 110 deletions(-) rename Assets/Prefabs/{Bug.prefab => GioBug.prefab} (79%) rename Assets/Prefabs/{Bug.prefab.meta => GioBug.prefab.meta} (100%) diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/GioBug.prefab similarity index 79% rename from Assets/Prefabs/Bug.prefab rename to Assets/Prefabs/GioBug.prefab index b76863e..1dc2ff9 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/GioBug.prefab @@ -13,8 +13,9 @@ GameObject: - component: {fileID: 3827363133515929328} - component: {fileID: 3827363133515929335} - component: {fileID: 3827363133515929334} + - component: {fileID: -6605527394410161759} m_Layer: 9 - m_Name: Bug + m_Name: GioBug m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -72,8 +73,9 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 96053fa04d918a448a0636f9fec1c373, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -96,18 +98,18 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.03701496, y: -0.01850748} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 3.1875, y: 2.6875} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 2.51762, y: 2.6286669} m_EdgeRadius: 0 --- !u!114 &3827363133515929335 MonoBehaviour: @@ -123,9 +125,12 @@ MonoBehaviour: m_EditorClassIdentifier: secondsGoingLeft: 0.8 secondsGoingRight: 0.8 - movementSpeed: 2 + movementSpeed: 2.2 + eventTriggerCount: 1 + controlTriggerCounterEvent: 1 playerCollider: {fileID: 0} eventControls: {fileID: 0} + player: {fileID: 0} --- !u!50 &3827363133515929334 Rigidbody2D: serializedVersion: 4 @@ -147,3 +152,22 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 0 +--- !u!95 &-6605527394410161759 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3827363133515929333} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b76bb1b393cc12742a8731288b81b071, 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/Assets/Prefabs/Bug.prefab.meta b/Assets/Prefabs/GioBug.prefab.meta similarity index 100% rename from Assets/Prefabs/Bug.prefab.meta rename to Assets/Prefabs/GioBug.prefab.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index f6a8669..6730faf 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -192,7 +192,6 @@ MonoBehaviour: framesPerControlTile: 8 nextControlYOffset: 2 tileMapClearDelayInSeconds: 0.5 - maxNumberOfControlTiles: 2 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -424,7 +423,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -498,7 +497,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1127,7 +1126,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1201,7 +1200,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1358,7 +1357,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1008122161 GameObject: @@ -1406,7 +1405,7 @@ Transform: - {fileID: 1491654} - {fileID: 193535121} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1028911173 PrefabInstance: @@ -1483,7 +1482,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47001,7 +47000,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1247097598 stripped Transform: @@ -47064,7 +47063,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47425,7 +47424,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47585,6 +47584,115 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1879087608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.x + value: 20.83 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.49 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Name + value: GioBug + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventTriggerCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: controlTriggerCounterEvent + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1 &1882958979 GameObject: m_ObjectHideFlags: 0 @@ -90402,16 +90510,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1008122163} m_Modifications: - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Offset.x - value: 0.03701496 - objectReference: {fileID: 0} - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x @@ -90422,42 +90520,6 @@ PrefabInstance: propertyPath: m_SpriteTilingProperty.oldSize.y value: 2.6875 objectReference: {fileID: 0} - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Size.x - value: 2.51762 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Offset.y - value: -0.01850748 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Size.y - value: 2.6286669 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, - type: 3} - - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x @@ -90531,27 +90593,12 @@ PrefabInstance: - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_Name - value: Bug + value: GioBug objectReference: {fileID: 0} - target: {fileID: 3827363133515929334, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} - propertyPath: m_BodyType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: movementSpeed - value: 2.2 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: secondsGoingLeft - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: secondsGoingRight - value: 0.8 + propertyPath: m_Constraints + value: 4 objectReference: {fileID: 0} - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -90645,7 +90692,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index f9f26ef..a649756 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -7,6 +7,8 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingLeft = 1; [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; + [SerializeField] public int eventTriggerCount = 3; + [SerializeField] public int controlTriggerCounterEvent = 3; [SerializeField] Collider2D playerCollider; [SerializeField] EventControls eventControls; [SerializeField] Player player; @@ -14,6 +16,7 @@ public class BugMovement : MonoBehaviour private int leftAccumalator = 0; private int rightAccumalator = 0; private Rigidbody2D rigidBody; + private bool isMovementDisabled = false; private int framesPerSecond => 60; @@ -27,6 +30,8 @@ public class BugMovement : MonoBehaviour { if (HasEncounteredPlayer()) eventControls.TriggerEvent(playerCollider, GetComponent(), player); + if (isMovementDisabled) + return; var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; @@ -65,4 +70,14 @@ public class BugMovement : MonoBehaviour { return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Player)); } + + public void DisableMovement() + { + isMovementDisabled = true; + } + + public void EnableMovement() + { + isMovementDisabled = false; + } } diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index b9f8b89..c76cdc6 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -13,11 +13,19 @@ public class EventControls : MonoBehaviour [SerializeField] private List successTiles; [SerializeField] private List failTiles; [SerializeField] private Tile plusTile; + [SerializeField] private float framesPerControlTile = 15; [SerializeField] private int nextControlYOffset = 0; private int nextControlXOffset => 0 - maxNumberOfControlTiles + 1; [SerializeField] private float tileMapClearDelayInSeconds = 0.5f; - [SerializeField] private int maxNumberOfControlTiles = 2; + private int numberOfEventsCount = 0; + + private int maxNumberOfEvents => currentEnemyCollider.gameObject + .GetComponent() + .eventTriggerCount; + private int maxNumberOfControlTiles => currentEnemyCollider.gameObject + .GetComponent() + .controlTriggerCounterEvent; private Tilemap tilemap; @@ -33,6 +41,7 @@ public class EventControls : MonoBehaviour private int tileMapClearDelayAccumalator = 0; private EventControlTile currentEventControl; private bool isInBattle = false; + private bool hasFailed = false; private Collider2D currentPlayerCollider; private Collider2D currentEnemyCollider; @@ -46,10 +55,15 @@ public class EventControls : MonoBehaviour public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider, Player player) { + if (isInBattle) + return; + currentPlayerCollider = playerCollider; currentEnemyCollider = enemyCollider; enemyCollider.gameObject.GetComponent().enabled = false; + enemyCollider.gameObject.GetComponent().DisableMovement(); + player.StartEncounter(); Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); @@ -160,10 +174,18 @@ public class EventControls : MonoBehaviour currentEventControl = null; if (eventControlTilesInCycle.Where(x => !x.isPlusTile && !x.isPerformed).Count() == 0) { + numberOfEventsCount++; eventTriggered = false; eventCycleAccumalator = 0; - // Destroy(currentEnemyCollider.gameObject); - // currentEnemyCollider = null; + + if (maxNumberOfControlTiles == numberOfEventsCount) + { + player.EndEncounter(); + isInBattle = false; + // Destroy(currentEnemyCollider.gameObject); + // currentEnemyCollider = null; + hasFailed = false; + } } return; @@ -174,9 +196,16 @@ public class EventControls : MonoBehaviour isInBattle = false; eventCycleAccumalator = 0; currentEventControl = null; - + numberOfEventsCount = 0; + hasFailed = true; + player.ThrowUserInTheAirHurt(); SoundManagerScript.PlaySound("bug laugh"); + + currentEnemyCollider.gameObject.GetComponent().enabled = true; + currentEnemyCollider.gameObject.GetComponent().EnableMovement(); + player.EndEncounter(); + return; } else if (FailedToClickCorrect(currentEventControl.keyCode)) @@ -187,8 +216,15 @@ public class EventControls : MonoBehaviour isInBattle = false; eventCycleAccumalator = 0; currentEventControl = null; + numberOfEventsCount = 0; + hasFailed = true; player.ThrowUserInTheAirHurt(); + + currentEnemyCollider.gameObject.GetComponent().enabled = true; + currentEnemyCollider.gameObject.GetComponent().EnableMovement(); + player.EndEncounter(); + SoundManagerScript.PlaySound("bug laugh"); return; } @@ -206,16 +242,26 @@ public class EventControls : MonoBehaviour eventDrawn = false; numberOfControlTilesSet = 0; - if (currentEnemyCollider != null) - Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); - if (!isInBattle) + if (maxNumberOfControlTiles == numberOfEventsCount) { - currentEnemyCollider.gameObject.GetComponent().enabled = true; - player.EndEncounter(); - } + if (currentEnemyCollider != null && hasFailed) + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); - currentPlayerCollider = null; - currentEnemyCollider = null; + numberOfEventsCount = 0; + currentPlayerCollider = null; + currentEnemyCollider = null; + } + else + { + eventTriggered = true && !hasFailed; + isInBattle = true && !hasFailed; + + if (hasFailed) + { + if (currentEnemyCollider != null) + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); + } + } } else { diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 116d592..5a630ab 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -231,5 +231,6 @@ public class Player : MonoBehaviour public void ThrowUserInTheAirHurt() { GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); + isFighting = false; } } diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 68f488e..83ce0b5 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -31,6 +31,7 @@ AnimatorStateMachine: m_AnyStateTransitions: - {fileID: 3708718943660755162} - {fileID: -1637549219293370904} + - {fileID: -5898471161503941254} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -39,7 +40,7 @@ AnimatorStateMachine: m_ExitPosition: {x: 390, y: 70, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2991084837782200938} ---- !u!1101 &-5610768259902955866 +--- !u!1101 &-5898471161503941254 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -47,11 +48,11 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 + - m_ConditionMode: 1 m_ConditionEvent: IsFighting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -2991084837782200938} + m_DstState: {fileID: 5819910786424590319} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -123,7 +124,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -4109286016316069763} - - {fileID: -880235167412170940} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -139,7 +139,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-880235167412170940 +--- !u!1101 &-2394224690546515301 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -147,16 +147,16 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 + - m_ConditionMode: 2 m_ConditionEvent: IsFighting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5819910786424590319} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 - m_IsExit: 0 + m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 m_HasExitTime: 1 @@ -203,31 +203,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsGround m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: YVelocity m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsFighting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsHurt m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -488,7 +488,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -5610768259902955866} + - {fileID: -2394224690546515301} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0