머지함

Assets/Animation/Player/Player animator.controller

@@ -564,7 +564,7 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0

Assets/Prefabs/TetrisMap/PlayerIcon.prefab

@@ -34,7 +34,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1704656476422024}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 48, y: 0, z: -2}
+  m_LocalPosition: {x: 96, y: 0, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

Assets/Scenes/PlayScene.unity

@@ -997,6 +997,11 @@ Prefab:
       value: 
       objectReference: {fileID: 11400000, guid: b556ab3a4d3d2db4b89081d94cca006c,
         type: 2}
+    - target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
+        type: 2}
+      propertyPath: timeToFallTetrimino
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
   m_IsPrefabAsset: 0

Assets/Scripts/Characters/PlayerController.cs

@@ -116,12 +116,12 @@ public class PlayerController : MonoBehaviour
 
         if (GameManager.gameState == GameState.Ingame && MapManager.isDoorWorking != true)
         {
-            /*
+            
             if (playerState == PlayerState.Attack)
             {
-                rb.gravityScale = rb.velocity.y < 0 ? rbAttackGravityScale : rbGravityScale;
+                rb.gravityScale = rbGravityScale;
             }
-            */
+            
             if (isGrounded)
                 isJumpable = true;
             if (playerState != PlayerState.Attack)
@@ -230,7 +230,6 @@ public class PlayerController : MonoBehaviour
             float xVelocity = rb.velocity.x;
             float yVelocity = rb.velocity.y;
             float airResistance = isGrounded ? 1f : 0.5f;
-            playerState = PlayerState.Idle;
             float direction = Mathf.Sign(xVelocity);
             xVelocity = Mathf.Abs(xVelocity) - deceleration * airResistance * Time.fixedDeltaTime;
             if (xVelocity < 0) xVelocity = 0;