NoteHit시 노트가 Dissolve 되도록 구현, Combo & Score UI 간단히 구현, Miss 이펙트 추가

928ffea4 · 15박보승 · 48cee20a · 928ffea4 · 928ffea4 · 928ffea4
Commit 928ffea4 authored Nov 17, 2019 by 15박보승
13 changed files
--- a/RhythmKata/Assets/Prefabs/HitEffects/Hit.prefab
+++ b/RhythmKata/Assets/Prefabs/HitEffects/Hit.prefab
@@ -9568,7 +9568,7 @@ ParticleSystem:
  serializedVersion: 6
  lengthInSec: 0.2
  simulationSpeed: 1
-  stopAction: 0
+  stopAction: 2
  cullingMode: 1
  ringBufferMode: 0
  ringBufferLoopRange: {x: 0, y: 1}

--- a/RhythmKata/Assets/Prefabs/HitEffects/Miss.prefab
+++ b/RhythmKata/Assets/Prefabs/HitEffects/Miss.prefab
--- a/RhythmKata/Assets/Prefabs/HitEffects/Miss.prefab.meta
+++ b/RhythmKata/Assets/Prefabs/HitEffects/Miss.prefab.meta
+fileFormatVersion: 2
+guid: b8ffb5b84b254524abff419289c5adfd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RhythmKata/Assets/Prefabs/HitEffects/Perfect.prefab
+++ b/RhythmKata/Assets/Prefabs/HitEffects/Perfect.prefab
@@ -43,7 +43,7 @@ ParticleSystem:
  serializedVersion: 6
  lengthInSec: 0.1
  simulationSpeed: 1
-  stopAction: 0
+  stopAction: 2
  cullingMode: 3
  ringBufferMode: 0
  ringBufferLoopRange: {x: 0, y: 1}

--- a/RhythmKata/Assets/Scenes/bs.unity
+++ b/RhythmKata/Assets/Scenes/bs.unity
@@ -426,6 +426,7 @@ MonoBehaviour:
  endPoint: {x: 0, y: 0, z: 0}
  maxRemainedTime: 1
  perfectZ: 10
+  hitSfx: []
  ring: {fileID: 0}
 --- !u!1 &1568604744
 GameObject:
@@ -518,279 +519,3 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1476454008900265553
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1476454008853626150, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_Name
-      value: EdgeNote_Right
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1476454008853626154, guid: e0e69648f23437c4394a4c865b081a3c,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e0e69648f23437c4394a4c865b081a3c, type: 3}
--- !u!1001 &4081910931898087486
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4081910931583206819, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_Name
-      value: EdgeNote_Up
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4081910931583206815, guid: f6a8ec676165ce1479337b2502af3a33,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 90
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f6a8ec676165ce1479337b2502af3a33, type: 3}
--- !u!1001 &4640709078985071476
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4640709078173886784, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_Name
-      value: EdgeNote_Down
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4640709078173886796, guid: 578b592ddecefcb40961f3c98b2c3df7,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 90
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 578b592ddecefcb40961f3c98b2c3df7, type: 3}
--- !u!1001 &4734231540859330529
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4734231541000158423, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_Name
-      value: EdgeNote_Left
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -5
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 50
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4734231541000158427, guid: 416e07754d262cc4d87d8a3525a57b3f,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 416e07754d262cc4d87d8a3525a57b3f, type: 3}
--- a/RhythmKata/Assets/Scenes/mergescene.unity
+++ b/RhythmKata/Assets/Scenes/mergescene.unity
@@ -204,6 +204,232 @@ PrefabInstance:
      objectReference: {fileID: 2100000, guid: 8b1348d66ad68bd4096d8cf9a78088f3, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 183d1d3e655e0294c8f38c5b687642a8, type: 3}
+--- !u!1 &85913485
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 85913486}
+  - component: {fileID: 85913488}
+  - component: {fileID: 85913487}
+  m_Layer: 5
+  m_Name: ScoreText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &85913486
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 85913485}
+  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: 248867247}
+  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: 25}
+  m_SizeDelta: {x: 200, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &85913487
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 85913485}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Score
+--- !u!222 &85913488
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 85913485}
+  m_CullTransparentMesh: 0
+--- !u!1 &150320121
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 150320122}
+  - component: {fileID: 150320124}
+  - component: {fileID: 150320123}
+  m_Layer: 5
+  m_Name: ComboText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &150320122
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150320121}
+  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: 1667663162}
+  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: 200, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &150320123
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150320121}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &150320124
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 150320121}
+  m_CullTransparentMesh: 0
+--- !u!1 &161512836
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 341502039}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 161512837}
+  m_Layer: 0
+  m_Name: Tunnel (1) (Missing Prefab)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &161512837
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 341502039}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 161512836}
+  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: 2112533739}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &248867246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 248867247}
+  m_Layer: 5
+  m_Name: Score
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &248867247
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 248867246}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 300}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 85913486}
+  - {fileID: 1245177462}
+  m_Father: {fileID: 554573586}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: -200, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &341502039
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -376,9 +602,11 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 554573582}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 20}
+  m_LocalPosition: {x: 0, y: 0, z: 100}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
+  m_Children:
+  - {fileID: 248867247}
+  - {fileID: 1667663162}
  m_Father: {fileID: 0}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -401,8 +629,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  ringUIPrefab: {fileID: 8100479809720507869, guid: 13fc3a8405d796e4e87e099e870cc446,
    type: 3}
-  scoreText: {fileID: 0}
-  comboText: {fileID: 0}
+  scoreText: {fileID: 1245177463}
+  comboText: {fileID: 150320123}
 --- !u!4 &571765379 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9,
@@ -482,7 +710,7 @@ MonoBehaviour:
  hitEffectPrefabs:
  - {fileID: 5999576302179210679, guid: 39e07a022f545624db4f9f7a8480a8d3, type: 3}
  - {fileID: 5740315542072016546, guid: e640eeafa4d7b8645b26c885d7eba308, type: 3}
-  - {fileID: 5740315542072016546, guid: e640eeafa4d7b8645b26c885d7eba308, type: 3}
+  - {fileID: 6174125659501725093, guid: b8ffb5b84b254524abff419289c5adfd, type: 3}
  gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
  explosion: {fileID: 0}
  fire:
@@ -600,6 +828,115 @@ AudioSource:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+--- !u!1 &1245177461
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1245177462}
+  - component: {fileID: 1245177464}
+  - component: {fileID: 1245177463}
+  m_Layer: 5
+  m_Name: ScoreValueTet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1245177462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1245177461}
+  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: 248867247}
+  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: 0, y: 0}
+  m_SizeDelta: {x: 200, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1245177463
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1245177461}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, 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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
+--- !u!222 &1245177464
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1245177461}
+  m_CullTransparentMesh: 0
+--- !u!1 &1371036545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 23206332}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1371036546}
+  m_Layer: 0
+  m_Name: Tunnel (Missing Prefab)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1371036546
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 23206332}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1371036545}
+  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: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1568604744
 GameObject:
  m_ObjectHideFlags: 0
@@ -691,6 +1028,42 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1667663161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1667663162}
+  m_Layer: 5
+  m_Name: Combo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1667663162
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1667663161}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 300}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 150320122}
+  m_Father: {fileID: 554573586}
+  m_RootOrder: 1
+  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: 200, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &1988354649
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -751,14 +1124,34 @@ PrefabInstance:
      propertyPath: inputSource
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 2083460, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
+      propertyPath: far clip plane
+      value: 600
+      objectReference: {fileID: 0}
+    - target: {fileID: 2014920, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
+      propertyPath: far clip plane
+      value: 600
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
--- !u!1 &2112533737 stripped
+--- !u!1 &2112533737
 GameObject:
+  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8,
    type: 3}
  m_PrefabInstance: {fileID: 341502039}
  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2112533739}
+  - component: {fileID: 2112533738}
+  m_Layer: 0
+  m_Name: Missing Prefab (Dummy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
 --- !u!114 &2112533738
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -772,3 +1165,17 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  incr: 1
+--- !u!4 &2112533739
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 341502039}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2112533737}
+  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: 161512837}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/RhythmKata/Assets/Scripts/Core/Level.cs
+++ b/RhythmKata/Assets/Scripts/Core/Level.cs
@@ -23,7 +23,7 @@ class Level
                {
                    note.Deactivate();
                }
-                
+
                note.HandleJudge(judge);
            }
        }

--- a/RhythmKata/Assets/Scripts/IngameUIManager.cs
+++ b/RhythmKata/Assets/Scripts/IngameUIManager.cs
@@ -9,6 +9,7 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>

    public Text scoreText;
    public Text comboText;
+    private Vector3 comboTextPosition;

    private void Start()
    {
@@ -33,6 +34,17 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
        if (combo < 1)
            comboText.text = "";
        else
+        {
            comboText.text = combo.ToString() + " Combo!";
+            StartCoroutine(ComboRoutine());
+        }
+    }
+    private IEnumerator ComboRoutine()
+    {
+        for (float t = 0; t < 0.2f; t += Time.deltaTime) {
+            comboText.transform.localPosition = Vector3.Lerp(new Vector3(0, 10), Vector3.zero, t * 5);
+            yield return new WaitForEndOfFrame();
+        }
+        comboText.transform.localPosition = Vector3.zero;
    }
 }
--- a/RhythmKata/Assets/Scripts/NoteObject.cs
+++ b/RhythmKata/Assets/Scripts/NoteObject.cs
@@ -14,7 +14,7 @@ public abstract class NoteObject : MonoBehaviour
    public Vector3 endPoint;

 	public float maxRemainedTime = 5;
-	public float perfectZ = 10;
+	public float perfectZ = 50;

    public AudioClip[] hitSfx;

@@ -60,10 +60,17 @@ public abstract class NoteObject : MonoBehaviour

            // TODO: temporary implementation
            // make note invisible
+
+            StartCoroutine(DissolveRoutine());
+
+            /*
            var meshRenderer = gameObject.GetComponent<MeshRenderer>();
            var trailRenderer = gameObject.GetComponent<TrailRenderer>();
            if (meshRenderer) meshRenderer.enabled = false;
            if (trailRenderer) trailRenderer.enabled = false;
+            */
+
+            PlayEngine.inst.HandleNoteJudge(judge.type);
        }
    }

@@ -75,4 +82,38 @@ public abstract class NoteObject : MonoBehaviour
    }

    public abstract bool IsHit(Ray ray);
+
+    private IEnumerator DissolveRoutine()
+    {
+        Material mat = new Material(Shader.Find("Unlit/Dissolve"));
+        MeshRenderer mr = GetComponent<MeshRenderer>();
+        mat.SetColor("_Color", mr.material.color);
+        mat.SetColor("_Glow", (Color.white + mr.material.color) / 2);
+        mr.material = mat;
+
+        Texture2D noise = new Texture2D(100, 100);
+
+        float scale = UnityEngine.Random.Range(20, 50);
+        for (int i = 0; i < noise.width; ++i)
+        {
+            for (int j = 0; j < noise.height; ++j)
+            {
+                float noiseVal = Mathf.PerlinNoise(scale * i / noise.width, scale * j / noise.height);
+                noise.SetPixel(i, j, new Color(noiseVal, noiseVal, noiseVal, 1));
+            }
+        }
+        noise.Apply();
+        mat.SetTexture("_NoiseTex", noise);
+
+        const float time = 0.5f;
+
+        for (float t = 0; t < time; t += Time.deltaTime)
+        {
+            //print(t / time);
+            mat.SetFloat("_Threshold", t / time);
+            yield return null;
+        }
+        mat.SetFloat("_Threshold", 1);
+
+    }
 }
--- a/RhythmKata/Assets/Scripts/PlayEngine.cs
+++ b/RhythmKata/Assets/Scripts/PlayEngine.cs
@@ -30,7 +30,10 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>

    public SteamVR_Action_Boolean fire;
    public SteamVR_Input_Sources leftHand;
-    public SteamVR_Input_Sources rightHand; 
+    public SteamVR_Input_Sources rightHand;
+
+    private int combo;
+    private int score;

    public void Start()
    {
@@ -121,6 +124,20 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
            startDspTime -= 1.0f;
        }
    }
+
+    // Simple implementations of Combo, Score UIs
+    // It needs to be changed if PlayEngine don't have any responsibilities of score & combo
+    public void HandleNoteJudge(JudgeType type)
+    {
+        if (type == JudgeType.Ignore)
+            return;
+        combo = type != JudgeType.Miss ? combo + 1 : 0;
+        score += (int)type;
+
+        IngameUIManager.inst.UpdateComboUI(combo);
+        IngameUIManager.inst.UpdateScoreUI(score);
+    }
+    //
 }

 public class PlayerInput

--- a/RhythmKata/Assets/Shaders.meta
+++ b/RhythmKata/Assets/Shaders.meta
+fileFormatVersion: 2
+guid: c914f324cf453f049a32e43b44daeee1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/RhythmKata/Assets/Shaders/Dissolve.shader
+++ b/RhythmKata/Assets/Shaders/Dissolve.shader
+Shader "Unlit/Dissolve"
+{
+    Properties
+    {
+        _MainTex("Texture", 2D) = "white" {}
+        _Color("Color", Color) = (1, 1, 1, 1)
+        _NoiseTex("Noise_Texture", 2D) = "white" {}
+        _Threshold("Threshold" , range(0,1)) = 0
+        _Glow("Glow", Color) = (1, 0.5, 0.5, 1)
+        _EmissionAmount("Emission amount", float) = 1
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            // make fog work
+            #pragma multi_compile_fog
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                UNITY_TRANSFER_FOG(o,o.vertex);
+                return o;
+            }
+
+            fixed4 _Color;
+            sampler2D _NoiseTex;
+            float _Threshold;
+            fixed4 _Glow;
+            float _EmissionAmount;
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                fixed4 col = tex2D(_MainTex, i.uv) * _Color;
+                if (col.a < 0.01f)
+                    discard;
+                if (tex2D(_NoiseTex, i.uv).r < _Threshold)
+                    discard;
+                else if (tex2D(_NoiseTex, i.uv).r < _Threshold + 0.05f)
+                    col = lerp(_Glow, col, (tex2D(_NoiseTex, i.uv).r - _Threshold) * 20);
+                //else
+                //    o.Emission = _Glow * _EmissionAmount * pow(1 - (tex2D(_NoiseTex, IN.uv_MainTex).r - _Threshold), 10);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}
--- a/RhythmKata/Assets/Shaders/Dissolve.shader.meta
+++ b/RhythmKata/Assets/Shaders/Dissolve.shader.meta
+fileFormatVersion: 2
+guid: 457a7835d317dbd40a3c3467b0006e70
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: