Merge branch 'main' into animation

Assets/Prefabs/Player.prefab

@@ -16,7 +16,7 @@ GameObject:
   - component: {fileID: 7763498473808654306}
   - component: {fileID: 3659140714710275197}
   - component: {fileID: 9133098163257611752}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Player
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -233,7 +233,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3937090937419967315}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b88e05c37f07ccf48bcc436a9d7def5d, type: 3}
   m_Name: 
@@ -251,7 +251,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5569302833446856119}
   - component: {fileID: 6635970933810939283}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: HoldLocation
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/Treat.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 1016927753207964800}
   - component: {fileID: 2635922278447379203}
   - component: {fileID: 6828521680597590390}
-  m_Layer: 0
+  m_Layer: 7
   m_Name: Treat
   m_TagString: Interactable
   m_Icon: {fileID: 0}

Assets/Prefabs/Trick.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 700000003}
   - component: {fileID: 700000004}
   - component: {fileID: 700000005}
-  m_Layer: 0
+  m_Layer: 3
   m_Name: Trick
   m_TagString: Interactable
   m_Icon: {fileID: 0}
@@ -110,7 +110,7 @@ Rigidbody2D:
   m_LinearDamping: 0
   m_AngularDamping: 0.05
   m_GravityScale: 0
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -131,7 +131,7 @@ BoxCollider2D:
   m_Enabled: 1
   serializedVersion: 3
   m_Density: 1
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 71737e52316f484b8c59e24137491385, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
     m_Bits: 0
@@ -184,4 +184,20 @@ MonoBehaviour:
   targetRefreshInterval: 0.4
   consumeDistance: 0.35
   wanderInterval: 1.2
+  consumeCooldown: 3
   trickPrefab: {fileID: 700000005}
+  avoidPlayerRadius: 0
+  avoidTrickRadius: 0
+  treatSeekWeight: 1
+  wanderWeight: 0.4
+  maxTricks: 50
+  jumpImpulse: 6
+  jumpCooldown: 1
+  jumpChancePerSecond: 0.5
+  groundMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  groundCheckDistance: 0.05
+  despawnMinX: -12
+  despawnMaxX: 12
+  despawnMinY: -10