Merge branch 'jakubsz'

Assets/Animations/MainCharacter/WalkDown.anim

@@ -76,12 +76,10 @@ AnimationClip:
   - curve:
     - time: 0
       value: {fileID: 5523046169430618816, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
-    - time: 0.083333336
-      value: {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
     - time: 0.16666667
-      value: {fileID: -5084081418433795573, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
-    - time: 0.25
       value: {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
+    - time: 0.33333334
+      value: {fileID: -5084081418433795573, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -111,13 +109,12 @@ AnimationClip:
     - {fileID: 5523046169430618816, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
     - {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
     - {fileID: -5084081418433795573, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
-    - {fileID: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.33333334
+    m_StopTime: 0.4166667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Resources/ThePlayer.prefab

@@ -113,7 +113,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 840a82f054869244b832426e6b6022bd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  walkSpeed: 5.5
+  walkSpeed: 4
   Panel: {fileID: 0}
   dmgParticleSystem: {fileID: 4869648843387222763}
   maxHealth: {fileID: 11400000, guid: 2cac7af95874b184aae736e0ed4994d7, type: 2}

Assets/Scripts/Chest/ChestController.cs

@@ -43,6 +43,8 @@ public class ChestController : BaseWarehouseController
                 EquipmentManager.Instance.OpenPanel();
             }
         }
+        
+
 
     }
 

Assets/Scripts/Equipment/EquipmentPanelController.cs

@@ -62,4 +62,5 @@ public class EquipmentPanelController : BasePanelController
 
         return tmp;
     }
+    
 }

Assets/Scripts/Player.cs

@@ -92,18 +92,19 @@ public class  Player : MonoBehaviour
 
     private void HandleAttacks()
     {
-        if (attackSword)
-        {
-            myAnimator.SetTrigger("attack");
-        }
-        if (attackFist)
-        {
-            myAnimator.SetTrigger("attackFist");
-        }
-        if (pickaxeInUse)
+        if (EquipmentManager.Instance._weapon.Name.Equals("pickaxe_test") && attackSword)
         {
             myAnimator.SetTrigger("pickaxe");
         }
+        else if (attackSword && EquipmentManager.Instance._weapon.Name.Equals("Basic_Sword"))
+        {
+            myAnimator.SetTrigger("attack");
+        }
+        else if (attackFist)
+        {
+            myAnimator.SetTrigger("attackFist");
+        }
+
     }
 
     private void HandleInput()