콤보 UI 구현

Grapplers/Assets/Scenes/SampleScene.unity

@@ -452,6 +452,85 @@ Transform:
   m_Father: {fileID: 235153515}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &109917889
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 109917890}
+  - component: {fileID: 109917892}
+  - component: {fileID: 109917891}
+  m_Layer: 5
+  m_Name: DamageText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &109917890
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 109917889}
+  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: 2022730065}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &109917891
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 109917889}
+  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: 1, 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: 50
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 50
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
+--- !u!222 &109917892
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 109917889}
+  m_CullTransparentMesh: 0
 --- !u!1001 &210062639
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1052,6 +1131,7 @@ RectTransform:
   - {fileID: 1972759491}
   - {fileID: 1169779395}
   - {fileID: 1271003726}
+  - {fileID: 2022730065}
   m_Father: {fileID: 0}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1082,6 +1162,9 @@ MonoBehaviour:
   weaponUI: {fileID: 1169779396}
   skillUI: {fileID: 1271003727}
   skillCooltimeText: {fileID: 753385907}
+  comboUI: {fileID: 2022730064}
+  comboText: {fileID: 568411866}
+  damageText: {fileID: 109917891}
 --- !u!1 &477462021
 GameObject:
   m_ObjectHideFlags: 0
@@ -6088,6 +6171,85 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 60f985c4e15827746af49ee480a2d6f9, type: 3}
+--- !u!1 &568411864
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 568411865}
+  - component: {fileID: 568411867}
+  - component: {fileID: 568411866}
+  m_Layer: 5
+  m_Name: ComboText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &568411865
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568411864}
+  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: 2022730065}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &568411866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568411864}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 50
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 50
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0 Combo!
+--- !u!222 &568411867
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 568411864}
+  m_CullTransparentMesh: 0
 --- !u!1 &705507993
 GameObject:
   m_ObjectHideFlags: 0
@@ -17753,6 +17915,43 @@ Transform:
   m_Father: {fileID: 235153515}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2022730064
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2022730065}
+  m_Layer: 5
+  m_Name: ComboUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &2022730065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2022730064}
+  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: 109917890}
+  - {fileID: 568411865}
+  m_Father: {fileID: 413298776}
+  m_RootOrder: 6
+  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: -50, y: 0}
+  m_SizeDelta: {x: 320, y: 160}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &2110329762
 GameObject:
   m_ObjectHideFlags: 0

Grapplers/Assets/Scripts/IngameUIManager.cs

@@ -28,6 +28,14 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
 	[SerializeField]
 	private Text skillCooltimeText;
 
+	[SerializeField]
+	private GameObject comboUI;
+	[SerializeField]
+	private Text comboText;
+	[SerializeField]
+	private Text damageText;
+	private Coroutine disableComboRoutine;
+
 	public void UpdateTargetLockedUIs(Vector3[] pos)
 	{
 		int tmp, i = 0;
@@ -107,4 +115,21 @@ public class IngameUIManager : SingletonBehaviour<IngameUIManager>
 		else
 			skillCooltimeText.text = string.Format("{0:F1}", remain);
 	}
+
+	public void UpdateComboUI(int damage)
+	{
+		if (disableComboRoutine != null)
+			StopCoroutine(disableComboRoutine);
+		comboUI.SetActive(true);
+		comboText.text = (int.Parse(comboText.text.Split(' ')[0]) + 1).ToString() + " Combo!";
+		damageText.text = (int.Parse(damageText.text) + damage).ToString();
+		disableComboRoutine = StartCoroutine(DisableUI(comboUI, 5));
+	
+	}
+
+	private IEnumerator DisableUI(GameObject ui, float sec)
+	{
+		yield return new WaitForSeconds(sec);
+		ui.SetActive(false);
+	}
 }

Grapplers/Assets/Scripts/WeaponBehaviour.cs

@@ -99,7 +99,8 @@ public class Gun : IWeapon
 			effect.Play();
 			foreach (var enemy in hitEnemies)
 			{
-				enemy?.GetDamaged(weaponDamage);
+				enemy.GetDamaged(weaponDamage);
+				IngameUIManager.inst.UpdateComboUI(weaponDamage);
 			}
 			timer = gunShotInterval;
 		}
@@ -164,6 +165,7 @@ public class Knife : IWeapon
 			foreach (var enemy in hitEnemies)
 			{
 				enemy.GetDamaged(weaponDamage);
+				IngameUIManager.inst.UpdateComboUI(weaponDamage);
 				if (enemy.IsDead)
 					skillTimer = 0;
 			}
@@ -231,6 +233,7 @@ public class Knife : IWeapon
 			if (enemy == null)
 				continue;
 			enemy.GetDamaged(weaponDamage);
+			IngameUIManager.inst.UpdateComboUI(weaponDamage);
 			if (enemy.IsDead)
 				skillTimer = 0;
 		}