머지 완료

Assets/Prefabs/Characters/Player.prefab

@@ -376,11 +376,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a4458b2b5e7c3f842b29e2121f8400ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  spikeTile:
+  spikeTileu:
   - {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
+  - {fileID: 11400000, guid: f9cdf78c8a087c94a9279cc07fc03a25, type: 2}
+  spikeTiled:
   - {fileID: 11400000, guid: f411e29431b787c4ab84b5ff59ca5e6e, type: 2}
+  - {fileID: 11400000, guid: 034d5fb04a013124cb432284fdc8c423, type: 2}
+  spikeTilel:
   - {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
+  - {fileID: 11400000, guid: f6a8681f94ddcf24eac96d8e4a5c82f6, type: 2}
+  spikeTiler:
   - {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
+  - {fileID: 11400000, guid: 69359808565f98f4297a6efb8da5c4da, type: 2}
   rb: {fileID: 0}
   SpikeLayer: 10
   spikeDamage: 5
@@ -457,7 +464,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -2078941185
-  m_SortingLayer: 7
+  m_SortingLayer: 9
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 92d166e0c2a85a14facee45f5a5a8444, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Prefabs/TetrisMap/Tetrimino/Room Tutorial.prefab

@@ -608,7 +608,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: -1129468395
-  m_SortingLayer: 15
+  m_SortingLayer: 14
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: eb608082843dfe247954bc3ccbbe4b2b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -1050,11 +1050,11 @@ Tilemap:
   - m_RefCount: 0
     m_Data:
       e00: 0
-      e01: 47.22432
+      e01: 9.322635
       e02: NaN
       e03: 0
       e10: 0
-      e11: 2.9657898
+      e11: 1.4719009
       e12: NaN
       e13: 0
       e20: 0
@@ -1067,7 +1067,7 @@ Tilemap:
       e33: NaN
   m_TileColorArray:
   - m_RefCount: 0
-    m_Data: {r: 6.6e-44, g: 6.6e-44, b: 6.6e-44, a: 6.6e-44}
+    m_Data: {r: 1.3e-44, g: 1.3e-44, b: 1.3e-44, a: 1.3e-44}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: 0, z: 0}

Assets/Prefabs/UI/Clock.prefab

@@ -126,9 +126,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 76972544344a33b4a970e7e902757457, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  timeToFallTetrimino: 10
+  initialTimeToFallTetrimino: 40
+  timeToFallTetrimino: 40
   tetriminoWaitedTime: 0
   tetriminoCreatedTime: 0
+  clockSpeedStack: 0
 --- !u!222 &222306734366933398
 CanvasRenderer:
   m_ObjectHideFlags: 1

ProjectSettings/TagManager.asset

@@ -54,11 +54,6 @@ TagManager:
   - name: Background
     uniqueID: 2317547663
     locked: 0
-  - name: ItemHighlight
-    uniqueID: 996861525
-    locked: 0
-  - name: Item
-    uniqueID: 2145601713
   - name: Wall
     uniqueID: 3278214247
     locked: 0
@@ -83,6 +78,9 @@ TagManager:
   - name: HPBar
     uniqueID: 338107509
     locked: 0
+  - name: Item
+    uniqueID: 2145601713
+    locked: 0
   - name: Effect
     uniqueID: 2841314395
     locked: 0