From c2977d355def1406457db4ff3985babbf37253d1 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 10:20:34 -0500 Subject: [PATCH 1/3] 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 From 508204b3b89862fc6c18aaf48e17b35be14559c0 Mon Sep 17 00:00:00 2001 From: Jack Rus Date: Sun, 2 Feb 2020 10:31:47 -0500 Subject: [PATCH 2/3] minor fixes for sorting layers --- Assets/Scenes/LevelOne.unity | 839 ++++++++++++++++++++--------------- 1 file changed, 478 insertions(+), 361 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 33cfec5..f1842e7 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -356,6 +356,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -450,6 +465,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -1161,6 +1191,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -1235,6 +1275,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -1497,6 +1552,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -1891,26 +1961,6 @@ CompositeCollider2D: Y: 340000000 - X: 960000000 Y: 340000000 - - - X: 930000000 - Y: 370000000 - - X: 910000000 - Y: 370000000 - - X: 910000000 - Y: 380000000 - - X: 900000000 - Y: 380000000 - - X: 900000000 - Y: 340000000 - - X: 910000000 - Y: 340000000 - - X: 910000000 - Y: 330000000 - - X: 920000000 - Y: 330000000 - - X: 920000000 - Y: 320000000 - - X: 930000000 - Y: 320000000 - - X: 1620000000 Y: 300000000 - X: 1660000000 @@ -2195,6 +2245,26 @@ CompositeCollider2D: Y: 170000000 - X: -40000000 Y: 170000000 + - - X: 930000000 + Y: 370000000 + - X: 910000000 + Y: 370000000 + - X: 910000000 + Y: 380000000 + - X: 900000000 + Y: 380000000 + - X: 900000000 + Y: 340000000 + - X: 910000000 + Y: 340000000 + - X: 910000000 + Y: 330000000 + - X: 920000000 + Y: 330000000 + - X: 920000000 + Y: 320000000 + - X: 930000000 + Y: 320000000 - - X: 1360000000 Y: 370000000 - X: 1290000000 @@ -2259,21 +2329,21 @@ CompositeCollider2D: Y: 240000000 - X: 10000000 Y: 220000000 - - - X: -40000000 + - - X: 2289999872 Y: 320000000 - - X: -80000000 + - X: 2280000000 Y: 320000000 - - X: -80000000 + - X: 2280000000 Y: 300000000 - - X: -40000000 + - X: 2289999872 Y: 300000000 - - - X: 1880000000 + - - X: 1940000000 Y: 320000000 - - X: 1860000000 + - X: 1920000000 Y: 320000000 - - X: 1860000000 + - X: 1920000000 Y: 310000000 - - X: 1880000000 + - X: 1940000000 Y: 310000000 - - X: 2060000000 Y: 320000000 @@ -2283,34 +2353,22 @@ CompositeCollider2D: Y: 310000000 - X: 2060000000 Y: 310000000 - - - X: 1940000000 + - - X: 1880000000 Y: 320000000 - - X: 1920000000 + - X: 1860000000 Y: 320000000 - - X: 1920000000 + - X: 1860000000 Y: 310000000 - - X: 1940000000 + - X: 1880000000 Y: 310000000 - - - X: 1710000000 - Y: 310000000 - - X: 1740000000 - Y: 310000000 - - X: 1740000000 + - - X: -40000000 Y: 320000000 - - X: 1700000000 + - X: -80000000 Y: 320000000 - - X: 1700000000 + - X: -80000000 Y: 300000000 - - X: 1710000000 + - X: -40000000 Y: 300000000 - - - X: 1820000000 - Y: 320000000 - - X: 1780000000 - Y: 320000000 - - X: 1780000000 - Y: 310000000 - - X: 1820000000 - Y: 310000000 - - X: 1380000000 Y: 320000000 - X: 1270000000 @@ -2335,30 +2393,18 @@ CompositeCollider2D: Y: 310000000 - X: 2000000000 Y: 310000000 - - - X: 2289999872 - Y: 320000000 - - X: 2280000000 - Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - - X: 20000000 - Y: 320000000 - - X: -20000000 - Y: 320000000 - - X: -20000000 - Y: 300000000 - - X: 20000000 - Y: 300000000 - - - X: 2240000000 - Y: 320000000 - - X: 2220000000 - Y: 320000000 - - X: 2220000000 + - - X: 1710000000 Y: 310000000 - - X: 2240000000 + - X: 1740000000 Y: 310000000 + - X: 1740000000 + Y: 320000000 + - X: 1700000000 + Y: 320000000 + - X: 1700000000 + Y: 300000000 + - X: 1710000000 + Y: 300000000 - - X: 2120000000 Y: 320000000 - X: 2100000000 @@ -2367,6 +2413,30 @@ CompositeCollider2D: Y: 310000000 - X: 2120000000 Y: 310000000 + - - X: 2240000000 + Y: 320000000 + - X: 2220000000 + Y: 320000000 + - X: 2220000000 + Y: 310000000 + - X: 2240000000 + Y: 310000000 + - - X: 1820000000 + Y: 320000000 + - X: 1780000000 + Y: 320000000 + - X: 1780000000 + Y: 310000000 + - X: 1820000000 + Y: 310000000 + - - X: 20000000 + Y: 320000000 + - X: -20000000 + Y: 320000000 + - X: -20000000 + Y: 300000000 + - X: 20000000 + Y: 300000000 - - X: 960000100 Y: 69999959 - X: 960000100 @@ -2478,13 +2548,13 @@ CompositeCollider2D: - X: 659999900 Y: 280000000 - X: 659999900 - Y: 269999959 + Y: 280000041 - X: 659999959 - Y: 269999900 + Y: 280000100 - X: 670000041 - Y: 269999900 + Y: 280000100 - X: 670000100 - Y: 269999959 + Y: 280000041 - X: 670000100 Y: 280000000 - X: 770000000 @@ -2735,22 +2805,6 @@ CompositeCollider2D: Y: 239999900 - X: 2220000041 Y: 239999900 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 - Y: 210000000 - - - X: 1920000000 - Y: 220000000 - - X: 1910000000 - Y: 220000000 - - X: 1910000000 - Y: 210000000 - - X: 1920000000 - Y: 210000000 - - X: 430000000 Y: 220000000 - X: 410000000 @@ -2767,6 +2821,22 @@ CompositeCollider2D: Y: 210000000 - X: 1990000000 Y: 210000000 + - - X: 2050000000 + Y: 220000000 + - X: 2040000000 + Y: 220000000 + - X: 2040000000 + Y: 210000000 + - X: 2050000000 + Y: 210000000 + - - X: 1920000000 + Y: 220000000 + - X: 1910000000 + Y: 220000000 + - X: 1910000000 + Y: 210000000 + - X: 1920000000 + Y: 210000000 - - X: 1860000000 Y: 220000000 - X: 1850000000 @@ -2911,22 +2981,6 @@ CompositeCollider2D: Y: 180000000 - X: 1760000000 Y: 160000000 - - - X: 2140000000 - Y: 160000000 - - X: 2140000000 - Y: 170000000 - - X: 2130000000 - Y: 170000000 - - X: 2130000000 - Y: 190000000 - - X: 2140000000 - Y: 190000000 - - X: 2140000000 - Y: 200000000 - - X: 2150000128 - Y: 200000000 - - X: 2150000128 - Y: 160000000 - - X: 710000000 Y: 200000000 - X: 690000000 @@ -2943,14 +2997,22 @@ CompositeCollider2D: Y: 190000000 - X: 1160000000 Y: 190000000 - - - X: 1170000000 + - - X: 2140000000 + Y: 160000000 + - X: 2140000000 + Y: 170000000 + - X: 2130000000 + Y: 170000000 + - X: 2130000000 Y: 190000000 - - X: 1160000000 + - X: 2140000000 Y: 190000000 - - X: 1160000000 - Y: 180000000 - - X: 1170000000 - Y: 180000000 + - X: 2140000000 + Y: 200000000 + - X: 2150000128 + Y: 200000000 + - X: 2150000128 + Y: 160000000 - - X: 1960000000 Y: 190000000 - X: 1940000000 @@ -2959,6 +3021,14 @@ CompositeCollider2D: Y: 120000000 - X: 1960000000 Y: 120000000 + - - X: 1170000000 + Y: 190000000 + - X: 1160000000 + Y: 190000000 + - X: 1160000000 + Y: 180000000 + - X: 1170000000 + Y: 180000000 - - X: 1470000000 Y: 180000000 - X: 1450000000 @@ -2975,6 +3045,22 @@ CompositeCollider2D: Y: 130000000 - X: 730000000 Y: 130000000 + - - X: 1510000000 + Y: 140000000 + - X: 1490000000 + Y: 140000000 + - X: 1490000000 + Y: 120000000 + - X: 1510000000 + Y: 120000000 + - - X: 520000000 + Y: 140000000 + - X: 480000000 + Y: 140000000 + - X: 480000000 + Y: 120000000 + - X: 520000000 + Y: 120000000 - - X: 2110000000 Y: 140000000 - X: 2090000000 @@ -2987,14 +3073,6 @@ CompositeCollider2D: Y: 120000000 - X: 2110000000 Y: 120000000 - - - X: 1510000000 - Y: 140000000 - - X: 1490000000 - Y: 140000000 - - X: 1490000000 - Y: 120000000 - - X: 1510000000 - Y: 120000000 - - X: 1800000000 Y: 130000000 - X: 1810000000 @@ -3007,14 +3085,6 @@ CompositeCollider2D: Y: 120000000 - X: 1800000000 Y: 120000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -3023,6 +3093,22 @@ CompositeCollider2D: Y: 100000000 - X: 450000000 Y: 100000000 + - - X: 1550000000 + Y: 100000000 + - X: 1530000000 + Y: 100000000 + - X: 1530000000 + Y: 80000000 + - X: 1550000000 + Y: 80000000 + - - X: 760000000 + Y: 100000000 + - X: 700000000 + Y: 100000000 + - X: 700000000 + Y: 80000000 + - X: 760000000 + Y: 80000000 - - X: 1280000000 Y: 20000000 - X: 1300000000 @@ -3127,22 +3213,6 @@ CompositeCollider2D: Y: 10000000 - X: 1280000000 Y: 10000000 - - - X: 1550000000 - Y: 100000000 - - X: 1530000000 - Y: 100000000 - - X: 1530000000 - Y: 80000000 - - X: 1550000000 - Y: 80000000 - - - X: 760000000 - Y: 100000000 - - X: 700000000 - Y: 100000000 - - X: 700000000 - Y: 80000000 - - X: 760000000 - Y: 80000000 - - X: 1950000100 Y: 39999959 - X: 1950000100 @@ -3207,14 +3277,6 @@ CompositeCollider2D: Y: 39999900 - X: 1950000041 Y: 39999900 - - - X: 290000000 - Y: 80000000 - - X: 240000000 - Y: 80000000 - - X: 240000000 - Y: 60000000 - - X: 290000000 - Y: 60000000 - - X: 2200000100 Y: 49999959 - X: 2200000100 @@ -3235,6 +3297,14 @@ CompositeCollider2D: Y: 49999900 - X: 2200000041 Y: 49999900 + - - X: 290000000 + Y: 80000000 + - X: 240000000 + Y: 80000000 + - X: 240000000 + Y: 60000000 + - X: 290000000 + Y: 60000000 - - X: 1880000000 Y: 50000000 - X: 1880000000 @@ -3475,6 +3545,14 @@ CompositeCollider2D: Y: -10000100 - X: 1000000041 Y: -10000100 + - - X: 1750000000 + Y: 10000000 + - X: 1670000000 + Y: 10000000 + - X: 1670000000 + Y: -20000000 + - X: 1750000000 + Y: -20000000 - - X: 2030000100 Y: -60000041 - X: 2030000100 @@ -3547,14 +3625,6 @@ CompositeCollider2D: Y: -60000100 - X: 2030000041 Y: -60000100 - - - X: 1750000000 - Y: 10000000 - - X: 1670000000 - Y: 10000000 - - X: 1670000000 - Y: -20000000 - - X: 1750000000 - Y: -20000000 - - X: 1660000000 Y: -40000000 - X: 1640000000 @@ -3587,6 +3657,34 @@ CompositeCollider2D: Y: -110000000 - X: 1160000000 Y: -110000000 + - - X: 1240000000 + Y: -90000000 + - X: 1180000000 + Y: -90000000 + - X: 1180000000 + Y: -110000000 + - X: 1240000000 + Y: -110000000 + - - X: 1550000000 + Y: -90000000 + - X: 1530000000 + Y: -90000000 + - X: 1530000000 + Y: -100000000 + - X: 1540000000 + Y: -100000000 + - X: 1540000000 + Y: -110000000 + - X: 1550000000 + Y: -110000000 + - - X: 1470000000 + Y: -90000000 + - X: 1450000000 + Y: -90000000 + - X: 1450000000 + Y: -110000000 + - X: 1470000000 + Y: -110000000 - - X: 2140000000 Y: -110000000 - X: 2159999900 @@ -3619,34 +3717,6 @@ CompositeCollider2D: Y: -170000000 - X: 2140000000 Y: -170000000 - - - X: 1240000000 - Y: -90000000 - - X: 1180000000 - Y: -90000000 - - X: 1180000000 - Y: -110000000 - - X: 1240000000 - Y: -110000000 - - - X: 1550000000 - Y: -90000000 - - X: 1530000000 - Y: -90000000 - - X: 1530000000 - Y: -100000000 - - X: 1540000000 - Y: -100000000 - - X: 1540000000 - Y: -110000000 - - X: 1550000000 - Y: -110000000 - - - X: 1470000000 - Y: -90000000 - - X: 1450000000 - Y: -90000000 - - X: 1450000000 - Y: -110000000 - - X: 1470000000 - Y: -110000000 - - X: 1780000000 Y: -120000000 - X: 1730000000 @@ -3655,6 +3725,14 @@ CompositeCollider2D: Y: -140000000 - X: 1780000000 Y: -140000000 + - - X: 1320000000 + Y: -130000000 + - X: 1240000000 + Y: -130000000 + - X: 1240000000 + Y: -150000000 + - X: 1320000000 + Y: -150000000 - - X: 1140000000 Y: -130000000 - X: 1050000000 @@ -3695,14 +3773,6 @@ CompositeCollider2D: Y: -160000000 - X: -90000000 Y: -160000000 - - - X: 1320000000 - Y: -130000000 - - X: 1240000000 - Y: -130000000 - - X: 1240000000 - Y: -150000000 - - X: 1320000000 - Y: -150000000 - - X: 2270000128 Y: -140000000 - X: 2260000000 @@ -3893,19 +3963,7 @@ CompositeCollider2D: - {x: 234.99998, y: 44} - {x: -18, y: 43.999973} - {x: -17.999971, y: -26} - - - {x: 151, y: -22.999971} - - {x: 139, y: -22.999971} - - {x: 138.99997, y: -16} - - {x: 135, y: -16.000029} - - {x: 135.00003, y: -18} - - {x: 136, y: -18.000029} - - {x: 135.99997, y: -23} - - {x: 40, y: -22.999971} - - {x: 39.999973, y: -19} - - {x: 38, y: -18.999971} - - {x: 37.999973, y: -15} - - {x: 36, y: -15.000029} - - {x: 35.999973, y: -23} + - - {x: 36, y: -22.999971} - {x: -2, y: -22.999971} - {x: -2.0000293, y: -17} - {x: -4, y: -17.000029} @@ -3991,6 +4049,18 @@ CompositeCollider2D: - {x: 153, y: -22.999971} - {x: 152.99997, y: -22} - {x: 151, y: -22.000029} + - {x: 150.99997, y: -23} + - {x: 139, y: -22.999971} + - {x: 138.99997, y: -16} + - {x: 135, y: -16.000029} + - {x: 135.00003, y: -18} + - {x: 136, y: -18.000029} + - {x: 135.99997, y: -23} + - {x: 40, y: -22.999971} + - {x: 39.999973, y: -19} + - {x: 38, y: -18.999971} + - {x: 37.999973, y: -15} + - {x: 36, y: -15.000029} - - {x: 95.99997, y: 34} - {x: 96.00003, y: 35} - {x: 97, y: 35.00003} @@ -4001,32 +4071,6 @@ CompositeCollider2D: - {x: 98.99997, y: 40} - {x: 95, y: 39.999973} - {x: 95.00003, y: 34} - - - {x: 92.99997, y: 32} - - {x: 92.99997, y: 37} - - {x: 91, y: 37.00003} - - {x: 90.99997, y: 38} - - {x: 90, y: 37.999973} - - {x: 90.00003, y: 34} - - {x: 91, y: 33.999973} - - {x: 91.00003, y: 33} - - {x: 92, y: 32.999973} - - {x: 92.00003, y: 32} - - - {x: 161.99997, y: -7} - - {x: 162.00003, y: 30} - - {x: 166, y: 30.000029} - - {x: 165.99997, y: 32} - - {x: 162, y: 32.00003} - - {x: 162.00003, y: 36} - - {x: 163, y: 36.00003} - - {x: 162.99997, y: 37} - - {x: 162, y: 37.00003} - - {x: 161.99997, y: 38} - - {x: 159, y: 37.999973} - - {x: 158.99997, y: 6} - - {x: 157, y: 5.999971} - - {x: 157.00003, y: 4} - - {x: 159, y: 3.9999704} - - {x: 159.00003, y: -7} - - {x: -4.000029, y: 17} - {x: -3.9999704, y: 20} - {x: -3, y: 20.000029} @@ -4147,6 +4191,32 @@ CompositeCollider2D: - {x: -5.0000296, y: 19} - {x: -6, y: 18.999971} - {x: -5.999971, y: 17} + - - {x: 161.99997, y: -7} + - {x: 162.00003, y: 30} + - {x: 166, y: 30.000029} + - {x: 165.99997, y: 32} + - {x: 162, y: 32.00003} + - {x: 162.00003, y: 36} + - {x: 163, y: 36.00003} + - {x: 162.99997, y: 37} + - {x: 162, y: 37.00003} + - {x: 161.99997, y: 38} + - {x: 159, y: 37.999973} + - {x: 158.99997, y: 6} + - {x: 157, y: 5.999971} + - {x: 157.00003, y: 4} + - {x: 159, y: 3.9999704} + - {x: 159.00003, y: -7} + - - {x: 92.99997, y: 32} + - {x: 92.99997, y: 37} + - {x: 91, y: 37.00003} + - {x: 90.99997, y: 38} + - {x: 90, y: 37.999973} + - {x: 90.00003, y: 34} + - {x: 91, y: 33.999973} + - {x: 91.00003, y: 33} + - {x: 92, y: 32.999973} + - {x: 92.00003, y: 32} - - {x: 135.99997, y: 35} - {x: 135.99997, y: 37} - {x: 129, y: 36.999973} @@ -4179,6 +4249,14 @@ CompositeCollider2D: - {x: 2, y: 24.999971} - {x: 1.9999707, y: 24} - {x: 1, y: 23.999971} + - - {x: 1.9999708, y: 30} + - {x: 1.9999708, y: 32} + - {x: -2, y: 31.999971} + - {x: -1.9999708, y: 30} + - - {x: -4.000029, y: 30} + - {x: -4.000029, y: 32} + - {x: -8, y: 31.999971} + - {x: -7.9999704, y: 30} - - {x: 228.99997, y: 30} - {x: 228.99997, y: 32} - {x: 228, y: 31.999971} @@ -4225,14 +4303,6 @@ CompositeCollider2D: - {x: 137.99997, y: 32} - {x: 127, y: 31.999971} - {x: 127.00003, y: 30} - - - {x: 1.9999708, y: 30} - - {x: 1.9999708, y: 32} - - {x: -2, y: 31.999971} - - {x: -1.9999708, y: 30} - - - {x: -4.000029, y: 30} - - {x: -4.000029, y: 32} - - {x: -8, y: 31.999971} - - {x: -7.9999704, y: 30} - - {x: 40.999973, y: 28} - {x: 40.999973, y: 30} - {x: 27, y: 29.999971} @@ -4283,10 +4353,6 @@ CompositeCollider2D: - {x: 78.99997, y: 30} - {x: 43, y: 29.999971} - {x: 43.00003, y: 28} - - {x: 65.999985, y: 27.999971} - - {x: 66.00002, y: 26.99999} - - {x: 67.000015, y: 27.000027} - - {x: 67.00004, y: 28} - {x: 77, y: 27.999971} - {x: 76.99997, y: 23} - {x: 75, y: 22.999971} @@ -4355,14 +4421,14 @@ CompositeCollider2D: - {x: 98.99997, y: 9} - {x: 86, y: 8.99997} - {x: 86.00003, y: 7} - - - {x: -4.000029, y: 27} - - {x: -4.000029, y: 29} - - {x: -6, y: 28.999971} - - {x: -5.999971, y: 27} - - {x: 0.99997073, y: 27} - {x: 0.99997073, y: 29} - {x: -1, y: 28.999971} - {x: -0.99997073, y: 27} + - - {x: -4.000029, y: 27} + - {x: -4.000029, y: 29} + - {x: -6, y: 28.999971} + - {x: -5.999971, y: 27} - - {x: 139.99997, y: 25} - {x: 139.99997, y: 27} - {x: 125, y: 26.999971} @@ -4375,18 +4441,10 @@ CompositeCollider2D: - {x: 223.99997, y: 26} - {x: 216.99998, y: 25.999971} - {x: 217.00002, y: 24} - - - {x: 204.99997, y: 21} - - {x: 204.99997, y: 22} - - {x: 204, y: 21.999971} - - {x: 204.00003, y: 21} - - - {x: 185.99997, y: 21} - - {x: 185.99997, y: 22} - - {x: 185, y: 21.999971} - - {x: 185.00003, y: 21} - - - {x: 42.999973, y: 20} - - {x: 42.999973, y: 22} - - {x: 41, y: 21.999971} - - {x: 41.00003, y: 20} + - - {x: 198.99997, y: 21} + - {x: 198.99997, y: 22} + - {x: 198, y: 21.999971} + - {x: 198.00003, y: 21} - - {x: 203.99997, y: 16} - {x: 203.99997, y: 21} - {x: 203, y: 20.999971} @@ -4397,6 +4455,10 @@ CompositeCollider2D: - {x: 200.99997, y: 20} - {x: 200, y: 19.999971} - {x: 200.00003, y: 16} + - - {x: 204.99997, y: 21} + - {x: 204.99997, y: 22} + - {x: 204, y: 21.999971} + - {x: 204.00003, y: 21} - - {x: 189.99997, y: 16} - {x: 189.99997, y: 20} - {x: 189, y: 20.000029} @@ -4407,6 +4469,14 @@ CompositeCollider2D: - {x: 186.99997, y: 21} - {x: 186, y: 20.999971} - {x: 186.00003, y: 16} + - - {x: 42.999973, y: 20} + - {x: 42.999973, y: 22} + - {x: 41, y: 21.999971} + - {x: 41.00003, y: 20} + - - {x: 185.99997, y: 21} + - {x: 185.99997, y: 22} + - {x: 185, y: 21.999971} + - {x: 185.00003, y: 21} - - {x: 142.99997, y: 20} - {x: 142.99997, y: 22} - {x: 122, y: 21.999971} @@ -4415,10 +4485,18 @@ CompositeCollider2D: - {x: 191.99997, y: 22} - {x: 191, y: 21.999971} - {x: 191.00003, y: 21} - - - {x: 198.99997, y: 21} - - {x: 198.99997, y: 22} - - {x: 198, y: 21.999971} - - {x: 198.00003, y: 21} + - - {x: 215.99997, y: 15} + - {x: 215.99997, y: 21} + - {x: 213, y: 20.999971} + - {x: 212.99997, y: 20} + - {x: 212, y: 19.999971} + - {x: 211.99997, y: 19} + - {x: 211, y: 18.999971} + - {x: 211.00003, y: 18} + - {x: 212, y: 17.999971} + - {x: 212.00003, y: 16} + - {x: 213, y: 15.999971} + - {x: 213.00003, y: 15} - - {x: 199.99997, y: 20} - {x: 199.99997, y: 21} - {x: 199, y: 20.999971} @@ -4441,18 +4519,6 @@ CompositeCollider2D: - {x: 173.00003, y: 15} - {x: 174, y: 14.999971} - {x: 174.00003, y: 14} - - - {x: 215.99997, y: 15} - - {x: 215.99997, y: 21} - - {x: 213, y: 20.999971} - - {x: 212.99997, y: 20} - - {x: 212, y: 19.999971} - - {x: 211.99997, y: 19} - - {x: 211, y: 18.999971} - - {x: 211.00003, y: 18} - - {x: 212, y: 17.999971} - - {x: 212.00003, y: 16} - - {x: 213, y: 15.999971} - - {x: 213.00003, y: 15} - - {x: 215.00002, y: 16.000029} - {x: 214, y: 16.000029} - {x: 213.99997, y: 17} @@ -4471,22 +4537,22 @@ CompositeCollider2D: - {x: 177, y: 18.999971} - {x: 176.99997, y: 18} - {x: 176, y: 17.999971} - - - {x: 115.99998, y: 19} - - {x: 115.99998, y: 20} - - {x: 115, y: 19.999971} - - {x: 115.00003, y: 19} - - {x: 70.99997, y: 18} - {x: 70.99997, y: 20} - {x: 69, y: 19.999971} - {x: 69.00003, y: 18} - - - {x: 116.99998, y: 18} - - {x: 116.99998, y: 19} - - {x: 116, y: 18.999971} - - {x: 116.00003, y: 18} + - - {x: 115.99998, y: 19} + - {x: 115.99998, y: 20} + - {x: 115, y: 19.999971} + - {x: 115.00003, y: 19} - - {x: 195.99997, y: 12} - {x: 195.99997, y: 19} - {x: 194, y: 18.999971} - {x: 194.00003, y: 12} + - - {x: 116.99998, y: 18} + - {x: 116.99998, y: 19} + - {x: 116, y: 18.999971} + - {x: 116.00003, y: 18} - - {x: 146.99997, y: 16} - {x: 146.99997, y: 18} - {x: 145, y: 17.999971} @@ -4519,6 +4585,10 @@ CompositeCollider2D: - {x: 44.999973, y: 12} - {x: 37, y: 11.99997} - {x: 37.00003, y: 10} + - - {x: 75.99997, y: 8} + - {x: 75.99997, y: 10} + - {x: 70, y: 9.99997} + - {x: 70.00003, y: 8} - - {x: 154.99997, y: 8} - {x: 154.99997, y: 10} - {x: 153, y: 9.99997} @@ -4575,10 +4645,6 @@ CompositeCollider2D: - {x: 125.00003, y: 2} - {x: 127, y: 1.9999707} - {x: 127.00003, y: 1} - - - {x: 75.99997, y: 8} - - {x: 75.99997, y: 10} - - {x: 70, y: 9.99997} - - {x: 70.00003, y: 8} - - {x: 203.99997, y: 4} - {x: 204.00003, y: 5} - {x: 205, y: 5.000029} @@ -4667,14 +4733,14 @@ CompositeCollider2D: - {x: 104.99998, y: 3.00001} - {x: 102.999985, y: 2.9999747} - {x: 103.00003, y: 0.99999} - - - {x: 24.999971, y: 1} - - {x: 24.999971, y: 3} - - {x: 16, y: 2.999971} - - {x: 16.000029, y: 1} - - {x: 58.99997, y: 1} - {x: 58.99997, y: 3} - {x: 52, y: 2.999971} - {x: 52.00003, y: 1} + - - {x: 24.999971, y: 1} + - {x: 24.999971, y: 3} + - {x: 16, y: 2.999971} + - {x: 16.000029, y: 1} - - {x: 226.99998, y: 1} - {x: 226.99998, y: 2} - {x: 226, y: 1.9999708} @@ -4683,10 +4749,6 @@ CompositeCollider2D: - {x: 99.99998, y: 1.00001} - {x: 93.999985, y: 0.9999748} - {x: 94.00002, y: -1.00001} - - - {x: 174.99997, y: -2} - - {x: 174.99997, y: 1} - - {x: 167, y: 0.99997073} - - {x: 167.00003, y: -2} - - {x: 215.99997, y: -6} - {x: 215.99997, y: -4} - {x: 215.00002, y: -3.9999704} @@ -4717,18 +4779,22 @@ CompositeCollider2D: - {x: 185.99997, y: -3} - {x: 177, y: -3.0000293} - {x: 177.00003, y: -6} + - - {x: 174.99997, y: -2} + - {x: 174.99997, y: 1} + - {x: 167, y: 0.99997073} + - {x: 167.00003, y: -2} - - {x: 165.99997, y: -14} - {x: 165.99997, y: -4} - {x: 164, y: -4.000029} - {x: 164.00003, y: -14} - - - {x: 226.99998, y: -6} - - {x: 226.99998, y: -5} - - {x: 226, y: -5.000029} - - {x: 226.00003, y: -6} - - {x: 142.99997, y: -7} - {x: 142.99997, y: -5} - {x: 141, y: -5.000029} - {x: 141.00003, y: -7} + - - {x: 226.99998, y: -6} + - {x: 226.99998, y: -5} + - {x: 226, y: -5.000029} + - {x: 226.00003, y: -6} - - {x: 115.99998, y: -11} - {x: 115.99998, y: -8} - {x: 113, y: -8.00003} @@ -4761,18 +4827,10 @@ CompositeCollider2D: - {x: 177.99997, y: -12} - {x: 173, y: -12.00003} - {x: 173.00003, y: -14} - - - {x: 150.99997, y: -15} - - {x: 150.99997, y: -13} - - {x: 149, y: -13.00003} - - {x: 149.00003, y: -15} - - {x: 131.99997, y: -15} - {x: 131.99997, y: -13} - {x: 124, y: -13.00003} - {x: 124.00003, y: -15} - - - {x: 113.99998, y: -15} - - {x: 113.99998, y: -13} - - {x: 105, y: -13.00003} - - {x: 105.00003, y: -15} - - {x: -9.00003, y: -16} - {x: -8.99997, y: -15} - {x: -5, y: -14.999971} @@ -4785,6 +4843,14 @@ CompositeCollider2D: - {x: -13.999971, y: -15} - {x: -10, y: -15.000029} - {x: -9.99997, y: -16} + - - {x: 150.99997, y: -15} + - {x: 150.99997, y: -13} + - {x: 149, y: -13.00003} + - {x: 149.00003, y: -15} + - - {x: 113.99998, y: -15} + - {x: 113.99998, y: -13} + - {x: 105, y: -13.00003} + - {x: 105.00003, y: -15} - - {x: 226.99998, y: -15} - {x: 226.99998, y: -14} - {x: 226, y: -14.000029} @@ -4817,42 +4883,42 @@ CompositeCollider2D: - {x: 171.99997, y: -17} - {x: 164, y: -17.000029} - {x: 164.00003, y: -20} - - - {x: 53.99997, y: -20} - - {x: 53.99997, y: -18} - - {x: 52, y: -18.000029} - - {x: 52.00003, y: -20} - - - {x: 58.99997, y: -20} - - {x: 58.99997, y: -18} - - {x: 57, y: -18.000029} - - {x: 57.000034, y: -20} - - - {x: 98.99997, y: -20} - - {x: 98.99997, y: -18} - - {x: 93, y: -18.000029} - - {x: 93.00003, y: -20} - - - {x: 63.99997, y: -20} - - {x: 63.99997, y: -18} - - {x: 62, y: -18.000029} - - {x: 62.000034, y: -20} - - - {x: 68.99997, y: -20} - - {x: 68.99997, y: -18} - - {x: 67, y: -18.000029} - - {x: 67.00003, y: -20} - - - {x: 73.99997, y: -20} - - {x: 73.99997, y: -18} - - {x: 72, y: -18.000029} - - {x: 72.00003, y: -20} - - - {x: 78.99997, y: -20} - - {x: 78.99997, y: -18} - - {x: 77, y: -18.000029} - - {x: 77.00003, y: -20} - - - {x: 83.99997, y: -20} - - {x: 83.99997, y: -18} - - {x: 82, y: -18.000029} - - {x: 82.00003, y: -20} - - {x: 110.99998, y: -20} - {x: 110.99998, y: -18} - {x: 102, y: -18.000029} - {x: 102.00003, y: -20} + - - {x: 98.99997, y: -20} + - {x: 98.99997, y: -18} + - {x: 93, y: -18.000029} + - {x: 93.00003, y: -20} + - - {x: 53.99997, y: -20} + - {x: 53.99997, y: -18} + - {x: 52, y: -18.000029} + - {x: 52.00003, y: -20} + - - {x: 83.99997, y: -20} + - {x: 83.99997, y: -18} + - {x: 82, y: -18.000029} + - {x: 82.00003, y: -20} + - - {x: 78.99997, y: -20} + - {x: 78.99997, y: -18} + - {x: 77, y: -18.000029} + - {x: 77.00003, y: -20} + - - {x: 73.99997, y: -20} + - {x: 73.99997, y: -18} + - {x: 72, y: -18.000029} + - {x: 72.00003, y: -20} + - - {x: 68.99997, y: -20} + - {x: 68.99997, y: -18} + - {x: 67, y: -18.000029} + - {x: 67.00003, y: -20} + - - {x: 63.99997, y: -20} + - {x: 63.99997, y: -18} + - {x: 62, y: -18.000029} + - {x: 62.000034, y: -20} + - - {x: 58.99997, y: -20} + - {x: 58.99997, y: -18} + - {x: 57, y: -18.000029} + - {x: 57.000034, y: -20} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1168076125 @@ -36159,15 +36225,6 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 - - first: {x: 66, y: 27, z: 0} - second: - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - first: {x: 77, y: 27, z: 0} second: m_TileIndex: 13 @@ -46693,7 +46750,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 512 m_Data: {fileID: 11400000, guid: b98293ab7079f3946af95fe3be8f180f, type: 2} - - m_RefCount: 64 + - m_RefCount: 63 m_Data: {fileID: 11400000, guid: dc76772538c87ba458001f32837928d8, type: 2} - m_RefCount: 11 m_Data: {fileID: 11400000, guid: 1ee6b2c7cac195443bfce27e445dcfa1, type: 2} @@ -46761,7 +46818,7 @@ Tilemap: - m_RefCount: 512 m_Data: {fileID: 4953425847005770445, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} - - m_RefCount: 64 + - m_RefCount: 63 m_Data: {fileID: -5673457028595952737, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} - m_RefCount: 11 @@ -46858,7 +46915,7 @@ Tilemap: m_Data: {fileID: -4413646081541789752, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} m_TileMatrixArray: - - m_RefCount: 4638 + - m_RefCount: 4637 m_Data: e00: 1 e01: 0 @@ -46877,7 +46934,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 4638 + - m_RefCount: 4637 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -47042,6 +47099,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -47258,7 +47330,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.5, y: -2, z: 0} + m_LocalPosition: {x: 178, y: 8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -47403,6 +47475,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -47677,8 +47759,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: 1067504601 + m_SortingLayer: -1 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: e33008ddf5593464c90eced40f3f28e8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -47873,6 +47955,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -48003,6 +48095,16 @@ PrefabInstance: propertyPath: m_Color.b value: 1 objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x @@ -48122,6 +48224,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -48155,12 +48272,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 64.76 + value: 62.25 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 14.07 + value: 13.71 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} From da15566f31c7381dcd306106ac5b6457d82bb834 Mon Sep 17 00:00:00 2001 From: chyknkat Date: Sun, 2 Feb 2020 10:35:28 -0500 Subject: [PATCH 3/3] add fight sounds --- Assets/Resources/Audio/Eat.ogg | Bin 0 -> 21137 bytes Assets/Resources/Audio/Eat.ogg.meta | 22 +++++++++++++++++ Assets/Resources/Audio/HardPunch.ogg | Bin 0 -> 6281 bytes Assets/Resources/Audio/HardPunch.ogg.meta | 22 +++++++++++++++++ Assets/Resources/Audio/HardSlap.ogg | Bin 0 -> 6655 bytes Assets/Resources/Audio/HardSlap.ogg.meta | 22 +++++++++++++++++ Assets/Resources/Audio/Punch.ogg | Bin 0 -> 6179 bytes Assets/Resources/Audio/Punch.ogg.meta | 22 +++++++++++++++++ Assets/Resources/Audio/Slap.ogg | Bin 0 -> 6376 bytes Assets/Resources/Audio/Slap.ogg.meta | 22 +++++++++++++++++ Assets/Scenes/LevelOne.unity | 6 ++--- Assets/Scripts/EventControls.cs | 2 +- Assets/Scripts/Player.cs | 25 +++++++++++++++++-- Assets/Scripts/SoundManagerScript.cs | 28 +++++++++++++++++++++- 14 files changed, 164 insertions(+), 7 deletions(-) create mode 100644 Assets/Resources/Audio/Eat.ogg create mode 100644 Assets/Resources/Audio/Eat.ogg.meta create mode 100644 Assets/Resources/Audio/HardPunch.ogg create mode 100644 Assets/Resources/Audio/HardPunch.ogg.meta create mode 100644 Assets/Resources/Audio/HardSlap.ogg create mode 100644 Assets/Resources/Audio/HardSlap.ogg.meta create mode 100644 Assets/Resources/Audio/Punch.ogg create mode 100644 Assets/Resources/Audio/Punch.ogg.meta create mode 100644 Assets/Resources/Audio/Slap.ogg create mode 100644 Assets/Resources/Audio/Slap.ogg.meta diff --git a/Assets/Resources/Audio/Eat.ogg b/Assets/Resources/Audio/Eat.ogg new file mode 100644 index 0000000000000000000000000000000000000000..96d45819526ad1b1438acd09353b82079be448f7 GIT binary patch literal 21137 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 B;@kiL literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/Eat.ogg.meta b/Assets/Resources/Audio/Eat.ogg.meta new file mode 100644 index 0000000..aee8605 --- /dev/null +++ b/Assets/Resources/Audio/Eat.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 969fb43c02f3e464c8e0907e44dc946c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardPunch.ogg b/Assets/Resources/Audio/HardPunch.ogg new file mode 100644 index 0000000000000000000000000000000000000000..992a534e8bdd4cb1ee116a817bac420ec7ccc9ea GIT binary patch literal 6281 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/HardPunch.ogg.meta b/Assets/Resources/Audio/HardPunch.ogg.meta new file mode 100644 index 0000000..4252a56 --- /dev/null +++ b/Assets/Resources/Audio/HardPunch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3095e099213c73c4182d9feeae77ebbd +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardSlap.ogg b/Assets/Resources/Audio/HardSlap.ogg new file mode 100644 index 0000000000000000000000000000000000000000..45be62817c00523b830cc8258a34afa8135e60eb GIT binary patch literal 6655 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/HardSlap.ogg.meta b/Assets/Resources/Audio/HardSlap.ogg.meta new file mode 100644 index 0000000..7f9b79d --- /dev/null +++ b/Assets/Resources/Audio/HardSlap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 292f0e8e04642864daaf315efade99c7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Punch.ogg b/Assets/Resources/Audio/Punch.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9c8b8b7a6d96489e4704429da2c05d1dde64633b GIT binary patch literal 6179 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 literal 0 HcmV?d00001 diff --git a/Assets/Resources/Audio/Punch.ogg.meta b/Assets/Resources/Audio/Punch.ogg.meta new file mode 100644 index 0000000..5877632 --- /dev/null +++ b/Assets/Resources/Audio/Punch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 33e618f5ded88f7449cf8c6b88e71c8f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Slap.ogg b/Assets/Resources/Audio/Slap.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d0169abb56795a1318afe85e6202d3ab00199631 GIT binary patch literal 6376 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 @@ -73,6 +75,7 @@ public class Player : MonoBehaviour if (coll.gameObject.tag == "Pizza") { Destroy(coll.gameObject); + SoundManagerScript.PlaySound("eat"); currentHealth += currentHealth < startHealth ? 1 : 0; healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); } @@ -111,7 +114,7 @@ public class Player : MonoBehaviour Run(); FlipSprite(); } - + PlayFightSound(); HandleAnimations(); } @@ -216,20 +219,38 @@ public class Player : MonoBehaviour animator.SetBool("IsFighting", isFighting); } + private void PlayFightSound() + { + if (isFighting && !isPlayerHurt) + { + SoundManagerScript.PlaySound(GetRandomFightClipName()); + } + } + + private string GetRandomFightClipName() + { + var fightClipNames = new List { "punch", "hard punch", "slap", "hard slap" }; + var randomNumber = UnityEngine.Random.Range(0, fightClipNames.Count); + return fightClipNames[randomNumber]; + } + public void StartEncounter() { + isPlayerHurt = false; isFighting = true; isMovementEnabled = false; } public void EndEncounter() { + isPlayerHurt = false; isFighting = false; isMovementEnabled = true; } public void ThrowUserInTheAirHurt() - { + { + isPlayerHurt = true; GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); } } diff --git a/Assets/Scripts/SoundManagerScript.cs b/Assets/Scripts/SoundManagerScript.cs index 8964c0f..7b13777 100644 --- a/Assets/Scripts/SoundManagerScript.cs +++ b/Assets/Scripts/SoundManagerScript.cs @@ -5,7 +5,9 @@ using UnityEngine; public class SoundManagerScript : MonoBehaviour { - public static AudioClip jumpSound, screamSound, wrongButtonSound, bugLaughSound, drinkSound; + public static AudioClip jumpSound, screamSound, wrongButtonSound, + bugLaughSound, drinkSound, eatSound, punchSound, hardPunchSound, + slapSound, hardSlapSound, winSound; static AudioSource audioSrc; // Start is called before the first frame update @@ -16,6 +18,11 @@ public class SoundManagerScript : MonoBehaviour wrongButtonSound = Resources.Load("Audio/WrongButton"); bugLaughSound = Resources.Load("Audio/BugLaugh"); drinkSound = Resources.Load("Audio/Drink"); + eatSound = Resources.Load("Audio/Eat"); + punchSound = Resources.Load("Audio/Punch"); + hardPunchSound = Resources.Load("Audio/HardPunch"); + slapSound = Resources.Load("Audio/Slap"); + hardSlapSound = Resources.Load("Audio/HardSlap"); audioSrc = GetComponent(); } @@ -45,6 +52,25 @@ public class SoundManagerScript : MonoBehaviour case "drink": audioSrc.PlayOneShot(drinkSound); break; + case "eat": + audioSrc.PlayOneShot(eatSound); + break; + case "punch": + audioSrc.PlayOneShot(punchSound); + break; + case "hard punch": + audioSrc.PlayOneShot(hardPunchSound); + break; + case "slap": + audioSrc.PlayOneShot(slapSound); + break; + case "hard slap": + audioSrc.PlayOneShot(hardSlapSound); + break; + case "win": + audioSrc.PlayOneShot(winSound); + break; + } } }