상점wip

Assets/Data/GoldRoomItemSpawnData.csv

@@ -3,11 +3,11 @@ stage,type,quality,price
 2,LifeStone,None,4,LifeStone,None,10,Item,Study,4,Item,Ordinary,10,Item,Ordinary,10,Addon,Ordinary,10
 3,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Ordinary,10,Item,Superior,10
 3,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22
-4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Item,MasterPiece,50
-4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Item,MasterPiece,50
-4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Addon,MasterPiece,50
-4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Addon,MasterPiece,50
-5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Item,MasterPiece,50
-5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Item,MasterPiece,50
-5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Addon,MasterPiece,50
-5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Addon,MasterPiece,50
+4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Item,Masterpiece,50
+4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Item,Masterpiece,50
+4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Addon,Masterpiece,50
+4,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Addon,Masterpiece,50
+5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Item,Masterpiece,50
+5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Item,Masterpiece,50
+5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Addon,Superior,22,Addon,Masterpiece,50
+5,LifeStone,None,4,LifeStone,None,10,Item,Ordinary,10,Addon,Ordinary,10,Item,Superior,22,Addon,Masterpiece,50
\ No newline at end of file

Assets/Prefabs/Rooms/SpecialRoom/Room Gold.prefab

@@ -31,6 +31,51 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1144240717194000
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4942353006286330}
+  m_Layer: 0
+  m_Name: item2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1176163474605492
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4136191351460260}
+  m_Layer: 0
+  m_Name: item5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1195436639309608
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4645028977455064}
+  m_Layer: 0
+  m_Name: item1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1199332975433272
 GameObject:
   m_ObjectHideFlags: 0
@@ -51,6 +96,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1355653729281362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4122111573804852}
+  m_Layer: 0
+  m_Name: item spot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1365357607970180
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4514277565428528}
+  m_Layer: 0
+  m_Name: item6
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1453911885128920
 GameObject:
   m_ObjectHideFlags: 0
@@ -71,6 +146,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1501914550378012
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4217145669686400}
+  m_Layer: 0
+  m_Name: item3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1566149986937306
+GameObject:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4587903319936678}
+  m_Layer: 0
+  m_Name: item4
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1616832229742642
 GameObject:
   m_ObjectHideFlags: 0
@@ -137,6 +242,38 @@ Transform:
   m_Father: {fileID: 4180646400299094}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4122111573804852
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1355653729281362}
+  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: 4645028977455064}
+  - {fileID: 4942353006286330}
+  - {fileID: 4217145669686400}
+  - {fileID: 4587903319936678}
+  - {fileID: 4136191351460260}
+  - {fileID: 4514277565428528}
+  m_Father: {fileID: 4180646400299094}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4136191351460260
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1176163474605492}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 15, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4180646400299094
 Transform:
   m_ObjectHideFlags: 1
@@ -152,9 +289,49 @@ Transform:
   - {fileID: 4839121741347876}
   - {fileID: 4119535680508370}
   - {fileID: 4989414776676212}
+  - {fileID: 4122111573804852}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4217145669686400
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1501914550378012}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 11, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4514277565428528
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1365357607970180}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 17, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4587903319936678
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1566149986937306}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 13, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4607286300106490
 Transform:
   m_ObjectHideFlags: 1
@@ -168,6 +345,19 @@ Transform:
   m_Father: {fileID: 4180646400299094}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4645028977455064
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1195436639309608}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 7, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4839121741347876
 Transform:
   m_ObjectHideFlags: 1
@@ -194,6 +384,19 @@ Transform:
   m_Father: {fileID: 4180646400299094}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4942353006286330
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1144240717194000}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 9, y: 7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4122111573804852}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4989414776676212
 Transform:
   m_ObjectHideFlags: 1

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

@@ -221,7 +221,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1431148950696020}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.8, y: 0, z: 0}
+  m_LocalPosition: {x: 10.2, y: 15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4653416975264890}
@@ -273,7 +273,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1457478272196668}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 12, y: 15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4653416975264890}
@@ -299,7 +299,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1413407397998784}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12, y: 15, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4631828297218386}
@@ -317,7 +317,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1741579105693154}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.9, y: 0, z: 0}
+  m_LocalPosition: {x: 11.1, y: 15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4653416975264890}
@@ -330,7 +330,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1028454191368090}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.9, y: 0, z: 0}
+  m_LocalPosition: {x: 12.9, y: 15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4653416975264890}
@@ -343,7 +343,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1592240552895412}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.8, y: 0, z: 0}
+  m_LocalPosition: {x: 13.8, y: 15, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4653416975264890}

Assets/Prefabs/Rooms/SpecialRoom/Room Item 1-2.prefab

@@ -221,7 +221,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1912770964485232}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.9, y: 0, z: 0}
+  m_LocalPosition: {x: 12.9, y: 11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4786349110151796}
@@ -234,7 +234,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1463608286577820}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 24, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4521464594307750}
@@ -266,7 +266,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1132183376147338}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 12, y: 11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4786349110151796}
@@ -305,7 +305,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1128816913873446}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.8, y: 0, z: 0}
+  m_LocalPosition: {x: 13.8, y: 11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4786349110151796}
@@ -318,7 +318,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1724674505578042}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.9, y: 0, z: 0}
+  m_LocalPosition: {x: 11.1, y: 11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4786349110151796}
@@ -331,7 +331,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1298301923794818}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -1.8, y: 0, z: 0}
+  m_LocalPosition: {x: 10.2, y: 11, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 4786349110151796}
@@ -344,7 +344,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1257208676894460}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 12, y: 11, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4421836769822676}

Assets/Scripts/TetrisMap/MapManager.cs

@@ -999,74 +999,9 @@ public class MapManager : Singleton<MapManager> {
         Tetrimino.rotationInformation[5].horizontalLength = new int[4] { 3, 2, 3, 2 };  //S
         Tetrimino.rotationInformation[6].horizontalLength = new int[4] { 3, 2, 3, 2 };  //Z
         Tetrimino.rotationInformation[7].horizontalLength = new int[4] { 1, 1, 1, 1 };  //Boss
-		/*ItemRoomInGame.itemRoomInformation[0] = new RoomItemInfo<ItemRoomItemInfo>(
-			new ItemRoomItemInfo[8]
-			{
-				new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }),
-				new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.None }, new int[2] { 1, 2 }),
-				new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }),
-				new ItemRoomItemInfo(12.5f, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Gold }, new int[2] { 1, 1 }),
-				new ItemRoomItemInfo(17, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Ordinary }, new int[2] { 1, 1 }),
-				new ItemRoomItemInfo(25, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
-					new ItemQuality[2] { ItemQuality.Ordinary, ItemQuality.Study }, new int[2] { 1, 1 }),
-				new ItemRoomItemInfo(4, new ItemSpawnType[1] { ItemSpawnType.Item },
-					new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 }),
-				new ItemRoomItemInfo(4, new ItemSpawnType[1] { ItemSpawnType.Addon },
-					new ItemQuality[1] { ItemQuality.Superior }, new int[1] { 1 })
-			});
-		ItemRoomInGame.itemRoomInformation[1] = new RoomItemInfo<ItemRoomItemInfo>(
-			new ItemRoomItemInfo[7]
-			{
-				new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
-					                  new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
-				new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
-					                  new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
-				new ItemRoomItemInfo(20, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.Addon },
-					new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.Study }, new int[3] { 1, 1, 1 }),
-				new ItemRoomItemInfo(20, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.Addon },
-					new ItemQuality[2] { ItemQuality.Superior, ItemQuality.Study }, new int[2] { 1, 2 }),
-				new ItemRoomItemInfo(20, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.LifeStone },
-					new ItemQuality[3] { ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[3] { 1, 1, 1 }),
-				new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.LifeStone },
-					new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 }),
-				new ItemRoomItemInfo(10, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.LifeStone },
-					new ItemQuality[2] { ItemQuality.Superior, ItemQuality.None }, new int[2] { 1, 3 })
-			});
-		ItemRoomInGame.itemRoomInformation[2] = new RoomItemInfo<ItemRoomItemInfo>(
-			new ItemRoomItemInfo[4]
-			{
-				new ItemRoomItemInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Item, ItemSpawnType.GoldPotion },
-					new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }),
-				new ItemRoomItemInfo(33.5f, new ItemSpawnType[4] { ItemSpawnType.Item, ItemSpawnType.Addon, ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
-					new ItemQuality[4] { ItemQuality.Superior, ItemQuality.Superior, ItemQuality.Ordinary, ItemQuality.None }, new int[4] { 1, 1, 1, 1 }),
-				new ItemRoomItemInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Item },
-					new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 }),
-				new ItemRoomItemInfo(16.5f, new ItemSpawnType[1] { ItemSpawnType.Addon },
-					new ItemQuality[1] { ItemQuality.Masterpiece }, new int[1] { 1 })
-			});
-		ItemRoomInGame.itemRoomInformation[3] = new RoomItemInfo<ItemRoomItemInfo>(
-			new ItemRoomItemInfo[2]
-			{
-				new ItemRoomItemInfo(50, new ItemSpawnType[2] { ItemSpawnType.Item, ItemSpawnType.GoldPotion },
-					new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 }),
-				new ItemRoomItemInfo(50, new ItemSpawnType[2] { ItemSpawnType.Addon, ItemSpawnType.GoldPotion },
-					new ItemQuality[2] { ItemQuality.Masterpiece, ItemQuality.None }, new int[2] { 1, 2 })
-			});
-		ItemRoomInGame.itemRoomInformation[4] = new RoomItemInfo<ItemRoomItemInfo>(
-			new ItemRoomItemInfo[2]
-			{
-				new ItemRoomItemInfo(50, new ItemSpawnType[3] { ItemSpawnType.Item, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone },
-					new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 }),
-				new ItemRoomItemInfo(50, new ItemSpawnType[3] { ItemSpawnType.Addon, ItemSpawnType.LifeStoneFrame, ItemSpawnType.LifeStone },
-					new ItemQuality[3] { ItemQuality.Masterpiece, ItemQuality.None, ItemQuality.Gold }, new int[3] { 1, 1, 1 })
-			});*/
         ItemRoomInGame.LoadItemRoomData(itemRoomItemSpawnData);
-		for (int i = 0; i < tetrisYCoord.Length; i++)
+        GoldRoomInGame.LoadGoldRoomData(GoldRoomItemSpawnData);
+        for (int i = 0; i < tetrisYCoord.Length; i++)
             tetrisYCoord[i] = i * tetrisMapSize;
         for (int i = 0; i < isRowDeleting.Length; i++)
             isRowDeleting[i] = false;

Assets/Scripts/TetrisMap/RoomInGame.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class RoomItemInfo<T>
 {
-	public List<T> itemSpawnInfo = new List<T>();
+    public List<T> itemSpawnInfo = new List<T>();
     public RoomItemInfo()
     {
 
@@ -45,7 +45,9 @@ public class RoomInGame : MonoBehaviour {
     {
 
     }
-
+    /// <summary>
+    /// This function is called when player clears the room.
+    /// </summary>
     public virtual void RoomClear()
     {
 

Assets/Scripts/TetrisMap/Rooms/GoldRoomInGame.cs

@@ -24,12 +24,99 @@ public class GoldRoomItemInfo
 
 public class GoldRoomInGame : RoomInGame {
 
+    /// <summary>
+    /// The information of gold room's item spawn data.
+    /// Each index means stage.
+    /// </summary>
     public static RoomItemInfo<GoldRoomItemInfo>[] goldRoomInformation = new RoomItemInfo<GoldRoomItemInfo>[5];
 
+    /// <summary>
+    /// Loads data from gold room's item spawn data.
+    /// </summary>
+    /// <param name="dataFile">The data file of gold room..</param>
+    public static void LoadGoldRoomData(TextAsset dataFile)
+    {
+        for (int i = 0; i < goldRoomInformation.Length; i++)
+            goldRoomInformation[i] = new RoomItemInfo<GoldRoomItemInfo>();
+        string[] linesFromText = dataFile.text.Split('\n');
+        string[] cellValue = null;
+        int stageIndex = 0;
+        int skipDistance = 1;
+        for (int i = 1; i < linesFromText.Length; i++)
+        {
+            cellValue = linesFromText[i].Split(',');
+            int itemCase = (cellValue.Length - skipDistance) / 3;
+            ItemSpawnType[] itemType = new ItemSpawnType[itemCase];
+            ItemQuality[] itemQuality = new ItemQuality[itemCase];
+            int[] itemPrice = new int[itemCase];
+            for (int j = 0; j < itemCase; j++)
+            {
+                itemType[j] = (ItemSpawnType)System.Enum.Parse(typeof(ItemSpawnType), cellValue[skipDistance + j * 3]);
+                itemQuality[j] = (ItemQuality)System.Enum.Parse(typeof(ItemQuality), cellValue[skipDistance + j * 3 + 1]);
+                itemPrice[j] = int.Parse(cellValue[skipDistance + j * 3 + 2]);
+            }
+            goldRoomInformation[int.Parse(cellValue[stageIndex]) - 1].AddItemInfo(new GoldRoomItemInfo(itemType, itemQuality, itemPrice));
+        }
+    }
+    /// <summary>
+    /// Spawn items according to the probability and item stage of this room.
+    /// </summary>
+    public void SpawnItem()
+    {
+        Room room = transform.parent.GetComponent<Room>();
+        InventoryManager inventoryManager = InventoryManager.Instance;
+        LifeStoneManager lifeStoneManager = LifeStoneManager.Instance;
+        float probability = Random.Range(0f, 100f);
+        Vector3[] itemPosition = new Vector3[6];
+        int j = 0;
+        foreach (Transform child in transform.Find("item spot"))
+            itemPosition[j++] = child.position;
+        int goldRoomIndex = room.stage;
+        int random = Random.Range(0, goldRoomInformation[goldRoomIndex].itemSpawnInfo.Count);
+        GoldRoomItemInfo itemInfo = goldRoomInformation[goldRoomIndex].itemSpawnInfo[random];
+        int itemCount = 0;
+        for (int i = 0; i < itemInfo.itemType.Length; i++)
+        {
+            if (itemInfo.itemType[i] == ItemSpawnType.Item)
+            {
+                Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " price" + itemInfo.price[i]);
+                inventoryManager.ItemInstantiate(itemInfo.itemQuality[i], itemPosition[itemCount++], 0);
+                Debug.Log("done");
+            }
+            else if (itemInfo.itemType[i] == ItemSpawnType.Addon)
+            {
+                Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " price" + itemInfo.price[i]);
+                inventoryManager.AddonInstantiate(itemInfo.itemQuality[i], itemPosition[itemCount++], 0);
+                Debug.Log("done");
+            }
+            else if (itemInfo.itemType[i] == ItemSpawnType.GoldPotion)
+            {
+                Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " price" + itemInfo.price[i]);
+                lifeStoneManager.InstantiatePotion(itemPosition[itemCount++], 0);
+                Debug.Log("done");
+            }
+            else if (itemInfo.itemType[i] == ItemSpawnType.LifeStone)
+            {
+                if (itemInfo.itemQuality[i] == ItemQuality.Gold)
+                {
+                    Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " price" + itemInfo.price[i]);
+                    lifeStoneManager.InstantiateDroppedLifeStone(6, 1, 0, itemPosition[itemCount++], 0);
+                    Debug.Log("done");
+                }
+                else
+                {
+                    Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " price" + itemInfo.price[i]);
+                    lifeStoneManager.InstantiateDroppedLifeStone(6, 0, 0, itemPosition[itemCount++], 0);
+                    Debug.Log("done");
+                }
+            }
+        }
+    }
+
     public override void RoomEnter()
     {
         base.RoomEnter();
-
+        SpawnItem();
     }
 
     public override void RoomClear()

Assets/Scripts/TetrisMap/Rooms/ItemRoomInGame.cs

@@ -25,8 +25,16 @@ public class ItemRoomItemInfo
 
 public class ItemRoomInGame : RoomInGame {
 
+    /// <summary>
+    /// The information of item room's item spawn data.
+    /// Each index means item stage.
+    /// </summary>
     public static RoomItemInfo<ItemRoomItemInfo>[] itemRoomInformation = new RoomItemInfo<ItemRoomItemInfo>[5];
 
+    /// <summary>
+    /// Loads data from item room's item spawn data.
+    /// </summary>
+    /// <param name="dataFile">The data file of item room..</param>
     public static void LoadItemRoomData(TextAsset dataFile)
     {
         for (int i = 0; i < itemRoomInformation.Length; i++)
@@ -50,10 +58,12 @@ public class ItemRoomInGame : RoomInGame {
                 itemQuality[j] = (ItemQuality)System.Enum.Parse(typeof(ItemQuality), cellValue[skipDistance + j * 3 + 1]);
                 itemAmount[j] = int.Parse(cellValue[skipDistance + j * 3 + 2]);
             }
-            itemRoomInformation[int.Parse(cellValue[stageIndex]) - 1].
-                AddItemInfo(new ItemRoomItemInfo(probability, itemType, itemQuality, itemAmount));
+            itemRoomInformation[int.Parse(cellValue[stageIndex]) - 1].AddItemInfo(new ItemRoomItemInfo(probability, itemType, itemQuality, itemAmount));
         }
     }
+    /// <summary>
+    /// Spawn items according to the probability and item stage of this room.
+    /// </summary>
     public void SpawnItem()
 	{
 		Room room = transform.parent.GetComponent<Room>();
@@ -69,58 +79,58 @@ public class ItemRoomInGame : RoomInGame {
 			itemRoomIndex = 5;
 		for(int index = 0; index < itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo.Count; index++)
 		{
-			ItemRoomItemInfo child = itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo[index];
-			probability -= child.probability;
+			ItemRoomItemInfo itemInfo = itemRoomInformation[itemRoomIndex - 1].itemSpawnInfo[index];
+			probability -= itemInfo.probability;
 			Debug.Log(probability);
 			if (probability <= 0)
 			{
 				Debug.Log("Item Spawn");
 				int itemCount = 0;
-				for(int i = 0; i < child.itemType.Length; i++)
+				for(int i = 0; i < itemInfo.itemType.Length; i++)
 				{
-					if (child.itemType[i] == ItemSpawnType.Item) 
-						for(int _amount = 0; _amount < child.amount[i]; _amount++)
+					if (itemInfo.itemType[i] == ItemSpawnType.Item) 
+						for(int _amount = 0; _amount < itemInfo.amount[i]; _amount++)
 						{
-							Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
-							inventoryManager.ItemInstantiate(child.itemQuality[i], itemPosition[itemCount++], 1);
+							Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
+							inventoryManager.ItemInstantiate(itemInfo.itemQuality[i], itemPosition[itemCount++], 1);
 						}
-					else if (child.itemType[i] == ItemSpawnType.Addon)
-						for (int _amount = 0; _amount < child.amount[i]; _amount++)
+					else if (itemInfo.itemType[i] == ItemSpawnType.Addon)
+						for (int _amount = 0; _amount < itemInfo.amount[i]; _amount++)
 						{
-							Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
-							inventoryManager.AddonInstantiate(child.itemQuality[i], itemPosition[itemCount++], 1);
+							Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
+							inventoryManager.AddonInstantiate(itemInfo.itemQuality[i], itemPosition[itemCount++], 1);
 						}
-					else if (child.itemType[i] == ItemSpawnType.GoldPotion)
-						for (int _amount = 0; _amount < child.amount[i]; _amount++)
+					else if (itemInfo.itemType[i] == ItemSpawnType.GoldPotion)
+						for (int _amount = 0; _amount < itemInfo.amount[i]; _amount++)
 						{
-							Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
+							Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
 							lifeStoneManager.InstantiatePotion(itemPosition[itemCount++], 1);
 						}
-					else if (child.itemType[i] == ItemSpawnType.LifeStone)
+					else if (itemInfo.itemType[i] == ItemSpawnType.LifeStone)
 					{
 						if(room.itemRoomType < 4)
-							for (int _amount = 0; _amount < child.amount[i]; _amount++)
+							for (int _amount = 0; _amount < itemInfo.amount[i]; _amount++)
 							{
-								if(child.itemQuality[i] == ItemQuality.Gold)
+								if(itemInfo.itemQuality[i] == ItemQuality.Gold)
 								{
-									Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
+									Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
 									lifeStoneManager.InstantiateDroppedLifeStone(4, 1, 0, itemPosition[itemCount++], 1);
 								}
 								else
 								{
-									Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
+									Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
 									lifeStoneManager.InstantiateDroppedLifeStone(3, 0, 0, itemPosition[itemCount++], 1);
 								}
 							}
 						else
 						{
-							Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
+							Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
 							lifeStoneManager.InstantiateDroppedLifeStone(3 * (room.itemRoomType - 4), 1, 0, itemPosition[itemCount++], 1);
 						}
 					}
-					else if (child.itemType[i] == ItemSpawnType.LifeStoneFrame)
+					else if (itemInfo.itemType[i] == ItemSpawnType.LifeStoneFrame)
 					{
-						Debug.Log("type" + child.itemType[i] + " quality" + child.itemQuality[i] + " amount" + child.amount[i]);
+						Debug.Log("type" + itemInfo.itemType[i] + " quality" + itemInfo.itemQuality[i] + " amount" + itemInfo.amount[i]);
 						lifeStoneManager.ExpandRow(room.itemRoomType - 4);
 					}
 				}