Merge remote-tracking branch 'origin/master'

Assets/Resources/SampleScene/Enemies/Thug.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 4006076606190978603}
   - component: {fileID: 4006076606190978602}
   - component: {fileID: 4006076606190978596}
+  - component: {fileID: -6994343827674546408}
   - component: {fileID: 4006076606190978597}
   - component: {fileID: 4006076606190978598}
   - component: {fileID: -5618304694998678869}
@@ -34,7 +35,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 3.6720886, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -50,7 +50,6 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -112,6 +111,22 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 4
+--- !u!58 &-6994343827674546408
+CircleCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4006076606190978600}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: -0.1}
+  serializedVersion: 2
+  m_Radius: 0.7
 --- !u!61 &4006076606190978597
 BoxCollider2D:
   m_ObjectHideFlags: 0
@@ -122,7 +137,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: -0.44218445}
@@ -140,7 +155,7 @@ BoxCollider2D:
   m_EdgeRadius: 0
 --- !u!95 &4006076606190978598
 Animator:
-  serializedVersion: 4
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -153,7 +168,6 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -207,13 +221,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   anim: {fileID: 4006076606190978598}
+  shouldRotate: 0
+  dir: {x: 0, y: 0, z: 0}
   homePosition: {x: 0, y: 0, z: 0}
   targetPosition: {fileID: 0}
   agent: {fileID: 0}
   isDuringFollowing: 0
   approaching: 0
   isAfterAction: 0
-  chasingRadius: 6
+  chasingRadius: 7
   attackingRadius: 1.5
   hit: 0
   firstAttack: 0

Assets/Scripts/REFACTORING/Story/Thugs/ThugNPCFollowing.cs

@@ -133,7 +133,7 @@ public class ThugNPCFollowing : MonoBehaviour
             if (approaching)
             {
                 approaching = false;
-                anim.SetBool("isRunning", false);
+                anim.SetBool("isRunning", true);
                 gameObject.GetComponent<NPC>().State = NPCStateEnum.Walking;
             }
         }
@@ -196,7 +196,9 @@ public class ThugNPCFollowing : MonoBehaviour
             }
             else
             {
+                anim.SetBool("isRunning", false);
                 gameObject.GetComponent<NPC>().State = NPCStateEnum.Pending;
+
             }
         }
     }