머지 완료, Enemy에서 DropItemInfo 에러난거 땜에 주석 처리 해놓음 그거빼곤 다 작동함

Assets/Data.meta

+fileFormatVersion: 2
+guid: 939d6a4ecdca8924e97f40ec4c1c13d7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/exam.csv.meta

+fileFormatVersion: 2
+guid: d9afd12fd1d36c44ca21c7240fa5fdf4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/MapManager.prefab

@@ -96,7 +96,6 @@ MonoBehaviour:
   - {fileID: 114154673741132036, guid: 478354a3449548a44ba40d516d1cc3cd, type: 2}
   - {fileID: 114354969614802418, guid: 5d9d617a37ddce4448c92cca0946ab18, type: 2}
   - {fileID: 114950439855047056, guid: bfa57985877d23b46929238f077b40df, type: 2}
-  - {fileID: 114533787747630882, guid: 3c9743d258814274b97fab0e7c18a787, type: 2}
   specialRoomList:
   - {fileID: 114006867546177498, guid: 8fddb267ac5bdf84b9def0dab7ff2071, type: 2}
   - {fileID: 114206258087780418, guid: 00a3cc75c0f86a5429975c059b71c269, type: 2}

Assets/Prefabs/TetrisMap/TestTools.prefab

@@ -842,9 +842,9 @@ RectTransform:
   m_Father: {fileID: 224395958577644168}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 500, y: 300}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -140, y: -60}
   m_SizeDelta: {x: 160, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224059870163267832
@@ -902,9 +902,9 @@ RectTransform:
   m_Father: {fileID: 224395958577644168}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -450, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 190, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224543215425431206
@@ -939,9 +939,9 @@ RectTransform:
   m_Father: {fileID: 224395958577644168}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -450, y: -70}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 190, y: -70}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224658872540831358
@@ -1013,8 +1013,8 @@ RectTransform:
   m_Father: {fileID: 224395958577644168}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -450, y: 70}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 190, y: 70}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/UI/In-Game UI/LifeStoneUI.prefab

@@ -19,6 +19,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 224255635903845628}
+  - component: {fileID: 114033875034530082}
   m_Layer: 5
   m_Name: LifeStoneFrame
   m_TagString: Untagged
@@ -57,6 +58,17 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!114 &114033875034530082
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1820862295034228}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2674542376dfab04bad27caaa3ffe6a1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &114920782405449110
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -72,7 +84,7 @@ MonoBehaviour:
   standardImage: {fileID: 1001509239983906, guid: a48de94a6ab80f746aec69a02812f1e3,
     type: 2}
   lifeStoneRowNum: 8
-  lifeStoneSize: 20
+  lifeStoneSize: 40
   sprites:
   - {fileID: 21300004, guid: eff441d843b9c664e97a81fcb39d8410, type: 3}
   - {fileID: 21300002, guid: eff441d843b9c664e97a81fcb39d8410, type: 3}
@@ -82,10 +94,10 @@ MonoBehaviour:
   stoneSuper: {fileID: 1874721051176178}
   lifeUnitPrefab: {fileID: 1274079429510600, guid: c1fa87a24452e5745859b739e4a5254b,
     type: 2}
-  vibrationVariable: 0.08
-  lifeStoneFrame: {fileID: 0}
+  vibrationVariable: 0.1
   droppedLifeStonePrefab: {fileID: 1149595688849768, guid: 8255a117a93935941b32b4aed9b299a0,
     type: 2}
+  frameBorder: 0
 --- !u!224 &224255635903845628
 RectTransform:
   m_ObjectHideFlags: 1

Assets/Scenes/LifeStoneScene.unity.meta

 fileFormatVersion: 2
-guid: 2cda990e2423bbf4892e6590ba056729
+guid: fab63b1012d5b89428e32d736df3bb83
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scenes/PlayScene.unity

@@ -465,6 +465,11 @@ Prefab:
       propertyPath: grid
       value: 
       objectReference: {fileID: 1244139631}
+    - target: {fileID: 114144154128578016, guid: afe4a2cb44239b649a3ffa70af5c2d84,
+        type: 2}
+      propertyPath: player
+      value: 
+      objectReference: {fileID: 489222433}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: afe4a2cb44239b649a3ffa70af5c2d84, type: 2}
   m_IsPrefabAsset: 0
@@ -986,27 +991,6 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
-        type: 2}
-      propertyPath: lifeStoneSize
-      value: 40
-      objectReference: {fileID: 0}
-    - target: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
-        type: 2}
-      propertyPath: lifeUnitPrefab
-      value: 
-      objectReference: {fileID: 1274079429510600, guid: c1fa87a24452e5745859b739e4a5254b,
-        type: 2}
-    - target: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
-        type: 2}
-      propertyPath: vibrationVariable
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114920782405449110, guid: c179f0931cfabec428a868a6edc543b0,
-        type: 2}
-      propertyPath: lifeStoneRowNum
-      value: 8
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
   m_IsPrefabAsset: 0
@@ -1155,10 +1139,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6ef4279cf32e10f4dbc71e2206514212, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  mapManager: {fileID: 0}
   roomLayer:
     serializedVersion: 2
     m_Bits: 0
   player: {fileID: 489222433}
+  tetrisCameraCoord: {x: 108, y: 240, z: -1}
 --- !u!1001 &2042136941
 Prefab:
   m_ObjectHideFlags: 0

Assets/Scripts/Characters/Enemy.cs

@@ -5,6 +5,7 @@ using Random = UnityEngine.Random;
 
 
 public class Enemy : MonoBehaviour {
+    /*
 // data
     // health
     private readonly float maxHealth;
@@ -139,6 +140,7 @@ public class Enemy : MonoBehaviour {
         immunity[(int)sCase.Case] = false;
     }
 
+    */
 }
 
 //얼음일때 깨어나기

Assets/Scripts/TetrisMap/MapManager.cs

@@ -887,6 +887,7 @@ public class MapManager : MonoBehaviour {
                 normalRoomsDistributed[i, j] = new List<RoomInGame>();
         for(int i = 0; i < normalRoomList.Length; i++)
         {
+            Debug.Log(i);
             int leftDoor = normalRoomList[i].sideDoorInfo[0];
             int rightDoor = normalRoomList[i].sideDoorInfo[1];
             int leftCount = 0;

Assets/Sprites/Doors/DoorAnimation/DoorInGameLeft (6).png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1