Merge remote-tracking branch 'origin/item' into tetris

# Conflicts:
#	ProjectSettings/TagManager.asset

Assets/Palettes/ForestRuin Platform Pallete.prefab

@@ -171,15 +171,6 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
-  - first: {x: -1, y: 0, z: 0}
-    second:
-      m_TileIndex: 0
-      m_TileSpriteIndex: 51
-      m_TileMatrixIndex: 0
-      m_TileColorIndex: 1
-      m_ObjectToInstantiate: {fileID: 0}
-      m_TileFlags: 3
-      m_ColliderType: 1
   - first: {x: 0, y: 0, z: 0}
     second:
       m_TileIndex: 2
@@ -191,7 +182,7 @@ Tilemap:
       m_ColliderType: 1
   m_AnimatedTiles: {}
   m_TileAssetArray:
-  - m_RefCount: 1
+  - m_RefCount: 0
     m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: 60035ce64a779ae4a9eeaaafe33f87e1, type: 2}
@@ -400,12 +391,12 @@ Tilemap:
     m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: 21300000, guid: 304a5c9639335dc419e62424768222f4, type: 3}
-  - m_RefCount: 1
+  - m_RefCount: 0
     m_Data: {fileID: 0}
   - m_RefCount: 1
     m_Data: {fileID: 21300000, guid: 1be7ce8972ae2fb4a84717e42243e5b4, type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 5
+  - m_RefCount: 4
     m_Data:
       e00: 1
       e01: 0
@@ -426,8 +417,8 @@ Tilemap:
   m_TileColorArray:
   - m_RefCount: 4
     m_Data: {r: 1, g: 1, b: 1, a: 1}
-  - m_RefCount: 1
-    m_Data: {r: 0.7956211, g: 0.40175644, b: 0.52968407, a: 1}
+  - m_RefCount: 0
+    m_Data: {r: NaN, g: NaN, b: NaN, a: NaN}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: -18, y: -7, z: 0}

Assets/Prefabs/Characters/Enemy/Goblin.prefab

@@ -89,7 +89,7 @@ GameObject:
   - component: {fileID: 4140258981397796}
   - component: {fileID: 61362187134790794}
   - component: {fileID: 114468655689627186}
-  m_Layer: 0
+  m_Layer: 18
   m_Name: Hitbox
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -289,6 +289,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a11d071a77ab21c48882c6c6e4db8f17, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  debuffState: 
   monsterID: 101
   maxHealth: 15
   weight: 15
@@ -298,6 +299,9 @@ MonoBehaviour:
   trackSpeed: 2.5
   knockbackPercentage:
   - 0.5
+  MovementLock: 0
+  bumped: 0
+  bumpable: 1
   attackRange: 1.2
 --- !u!114 &114173716467154830
 MonoBehaviour:
@@ -323,7 +327,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   damage: 4
-  damageOnce: 1
+  isBumpAttack: 0
 --- !u!114 &114851997656688694
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Characters/Player.prefab

@@ -28,7 +28,7 @@ GameObject:
   - component: {fileID: 114880704145925944}
   - component: {fileID: 114574072693989902}
   - component: {fileID: 82529156342294766}
-  m_Layer: 0
+  m_Layer: 19
   m_Name: Player
   m_TagString: Player
   m_Icon: {fileID: 0}

Assets/Prefabs/Characters/particle.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 212525562428622492}
   - component: {fileID: 50320821075488510}
   - component: {fileID: 60824362284317310}
-  m_Layer: 0
+  m_Layer: 19
   m_Name: particle
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/MapManager.prefab

@@ -123,8 +123,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 0345323fb9396ed4b9d66aa389016f36, type: 3}
   - {fileID: 21300000, guid: a205697d9c330cd47afc7bfafe83d718, type: 3}
   - {fileID: 21300000, guid: d1893a5ae6c5cdb478ac942867927405, type: 3}
-  - {fileID: 21300000, guid: 389f01375fa159b4d869c766ad6a489d, type: 3}
-  - {fileID: 21300000, guid: aaa436c3de13620499ccfa3154cb78af, type: 3}
+  - {fileID: 21300000, guid: 5d3d3bb16e5051045be1e72cca68b596, type: 3}
+  - {fileID: 21300000, guid: cad317806c8dd9b42b5b05234dee1997, type: 3}
   roomBackgroundSprite1:
   - {fileID: 21300000, guid: c2e87589a128b824c8f621c5a34bfe5e, type: 3}
   - {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
@@ -132,7 +132,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 7d94542039acd6a4b932cf9219b71799, type: 3}
   itemRoomItemSpawnData: {fileID: 4900000, guid: 50da557f52db710419c3374a903b3d22,
     type: 3}
-  GoldRoomItemSpawnData: {fileID: 4900000, guid: a89c82f77571a09438810f11ef1978e0,
+  goldRoomItemSpawnData: {fileID: 4900000, guid: a89c82f77571a09438810f11ef1978e0,
     type: 3}
 --- !u!114 &114476419532778440
 MonoBehaviour:

Assets/Prefabs/UI/CoolPrefab.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1003943478445456}
+  m_IsPrefabAsset: 1
+--- !u!1 &1003943478445456
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224963452150531702}
+  - component: {fileID: 222625207745481850}
+  - component: {fileID: 114770819435456544}
+  m_Layer: 5
+  m_Name: CoolPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1356847275771234
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224105140817220146}
+  - component: {fileID: 222549365051276350}
+  - component: {fileID: 114530492695294480}
+  m_Layer: 5
+  m_Name: Cover
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114530492695294480
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356847275771234}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!114 &114770819435456544
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1003943478445456}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &222549365051276350
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356847275771234}
+  m_CullTransparentMesh: 0
+--- !u!222 &222625207745481850
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1003943478445456}
+  m_CullTransparentMesh: 0
+--- !u!224 &224105140817220146
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356847275771234}
+  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_Father: {fileID: 224963452150531702}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!224 &224963452150531702
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1003943478445456}
+  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: 224105140817220146}
+  m_Father: {fileID: 0}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 1, y: 1}

Assets/Prefabs/UI/CoolPrefab.prefab.meta

+fileFormatVersion: 2
+guid: 537693314f8733d468cf539dfa446127
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/CoolUI.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1160080494873608}
+  m_IsPrefabAsset: 1
+--- !u!1 &1160080494873608
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224380954982412028}
+  - component: {fileID: 114063871202215742}
+  - component: {fileID: 225098375021244074}
+  m_Layer: 5
+  m_Name: CoolUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &114063871202215742
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1160080494873608}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5a374f59265c73748893ff240c42b87e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startPos: {x: 10, y: 10, z: 0}
+  interval: {x: 120, y: 120}
+  maxCol: 4
+  coolPrefab: {fileID: 1003943478445456, guid: 537693314f8733d468cf539dfa446127, type: 2}
+  size: 100
+  coolingColor: {r: 1, g: 0, b: 0, a: 0.25882354}
+--- !u!224 &224380954982412028
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1160080494873608}
+  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_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &225098375021244074
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1160080494873608}
+  m_Enabled: 1
+  m_Alpha: 0.7
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

Assets/Prefabs/UI/CoolUI.prefab.meta

+fileFormatVersion: 2
+guid: 6ae07b01931768f4f8924c0ab07ce9f7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryManager.prefab

@@ -57,3 +57,4 @@ MonoBehaviour:
   popoutStrengthMultiplier: 9
   popoutTime: 0.1
   price: {fileID: 114275555228777956, guid: 4ec53eab8ea50de4ea5b9ff658d83ca0, type: 2}
+  coolUI: {fileID: 0}

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

@@ -50,6 +50,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 224402251087470820}
+  - component: {fileID: 225769440112755302}
   m_Layer: 5
   m_Name: LifeStoneUI
   m_TagString: Untagged
@@ -124,3 +125,14 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!225 &225769440112755302
+CanvasGroup:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1939101680453256}
+  m_Enabled: 1
+  m_Alpha: 0.8
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0

Assets/Resources/Animations/explosionGlovesAttack2.anim.meta

 fileFormatVersion: 2
-guid: f0e3b19ee969d4f429ee9d8430bb4a58
+guid: 8577ae016a412764684fcba81af639cb
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Assets/Resources/Sprites/Cools.meta

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

Assets/Resources/Sprites/Cools/bit sword_cool1.png.meta

+fileFormatVersion: 2
+guid: 8284c3d6e184001488b60a34f5dec8e3
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: c4bb81bccb9f9614f96a3647b5a610d3
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Player.cs

@@ -22,7 +22,6 @@ public class Player : MonoBehaviour {
         {
             yield return null;
             displayText.transform.position = transform.position + new Vector3(0, 2, 0);
-            Debug.Log(i);
             displayText.color = new Color(displayText.color.r, displayText.color.g, displayText.color.b, (float)i /255);
         }
         displayText.text = "";

Assets/Scripts/Item/InventoryManager.cs

@@ -16,6 +16,8 @@ public class InventoryManager : Singleton<InventoryManager> {
     public Text price;
     GameObject player;
 
+    public GameObject coolUI;
+
     private void Start()
     {
         player = GameManager.Instance.player;

Assets/Scripts/Item/Item.cs

@@ -18,6 +18,7 @@ public abstract class Item {
     public string[] comboName = new string[3];
     public float[] comboCool = new float[3];
     public float[] comboCurrentCool = new float[3];
+    public Sprite[] coolSprite = new Sprite[3];
 
     public bool ComboAction(string currentCombo)
     {
@@ -28,6 +29,7 @@ public abstract class Item {
                 if (comboCurrentCool[i] < comboCool[i]) return false;
 
                 comboCurrentCool[i] = 0;
+                if (comboCool[i] > 0) InventoryManager.Instance.coolUI.GetComponent<CoolUI>().InitCool(this, i);
 
                 if (i == 0) PlaySkill1();
                 else if (i == 1) PlaySkill2();
@@ -79,6 +81,7 @@ public abstract class Item {
     {
         comboCool = new float[3] { 0, 0, 0 };
         comboCurrentCool = new float[3] { 0, 0, 0 };
+        coolSprite = new Sprite[3];
         Declare();
     }
     public virtual void Declare()

Assets/Scripts/Item/Items/BitSword.cs

@@ -25,17 +25,24 @@ public class BitSword: Item
         comboName = new string[3] { "I", "", "" };
         comboCool = new float[3] { 50, 0, 0 };
         comboCurrentCool = new float[3] { 50, 0, 0 };
+        coolSprite[0] = Resources.Load<Sprite>("Sprites/Cools/bit sword_cool1");
     }
 
     public override void GlobalOtherEffect(string combo)
     {
         List<Item> itemList = InventoryManager.Instance.itemList;
 
-        if (MapManager.currentRoom.isRoomCleared)
+        if (combo.Equals("A")) return;
+
+        if (!MapManager.currentRoom.isRoomCleared)
         {
             for (int i = combo.Length; i >= 1; i--)
             {
-                if (combo[i - 1] == 'A') comboCurrentCool[0]++;
+                
+                if (combo[i - 1] == 'A')
+                {
+                    comboCurrentCool[0]++;
+                }
 
                 foreach (Item item in itemList)
                 {

Assets/Scripts/TetrisMap/MapManager.cs

@@ -219,7 +219,7 @@ public class MapManager : Singleton<MapManager> {
     /// Data of which item to spawn in gold room.
     /// </summary>
     [SerializeField]
-    private TextAsset GoldRoomItemSpawnData;
+    private TextAsset goldRoomItemSpawnData;
 
     /*
      * functions
@@ -987,7 +987,7 @@ public class MapManager : Singleton<MapManager> {
         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.LoadItemRoomData(itemRoomItemSpawnData);
-        GoldRoomInGame.LoadGoldRoomData(GoldRoomItemSpawnData);
+        GoldRoomInGame.LoadGoldRoomData(goldRoomItemSpawnData);
         for (int i = 0; i < tetrisYCoord.Length; i++)
             tetrisYCoord[i] = i * tetrisMapSize;
         for (int i = 0; i < isRowDeleting.Length; i++)
@@ -1009,8 +1009,6 @@ public class MapManager : Singleton<MapManager> {
             portalDistributedVertical[i] = new List<int>();
         for (int i = 0; i < 10; i++)
             portalDistributedHorizontal[i] = new List<int>();
-
-        
         for (int concept = 0; concept < 4; concept++)
             for (int leftDoor = 0; leftDoor < 3; leftDoor++)
                 for (int rightDoor = 0; rightDoor < 3; rightDoor++)

Assets/Scripts/UI/In-game UI/CoolUI.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class CoolUI : MonoBehaviour {
+
+    public Vector3 startPos;
+    public Vector2 interval;
+    public int maxCol;
+    public GameObject coolPrefab;
+    public float size;
+    public Color coolingColor;
+
+    List<CoolUIUnit> coolList;
+
+    private void Awake()
+    {
+        coolList = new List<CoolUIUnit>();
+    }
+
+    private void Update()
+    {
+        SetCoolOnPosition();
+    }
+
+    public void InitCool(Item item, int skillNo)
+    {
+        CoolUIUnit tmpUnit = new CoolUIUnit(Instantiate(coolPrefab, transform), item, skillNo);
+        tmpUnit.obj.GetComponent<Image>().sprite = item.coolSprite[skillNo];
+        tmpUnit.obj.GetComponent<Image>().enabled = true;
+        tmpUnit.obj.GetComponent<RectTransform>().sizeDelta = new Vector2(size, size);
+
+        tmpUnit.obj.transform.GetChild(0).GetComponent<Image>().color = coolingColor;
+        tmpUnit.obj.transform.GetChild(0).GetComponentInChildren<RectTransform>().sizeDelta = new Vector2(size, size);
+        coolList.Add(tmpUnit);
+    }
+
+    public void SetCoolOnPosition()
+    {
+        for(int i=0; i<coolList.Count; i++)
+        {
+            if (coolList[i].item.comboCurrentCool[coolList[i].skillNo] >= coolList[i].item.comboCool[coolList[i].skillNo])
+            {
+                Destroy(coolList[i].obj);
+                coolList.RemoveAt(i);
+                continue;
+            }
+            Debug.Log(coolList[i].item.comboCurrentCool[coolList[i].skillNo]);
+            coolList[i].obj.GetComponent<RectTransform>().localPosition =  - startPos - new Vector3(interval.x * (i % maxCol), interval.y * (i / 4));
+            coolList[i].obj.transform.GetChild(0).GetComponentInChildren<RectTransform>().sizeDelta = new Vector2(size * (1-(coolList[i].item.comboCurrentCool[coolList[i].skillNo] / coolList[i].item.comboCool[coolList[i].skillNo])), size);
+        }
+    }
+}
+
+class CoolUIUnit
+{
+    public GameObject obj;
+    public Item item;
+    public int skillNo;
+
+    public CoolUIUnit(GameObject obj, Item item, int skillNo)
+    {
+        this.obj = obj; this.item = item;   this.skillNo = skillNo;
+    }
+}
\ No newline at end of file

Assets/Scripts/UI/In-game UI/CoolUI.cs.meta

+fileFormatVersion: 2
+guid: 5a374f59265c73748893ff240c42b87e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Rooms/Stage1/RoomNormal1_2.png.meta

 fileFormatVersion: 2
-guid: 389f01375fa159b4d869c766ad6a489d
+guid: 5d3d3bb16e5051045be1e72cca68b596
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1.3333333
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 2d63ca1befd0b48468a9a65ff6dbc104
+    spriteID: 48897a45c6ed3814993e86c46d2ec964
     vertices: []
     indices: 
     edges: []

Assets/Sprites/Rooms/Stage1/RoomNormal1_3.png.meta

 fileFormatVersion: 2
-guid: aaa436c3de13620499ccfa3154cb78af
+guid: cad317806c8dd9b42b5b05234dee1997
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 6
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 1.3333333
+  spritePixelsToUnits: 1.3333334
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: fbd9527acbfe7a24e9935f021ba460bf
+    spriteID: 10187354cec6c71459d3297305ef663d
     vertices: []
     indices: 
     edges: []

ProjectSettings/InputManager.asset

@@ -266,7 +266,7 @@ InputManager:
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: joystick button 0
+    positiveButton: joystick button 2
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
@@ -282,7 +282,7 @@ InputManager:
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: joystick button 1
+    positiveButton: joystick button 0
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
@@ -298,7 +298,7 @@ InputManager:
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
-    positiveButton: joystick button 2
+    positiveButton: joystick button 1
     altNegativeButton: 
     altPositiveButton: 
     gravity: 1000
@@ -325,6 +325,38 @@ InputManager:
     type: 0
     axis: 0
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Dash
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 4
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Interaction
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 5
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
   - serializedVersion: 3
     m_Name: Submit
     descriptiveName: 

ProjectSettings/Physics2DSettings.asset

@@ -52,4 +52,4 @@ Physics2DSettings:
   m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
   m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
   m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-  m_LayerCollisionMatrix: fedffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9ffeffffdffffffffffffffedffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: fedffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9ff6ffffdffffffffffffffedff6ffffffffffffffffffffdff6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

ProjectSettings/TagManager.asset

@@ -30,8 +30,8 @@ TagManager:
   - PlayerAttack
   - EnemyCollider
   - EnemyTrigger
-  - PortalSurface
-  - 
+  - EnemyAttack
+  - Player
   - 
   - 
   - 
@@ -54,9 +54,6 @@ TagManager:
   - name: Background
     uniqueID: 2317547663
     locked: 0
-  - name: Spike
-    uniqueID: 3612720217
-    locked: 0
   - name: Wall
     uniqueID: 3278214247
     locked: 0
@@ -72,6 +69,9 @@ TagManager:
   - name: Player
     uniqueID: 2216026111
     locked: 0
+  - name: Spike
+    uniqueID: 3612720217
+    locked: 0
   - name: Door
     uniqueID: 343148499
     locked: 0