fix conflicts

Assets/ParallaxBackground.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ParallaxBackground : MonoBehaviour
+{
+    public Camera camera;
+    public SpriteRenderer renderer;
+    public Vector2 scrollRate = Vector2.one * .4f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        //var currentPos = 
+
+        //var offset = new Vector3(8f, -7.5f, 0f);
+
+        //renderer.transform.position = camera.transform.position + ((camera.transform.position * new Vector3(scrollRate.x, scrollRate.y, 0f)) - offset);
+
+    }
+}

Assets/ParallaxBackground.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af4fa3c5d20488d4fa39fb11819d3f97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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_Sprite: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6,
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
+    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

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<Collider2D>(), 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;
+    }
 }

Assets/Scripts/EventControls.cs

@@ -13,11 +13,19 @@ public class EventControls : MonoBehaviour
     [SerializeField] private List<Tile> successTiles;
     [SerializeField] private List<Tile> 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<BugMovement>()
+                                                         .eventTriggerCount;
+    private int maxNumberOfControlTiles => currentEnemyCollider.gameObject
+                                                               .GetComponent<BugMovement>()
+                                                               .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<SpriteRenderer>().enabled = false;
+        enemyCollider.gameObject.GetComponent<BugMovement>().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<SpriteRenderer>().enabled = true;
+            currentEnemyCollider.gameObject.GetComponent<BugMovement>().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<SpriteRenderer>().enabled = true;
+            currentEnemyCollider.gameObject.GetComponent<BugMovement>().EnableMovement();
+            player.EndEncounter();
+
             SoundManagerScript.PlaySound("bug laugh");
             return;
         }
@@ -206,16 +242,26 @@ public class EventControls : MonoBehaviour
             eventDrawn = false;
             numberOfControlTilesSet = 0;
 
-            if (currentEnemyCollider != null)
+            if (maxNumberOfControlTiles == numberOfEventsCount)
-                Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
-            if (!isInBattle)
             {
-                currentEnemyCollider.gameObject.GetComponent<SpriteRenderer>().enabled = true;
+                if (currentEnemyCollider != null && hasFailed)
-                player.EndEncounter();
+                    Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
-            }
 
-            currentPlayerCollider = null;
+                numberOfEventsCount = 0;
-            currentEnemyCollider = null;
+                currentPlayerCollider = null;
+                currentEnemyCollider = null;
+            }
+            else
+            {
+                eventTriggered = true && !hasFailed;
+                isInBattle = true && !hasFailed;
+
+                if (hasFailed)
+                {
+                    if (currentEnemyCollider != null)
+                        Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
+                }
+            }
         }
         else
         {

Assets/Scripts/Player.cs

@@ -20,6 +20,7 @@ public class Player : MonoBehaviour
 
     private int currentHealth;
     private int currentStamina;
+    private float staminaInitialSize;
 
     [SerializeField] private SpriteRenderer healthBar;
     [SerializeField] private SpriteRenderer staminaBar;
@@ -37,10 +38,11 @@ public class Player : MonoBehaviour
         rigidBody = GetComponent<Rigidbody2D>();
         collider = GetComponent<Collider2D>();
         animator = GetComponent<Animator>();
-        currentHealth = startHealth;
+        currentHealth = 1; // startHealth;
-        currentStamina = startStamina;
+        currentStamina = 50; // startStamina;
         healthBar.size = new Vector2(1.5f * startHealth, healthBar.size.y);
-        staminaBar.size = new Vector2(staminaBar.size.x, staminaBar.size.y);
+        staminaInitialSize = staminaBar.size.x;
+        staminaBar.size = new Vector2(staminaInitialSize * 0.5f, staminaBar.size.y);
     }
 
     private void Update()
@@ -91,7 +93,8 @@ public class Player : MonoBehaviour
         SoundManagerScript.PlaySound("drink");
         int result = currentStamina + GetStaminaValueChange(coffeValuePercent);
         currentStamina = result < startStamina ? result : startStamina;
-        staminaBar.size = new Vector2(staminaBar.size.x * (currentStamina/startStamina), staminaBar.size.y);
+        float multiplier = currentStamina * 1f / startStamina;
+        staminaBar.size = new Vector2(staminaInitialSize * multiplier, staminaBar.size.y);
     }
 
     private void DecreaseStaminaAfterBugFight()
@@ -252,5 +255,6 @@ public class Player : MonoBehaviour
     { 
         isPlayerHurt = true;
         GetComponent<Rigidbody2D>().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity);
+        isFighting = false;
     }
 }

Assets/ScrollingBackg.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ScrollingBackg : MonoBehaviour
+{
+    public Camera camera;
+    public SpriteRenderer renderer;
+    public Vector2 scrollSpeed = Vector2.one * .4f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/ScrollingBackg.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ff168e2e79b136b49af5cf60184c3beb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/JackBug.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b023c58ea08aa34ea839129af31dd13
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/JackBug/JackBug.anim

@@ -0,0 +1,81 @@
+%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: JackBug
+  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: -6315775801511994756, guid: 62b02404473a1014f8c946f474c39aa9,
+        type: 3}
+    - time: 0.041666668
+      value: {fileID: -3561603837911761464, guid: 62b02404473a1014f8c946f474c39aa9,
+        type: 3}
+    - time: 0.083333336
+      value: {fileID: 6173932278859950237, guid: 62b02404473a1014f8c946f474c39aa9,
+        type: 3}
+    - time: 0.125
+      value: {fileID: 5496410575213593405, guid: 62b02404473a1014f8c946f474c39aa9,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 24
+  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: -6315775801511994756, guid: 62b02404473a1014f8c946f474c39aa9, type: 3}
+    - {fileID: -3561603837911761464, guid: 62b02404473a1014f8c946f474c39aa9, type: 3}
+    - {fileID: 6173932278859950237, guid: 62b02404473a1014f8c946f474c39aa9, type: 3}
+    - {fileID: 5496410575213593405, guid: 62b02404473a1014f8c946f474c39aa9, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    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: []

Assets/Sprites/Enemy/JackBug/JackBug.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb45a4d521d73f1449ef567fc36d2158
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/JackBug/JackBug.png.meta

@@ -0,0 +1,247 @@
+fileFormatVersion: 2
+guid: 62b02404473a1014f8c946f474c39aa9
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -6315775801511994756
+    second: JackBug0
+  - first:
+      213: -3561603837911761464
+    second: JackBug1
+  - first:
+      213: 6173932278859950237
+    second: JackBug2
+  - first:
+      213: 5496410575213593405
+    second: JackBug3
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: JackBug0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 80
+        width: 64
+        height: 80
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: df0b6acabf6cebe48979b0b90c2c7ee7
+      internalID: -6315775801511994756
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: JackBug1
+      rect:
+        serializedVersion: 2
+        x: 64
+        y: 80
+        width: 64
+        height: 80
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 51f64f94fb365714eb6f20962705d03c
+      internalID: -3561603837911761464
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: JackBug2
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 64
+        height: 80
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f376d56f915b1a34f8bdd2f03e1ac513
+      internalID: 6173932278859950237
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: JackBug3
+      rect:
+        serializedVersion: 2
+        x: 64
+        y: 0
+        width: 64
+        height: 80
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f49683fa52dc7f64ba59859428c433b7
+      internalID: 5496410575213593405
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Enemy/JackBug/JackBugAnim.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-9016985254151537076
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -1397233909873710916}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -1397233909873710916}
+--- !u!1102 &-1397233909873710916
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: JackBug
+  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: fb45a4d521d73f1449ef567fc36d2158, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: JackBugAnim
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -9016985254151537076}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}

Assets/Sprites/Enemy/JackBug/JackBugAnim.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fd65b2863cc560a40b6ad3af267aac55
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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,6 +139,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-2394224690546515301
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsFighting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-880235167412170940
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -164,31 +189,6 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &-1637549219293370904
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 1
-    m_ConditionEvent: IsHurt
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 3898215635428985453}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -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

ProjectSettings/TagManager.asset

@@ -46,3 +46,6 @@ TagManager:
   - name: Default
     uniqueID: 0
     locked: 0
+  - name: Stats
+    uniqueID: 4179335367
+    locked: 0