싹다 머지함

Assets/Prefabs/Characters/Player.prefab

@@ -26,6 +26,7 @@ GameObject:
   - component: {fileID: 114906702720267008}
   - component: {fileID: 95992411616135034}
   - component: {fileID: 114880704145925944}
+  - component: {fileID: 114574072693989902}
   - component: {fileID: 82529156342294766}
   m_Layer: 0
   m_Name: Player
@@ -59,7 +60,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1623439448163086}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.56, y: 0.08, z: 0}
+  m_LocalPosition: {x: -5.64, y: 1.8, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4710911479571038}
@@ -361,6 +362,27 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 0
   attackCombo: 
+--- !u!114 &114574072693989902
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1623439448163086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a4458b2b5e7c3f842b29e2121f8400ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  spikeTile:
+  - {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a, type: 2}
+  - {fileID: 11400000, guid: f411e29431b787c4ab84b5ff59ca5e6e, type: 2}
+  - {fileID: 11400000, guid: 85440e0dd81e48840947ce485614bab6, type: 2}
+  - {fileID: 11400000, guid: 7dbb7c55a3417f54fbd38fafb369478e, type: 2}
+  rb: {fileID: 0}
+  SpikeLayer: 10
+  spikeDamage: 5
+  spikeKnockBackx: 8
+  spikeKnockBacky: 8
 --- !u!114 &114880704145925944
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -387,7 +409,6 @@ MonoBehaviour:
   - {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
   - {fileID: 7400000, guid: b7ca0c87c2a73cb4e939b4d06abd4217, type: 2}
   - {fileID: 7400000, guid: 9133e696bcae7294c86f6702b20b4ae7, type: 2}
-  lifeStoneManager: {fileID: 0}
 --- !u!114 &114906702720267008
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/MapManager.prefab

@@ -132,7 +132,7 @@ MonoBehaviour:
   - {fileID: 114453972306455548, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
   - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
   - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
-  - {fileID: 114792926073732986, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
+  - {fileID: 114792926073732986, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
   - {fileID: 114844722971494232, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
   specialRoomList2:
   - {fileID: 114330503780891850, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
@@ -143,7 +143,7 @@ MonoBehaviour:
   - {fileID: 114453972306455548, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
   - {fileID: 114384035641513528, guid: a2dadbc92c7cc7e449233fae6430dee7, type: 2}
   - {fileID: 114704192105535744, guid: a121f45347e4c3d4faf83b4e681c84f0, type: 2}
-  - {fileID: 114792926073732986, guid: 0443c2e9410bbe545bda40dc30fa6a63, type: 2}
+  - {fileID: 114792926073732986, guid: 7b5317162788b8d4daa13ea5c6dd368b, type: 2}
   - {fileID: 114844722971494232, guid: 4643eac2d148bd146be89238dcdfa419, type: 2}
   roomSurfaceSprite1:
   - {fileID: 21300000, guid: 5e6d29c00a95b8140a33c81d93aac0b2, type: 3}

Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-1.prefab

@@ -11,51 +11,6 @@ Prefab:
   m_SourcePrefab: {fileID: 0}
   m_RootGameObject: {fileID: 1915452461634262}
   m_IsPrefabAsset: 1
---- !u!1 &1007840319863528
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4546795586742468}
-  m_Layer: 0
-  m_Name: enemy spot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1124637384100458
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4334623205686684}
-  m_Layer: 0
-  m_Name: Location
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!1 &1276568354572690
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4054145534218116}
-  m_Layer: 0
-  m_Name: Goblin
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1306147373330598
 GameObject:
   m_ObjectHideFlags: 0
@@ -87,6 +42,7 @@ GameObject:
   - component: {fileID: 8195094280011915956}
   - component: {fileID: 3664157344941130292}
   - component: {fileID: 50294503223574562}
+  - component: {fileID: 66378690533730962}
   - component: {fileID: 2113883504902801176}
   m_Layer: 9
   m_Name: rope
@@ -95,21 +51,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1646302870988242
-GameObject:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4372487440442684}
-  m_Layer: 0
-  m_Name: Location (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &1657725642800636
 GameObject:
   m_ObjectHideFlags: 0
@@ -183,21 +124,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4054145534218116
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1276568354572690}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4334623205686684}
-  - {fileID: 4372487440442684}
-  m_Father: {fileID: 4546795586742468}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4152337674201398
 Transform:
   m_ObjectHideFlags: 1
@@ -224,46 +150,6 @@ Transform:
   m_Father: {fileID: 4874486600194970}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4334623205686684
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1124637384100458}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.5, y: 9, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4054145534218116}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4372487440442684
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1646302870988242}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 2.5, y: 17, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 4054145534218116}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &4546795586742468
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1007840319863528}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 4054145534218116}
-  m_Father: {fileID: 4874486600194970}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4557338679182532
 Transform:
   m_ObjectHideFlags: 1
@@ -305,7 +191,6 @@ Transform:
   - {fileID: 4925861857805118}
   - {fileID: 4802276979595092}
   - {fileID: 4152337674201398}
-  - {fileID: 4546795586742468}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -402,6 +287,76 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
+--- !u!66 &66378690533730962
+CompositeCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1432143927125218}
+  m_Enabled: 0
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_GeometryType: 0
+  m_GenerationType: 0
+  m_EdgeRadius: 0
+  m_ColliderPaths:
+  - m_Collider: {fileID: 2113883504902801176}
+    m_ColliderPaths:
+    - - X: 75937504
+        Y: 210000000
+      - X: 74062496
+        Y: 210000000
+      - X: 74062496
+        Y: 130000000
+      - X: 75937504
+        Y: 130000000
+    - - X: 165937504
+        Y: 210000000
+      - X: 164062496
+        Y: 210000000
+      - X: 164062496
+        Y: 130000000
+      - X: 165937504
+        Y: 130000000
+    - - X: 55937500
+        Y: 110000000
+      - X: 54062500
+        Y: 110000000
+      - X: 54062500
+        Y: 30000000
+      - X: 55937500
+        Y: 30000000
+    - - X: 185937504
+        Y: 110000000
+      - X: 184062496
+        Y: 110000000
+      - X: 184062496
+        Y: 30000000
+      - X: 185937504
+        Y: 30000000
+  m_CompositePaths:
+    m_Paths:
+    - - {x: 7.5937505, y: 21}
+      - {x: 7.4062495, y: 21}
+      - {x: 7.4062495, y: 13}
+      - {x: 7.5937505, y: 13}
+    - - {x: 16.59375, y: 21}
+      - {x: 16.40625, y: 21}
+      - {x: 16.40625, y: 13}
+      - {x: 16.59375, y: 13}
+    - - {x: 5.59375, y: 11}
+      - {x: 5.40625, y: 11}
+      - {x: 5.40625, y: 3}
+      - {x: 5.59375, y: 3}
+    - - {x: 18.59375, y: 11}
+      - {x: 18.40625, y: 11}
+      - {x: 18.40625, y: 3}
+      - {x: 18.59375, y: 3}
+  m_VertexDistance: 0.0005
 --- !u!66 &66470208273812638
 CompositeCollider2D:
   m_ObjectHideFlags: 1
@@ -668,7 +623,9 @@ CompositeCollider2D:
   m_GeometryType: 0
   m_GenerationType: 0
   m_EdgeRadius: 0
-  m_ColliderPaths: []
+  m_ColliderPaths:
+  - m_Collider: {fileID: 2113883506471071274}
+    m_ColliderPaths: []
   m_CompositePaths:
     m_Paths: []
   m_VertexDistance: 0.0005

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: 72, y: 0, z: -2}
+  m_LocalPosition: {x: 0, y: 0, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

Assets/Scenes/PlayScene.unity

@@ -403,12 +403,121 @@ Prefab:
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1623439448163086, guid: 3d077a5f727dd1e4780e9265ed26e036,
     type: 2}
-  m_PrefabInternal: {fileID: 1618052740}
+  m_PrefabInternal: {fileID: 650104063}
+--- !u!1001 &579652633
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -6.9766555
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 2.569394
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.0049343775
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4281661761445894, guid: 7fec52078de87f74abe791494596a804, type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 114772635349595938, guid: 7fec52078de87f74abe791494596a804,
+        type: 2}
+      propertyPath: frameSuper
+      value: 
+      objectReference: {fileID: 705690561}
+    - target: {fileID: 114772635349595938, guid: 7fec52078de87f74abe791494596a804,
+        type: 2}
+      propertyPath: stoneSuper
+      value: 
+      objectReference: {fileID: 871841152}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7fec52078de87f74abe791494596a804, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!223 &647962947 stripped
 Canvas:
   m_CorrespondingSourceObject: {fileID: 223237664237935382, guid: 692aad2449e06054799ea4706578fb23,
     type: 2}
   m_PrefabInternal: {fileID: 467942570}
+--- !u!1001 &650104063
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -5.64
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+        type: 2}
+      propertyPath: time
+      value: 
+      objectReference: {fileID: 1930185415}
+    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+        type: 2}
+      propertyPath: combo
+      value: 
+      objectReference: {fileID: 1200867968}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+  m_IsPrefabAsset: 0
+--- !u!1 &705690561 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1820862295034228, guid: c179f0931cfabec428a868a6edc543b0,
+    type: 2}
+  m_PrefabInternal: {fileID: 1711972807}
 --- !u!1001 &781926695
 Prefab:
   m_ObjectHideFlags: 0
@@ -448,16 +557,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 9
       objectReference: {fileID: 0}
-    - target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
-        type: 2}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 489222433}
-    - target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
-        type: 2}
-      propertyPath: grid
-      value: 
-      objectReference: {fileID: 1244139631}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
   m_IsPrefabAsset: 0
@@ -523,48 +622,11 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &875063812
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4958682140800270, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-      propertyPath: m_RootOrder
-      value: 14
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
-  m_IsPrefabAsset: 0
+--- !u!1 &871841152 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1874721051176178, guid: c179f0931cfabec428a868a6edc543b0,
+    type: 2}
+  m_PrefabInternal: {fileID: 1711972807}
 --- !u!1001 &1001020222
 Prefab:
   m_ObjectHideFlags: 0
@@ -612,6 +674,11 @@ Prefab:
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
   m_IsPrefabAsset: 0
+--- !u!4 &1047338944 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36,
+    type: 2}
+  m_PrefabInternal: {fileID: 1625636644}
 --- !u!1001 &1184292066
 Prefab:
   m_ObjectHideFlags: 0
@@ -665,12 +732,6 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 1939101680453256, guid: c179f0931cfabec428a868a6edc543b0,
     type: 2}
   m_PrefabInternal: {fileID: 1711972807}
---- !u!114 &1206751493 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
-    type: 2}
-  m_PrefabInternal: {fileID: 1711972807}
-  m_Script: {fileID: 11500000, guid: 7fe540ec78947fc449eabc76bd87823d, type: 3}
 --- !u!224 &1209430809 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 224402251087470820, guid: c179f0931cfabec428a868a6edc543b0,
@@ -712,7 +773,8 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 1047338944}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -861,35 +923,6 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224829341147747562, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 224783930886652934, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 224757229482181608, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224137214707512560, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 224951897679109524, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 1560605499280558, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
   m_IsPrefabAsset: 0
@@ -935,117 +968,364 @@ Prefab:
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 95422f3c251e3824daa82317630a81d7, type: 2}
   m_IsPrefabAsset: 0
---- !u!1001 &1618052740
+--- !u!1001 &1625636644
 Prefab:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 1244139631}
     m_Modifications:
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalPosition.x
-      value: -5.64
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalPosition.y
-      value: 1.8
+      value: -20
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4549734214569802, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+    - target: {fileID: 4542814694995438, guid: 29d5569197813594db51adf0d061bc36, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: time
-      value: 
-      objectReference: {fileID: 1930185415}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      propertyPath: m_Tiles.Array.data[0].first.x
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: combo
-      value: 
-      objectReference: {fileID: 1200867968}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      propertyPath: m_Tiles.Array.data[0].first.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: inventoryManager
-      value: 
-      objectReference: {fileID: 2035175000}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      propertyPath: m_Tiles.Array.data[0].second.m_TileIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: lifeStoneManager
-      value: 
-      objectReference: {fileID: 1206751493}
-    - target: {fileID: 114402380471012178, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      propertyPath: m_Tiles.Array.data[0].second.m_TileSpriteIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: damage
-      value: 2
+      propertyPath: m_Tiles.Array.data[0].second.m_TileFlags
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: normalAttack.Array.data[0]
-      value: 
-      objectReference: {fileID: 7400000, guid: b1bf5cd583e214e448b83335f6c2d7a6, type: 2}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      propertyPath: m_Tiles.Array.data[0].second.m_ColliderType
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: normalAttack.Array.data[1]
+      propertyPath: m_TileAssetArray.Array.data[3].m_RefCount
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileAssetArray.Array.data[3].m_Data
       value: 
-      objectReference: {fileID: 7400000, guid: b7ca0c87c2a73cb4e939b4d06abd4217, type: 2}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      objectReference: {fileID: 11400000, guid: 7f2c5cb43ad7207499b22fb5e0acd41a,
+        type: 2}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileSpriteArray.Array.data[3].m_RefCount
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: normalAttack.Array.data[2]
+      propertyPath: m_TileSpriteArray.Array.data[3].m_Data
       value: 
-      objectReference: {fileID: 7400000, guid: 9133e696bcae7294c86f6702b20b4ae7, type: 2}
-    - target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
+      objectReference: {fileID: 21300000, guid: 7ee765cc5330a444db118a031abd5b9e,
+        type: 3}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileMatrixArray.Array.data[0].m_RefCount
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: m_Offset.x
-      value: -0.42
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e00
+      value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: m_Offset.y
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e01
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: m_Size.x
-      value: 0.53
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e02
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: m_Size.y
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e11
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 82529156342294766, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: m_Enabled
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e12
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e22
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 114880704145925944, guid: 3d077a5f727dd1e4780e9265ed26e036,
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e32
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileMatrixArray.Array.data[0].m_Data.e33
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileColorArray.Array.data[0].m_RefCount
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileColorArray.Array.data[0].m_Data.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
         type: 2}
-      propertyPath: originComboTime
+      propertyPath: m_TileColorArray.Array.data[0].m_Data.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileColorArray.Array.data[0].m_Data.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_TileColorArray.Array.data[0].m_Data.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].X
+      value: 60000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[0].Y
+      value: 10000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].X
+      value: 100000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[1].Y
+      value: 10000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].X
+      value: 100000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[2].Y
+      value: 13437500
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].X
+      value: 60000000
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_ColliderPaths.Array.data[0].m_ColliderPaths.Array.data[0].Array.data[3].Y
+      value: 13437500
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[0].y
+      value: 1.34375
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].x
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[1].y
+      value: 1.34375
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].x
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[2].y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 66978878798918320, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_CompositePaths.m_Paths.Array.data[0].Array.data[3].y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].first.x
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].first.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].second.m_TileIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].second.m_TileSpriteIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].second.m_TileFlags
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[1].second.m_ColliderType
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].first.x
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].first.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].second.m_TileIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].second.m_TileSpriteIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].second.m_TileFlags
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[2].second.m_ColliderType
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].first.x
+      value: 9
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].first.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].second.m_TileIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].second.m_TileSpriteIndex
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].second.m_TileFlags
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8195094281083403466, guid: 29d5569197813594db51adf0d061bc36,
+        type: 2}
+      propertyPath: m_Tiles.Array.data[3].second.m_ColliderType
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
+  m_SourcePrefab: {fileID: 100100000, guid: 29d5569197813594db51adf0d061bc36, type: 2}
   m_IsPrefabAsset: 0
 --- !u!1001 &1705825740
 Prefab:
@@ -1195,12 +1475,6 @@ MonoBehaviour:
     type: 2}
   m_PrefabInternal: {fileID: 1001020222}
   m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
---- !u!114 &2035175000 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
-    type: 2}
-  m_PrefabInternal: {fileID: 1705825740}
-  m_Script: {fileID: 11500000, guid: 674793b622d7c184882dfeb8784bbf92, type: 3}
 --- !u!1001 &2042136941
 Prefab:
   m_ObjectHideFlags: 0

Assets/Scripts/CameraController.cs

@@ -32,7 +32,7 @@ public class CameraController : MonoBehaviour {
     // Update is called once per frame
     void LateUpdate()
     {
-        if (GameManager.gameState == GameState.Tutorial || (GameManager.gameState == GameState.Ingame && MapManager.tempRoom == MapManager.currentRoom))
+        if (GameManager.gameState == GameState.Ingame)
         {
             FollowPlayer();
             originPos = transform.position;
@@ -166,22 +166,6 @@ public class CameraController : MonoBehaviour {
                 if (position.x + cameraXLimit >= MapManager.currentRoom.transform.position.x + MapManager.currentRoom.roomInGame.roomSize.x - 1)
                     return MapManager.currentRoom.transform.position.x + MapManager.currentRoom.roomInGame.roomSize.x - 1;
                 break;
-            /*case "Up":
-                if (position.y + cameraYLimit >= MapManager.Instance.tetrisYCoord[(int)MapManager.Instance.currentRoom.mapCoord.y] + 23f)
-                    return MapManager.Instance.tetrisYCoord[(int)MapManager.Instance.currentRoom.mapCoord.y] + 23f;
-                break;
-            case "Down":
-                if (position.y - cameraYLimit <= MapManager.Instance.tetrisYCoord[(int)MapManager.Instance.currentRoom.mapCoord.y] + 1f)
-                    return MapManager.Instance.tetrisYCoord[(int)MapManager.Instance.currentRoom.mapCoord.y] + 1f;
-                break;
-            case "Left":
-                if (position.x - cameraXLimit <= Player.tx * 24f + 1)
-                    return Player.tx * 24f + 1;
-                break;
-            case "Right":
-                if (position.x + cameraXLimit >= (Player.tx + 1) * 24f - 1)
-                    return (Player.tx + 1) * 24f - 1;
-                break;*/
         }
         return -1;
     }

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -77,16 +77,8 @@ public class Enemy : MonoBehaviour {
 
     private void FixedUpdate()
     {
-        bool wallTest = IsTouchingWall();
-        if (wallTest)
-        {
-          //  Debug.Log("Touching wall");
-        }
-        bool cliffTest = IsAdvancingToCliff();
-        if (cliffTest)
-        {
-           // Debug.Log("Advancing to cliff");
-        }
+        PlayerDistance = Vector2.Distance(enemyManager.Player.transform.position, transform.parent.position);
+        CheckCliff(); CheckWall();
     }
 
     // Movement & Physics

Assets/Scripts/Characters/PlayerController.cs

@@ -113,7 +113,7 @@ public class PlayerController : MonoBehaviour
         }
         isGrounded = tmp;
 
-        if (GameManager.gameState == GameState.Tutorial || GameManager.gameState == GameState.Ingame)
+        if (GameManager.gameState == GameState.Ingame)
         {
             if (playerState == PlayerState.Attack)
             {

Assets/Scripts/Enumerators.cs

@@ -61,7 +61,7 @@ public enum PlayerState { Idle, Walk, Run, GoingUp, GoingDown, Rope, Attack }
 /// <summary>
 /// Enum for game's state.
 /// </summary>
-public enum GameState { MainMenu, Ingame, Tutorial, Tetris, Portal, Inventory, Pause, GameOver }
+public enum GameState { MainMenu, Ingame, Tetris, Portal, Inventory, Pause, GameOver }
 /// <summary>
 /// Enum for room types.
 /// </summary>

Assets/Scripts/GameManager.cs

@@ -48,17 +48,19 @@ public class GameManager : Singleton<GameManager> {
 
     void Awake()
     {
-
-    }
-
-    // Use this for initialization
-    void Start () {
-        gameState = GameState.Tutorial;
+        gameState = GameState.Ingame;
         minimap = GameObject.Find("Minimap");
         minimap.SetActive(false);
         MapManager.currentRoom = GameObject.Find("Room Tutorial").GetComponent<Room>();
+        MapManager.currentRoom.roomInGame.transform.Find("Portal").GetComponent<Portal>().isPortalTutorial = true;
         GameObject.Find("Player").transform.position = MapManager.currentRoom.roomInGame.transform.Find("player spot").position + spawnPosition;
         GameObject.Find("Main Camera").transform.position = GameObject.Find("Player").transform.position + new Vector3(0, 0, -1);
+    }
+
+    // Use this for initialization
+    void Start () {
+
+
     }
 	
 	// Update is called once per frame

Assets/Scripts/Item/Addons/CoollyPride.cs

@@ -22,7 +22,7 @@ public class CoollyPride : Addon
         float[] varArray = new float[(int)EnemyDebuffCase.END_POINTER];
         for (int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++) varArray[i] = 0f;
 
-        if (attackInfo.damage < 4) varArray[(int)EnemyDebuffCase.ice] = 2f;
+        if (attackInfo.damage < 4) varArray[(int)EnemyDebuffCase.Ice] = 2f;
 
         return varArray;
     }

Assets/Scripts/Item/Addons/GlowingHerb.cs

@@ -22,7 +22,7 @@ public class GlowingHerb : Addon
         float[] varArray = new float[(int)EnemyDebuffCase.END_POINTER];
         for (int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++) varArray[i] = 0f;
 
-        varArray[(int)EnemyDebuffCase.fire] = 3f;
+        varArray[(int)EnemyDebuffCase.Fire] = 3f;
 
         return varArray;
     }

Assets/Scripts/Item/InventoryUI.cs

@@ -37,7 +37,7 @@ public class InventoryUI : MonoBehaviour {
     public int selectedItem = -1;
     string[] qualityString = new string[4] { "습작", "범작", "수작", "걸작" };
 
-	void Start () {
+	void Awake () {
         items = new GameObject[9];
         addons = new GameObject[9];
         infoAddons = new GameObject[4];

Assets/Scripts/TetrisMap/MapManager.cs

@@ -864,6 +864,8 @@ public class MapManager : Singleton<MapManager> {
         else
             room.GetComponent<SpriteRenderer>().sprite = roomSurfaceSpritesDistributed[room.stage][(int)room.specialRoomType - 1];
         currentRoom = newRoom;
+        playerIcon.transform.parent = currentRoom.transform;
+        MapManager.Instance.playerIcon.transform.localPosition = new Vector3(0, 0, 0);
         StartCoroutine(RoomFadeIn(newRoom));
     }
     /// <summary>
@@ -1183,7 +1185,7 @@ public class MapManager : Singleton<MapManager> {
             {
                 PortalControl();
             }
-            playerIcon.transform.position = currentRoom.mapCoord * tetrisMapSize + new Vector3(0, 0, grid.transform.position.z - 2);
+            //playerIcon.transform.position = currentRoom.mapCoord * tetrisMapSize + new Vector3(0, 0, grid.transform.position.z - 2);
             if (!currentRoom.isRoomCleared && (EnemyManager.Instance.IsClear() || (currentRoom.specialRoomType != RoomType.Normal && currentRoom.specialRoomType != RoomType.Boss)))
             {
                 currentRoom.ClearRoom();

Assets/Scripts/TetrisMap/Portal.cs

@@ -4,17 +4,19 @@ using UnityEngine;
 
 public class Portal : MonoBehaviour, IPlayerInteraction  {
 
-    bool isPortalUsed;
+    public bool isPortalTutorial = false;
+    bool isPortalUsed = false;
 
     public void Apply()
     {
-        if (GameManager.gameState == GameState.Ingame)
-            StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Portal));
-        else if (GameManager.gameState == GameState.Tutorial && !isPortalUsed)
+        if (isPortalTutorial && !isPortalUsed)
         {
             StartCoroutine(GameManager.Instance.EndTutorial());
             isPortalUsed = true;
         }
+        else if (GameManager.gameState == GameState.Ingame && !isPortalTutorial)
+            StartCoroutine(GameObject.FindGameObjectWithTag("MainCamera").GetComponent<CameraController>().ChangeScene(GameState.Portal));
+        
     }
 
     public void HighlightSwitch(bool enabled)

Assets/Scripts/TetrisMap/TetriminoSpawner.cs

@@ -101,10 +101,10 @@ public Tetrimino[] tetriminoes;
             MapManager.Instance.UpdateMap(MapManager.currentTetrimino);
             MapManager.Instance.CreateRoom(MapManager.currentTetrimino);
             MapManager.currentRoom.fog.GetComponent<SpriteRenderer>().color = new Color(1, 1, 1, 0);
-            MapManager.Instance.playerIcon.transform.position = MapManager.currentRoom.mapCoord * MapManager.tetrisMapSize + new Vector3(0, 0, -2);
+            //MapManager.Instance.playerIcon.transform.position = MapManager.currentRoom.mapCoord * MapManager.tetrisMapSize + new Vector3(0, 0, -2);
             MapManager.tempRoom = MapManager.currentRoom;
-            MapManager.Instance.playerIcon = Instantiate(MapManager.Instance.playerIcon, MapManager.currentRoom.mapCoord * MapManager.tetrisMapSize + new Vector3(0, 0, -2)
-                , Quaternion.identity, MapManager.Instance.grid);
+            MapManager.Instance.playerIcon = Instantiate(MapManager.Instance.playerIcon, new Vector3(0, 0, 0), Quaternion.identity, MapManager.currentRoom.transform);
+            MapManager.Instance.playerIcon.transform.localPosition = new Vector3(0, 0, 0);
             MakeTetrimino();
         }
     }

Assets/tiletest.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class tiletest : MonoBehaviour {
-
-	// Use this for initialization
-	void Start () {
-		
-	}
-	
-	// Update is called once per frame
-	void Update () {
-		
-	}
-}

Assets/tiletest.cs.meta

-fileFormatVersion: 2
-guid: eb17c0dc633a1ef4c8337e5ffa1ffdae
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: