FX 추가

BangRin · May 31, 2020 · ba73044 · ba73044
1 parent d649d15
commit ba73044
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 5 deletions.
diff --git a/RhythmGame/Assets/Scenes/GameScene.unity b/RhythmGame/Assets/Scenes/GameScene.unity
@@ -467,6 +467,99 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 425380526}
   m_CullTransparentMesh: 0
+--- !u!1 &464532423
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 464532424}
+  - component: {fileID: 464532426}
+  - component: {fileID: 464532425}
+  - component: {fileID: 464532427}
+  m_Layer: 5
+  m_Name: PERFECT_FX
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &464532424
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464532423}
+  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: 2136097117}
+  m_RootOrder: 7
+  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: -298, y: 142}
+  m_SizeDelta: {x: 195.2, y: 52.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &464532425
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464532423}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.89933217, 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: 53
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 124
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: PERFECT
+--- !u!222 &464532426
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464532423}
+  m_CullTransparentMesh: 0
+--- !u!114 &464532427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 464532423}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2049edb1f535dd745b67a949e39a9746, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetText: {fileID: 464532425}
 --- !u!1 &485945941
 GameObject:
   m_ObjectHideFlags: 0
@@ -1239,6 +1332,99 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 876582750}
   m_CullTransparentMesh: 0
+--- !u!1 &930906507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 930906508}
+  - component: {fileID: 930906511}
+  - component: {fileID: 930906510}
+  - component: {fileID: 930906509}
+  m_Layer: 5
+  m_Name: MISS_FX
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &930906508
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 930906507}
+  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: 2136097117}
+  m_RootOrder: 8
+  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: -298, y: 142}
+  m_SizeDelta: {x: 195.2, y: 52.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &930906509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 930906507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2049edb1f535dd745b67a949e39a9746, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetText: {fileID: 930906510}
+--- !u!114 &930906510
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 930906507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7924528, g: 0.0963971, 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: 53
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 124
+    m_Alignment: 1
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: MISS
+--- !u!222 &930906511
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 930906507}
+  m_CullTransparentMesh: 0
 --- !u!1 &948986679
 GameObject:
   m_ObjectHideFlags: 0
@@ -1719,6 +1905,8 @@ MonoBehaviour:
   missCountText: {fileID: 749004740}
   perfectCountText: {fileID: 948986680}
   titleText: {fileID: 2047061375}
+  perfectFX: {fileID: 464532423}
+  missFX: {fileID: 930906507}
   videoPlayer: {fileID: 485945943}
   score: 0
 --- !u!114 &1514192001
@@ -2321,6 +2509,8 @@ RectTransform:
   - {fileID: 948986682}
   - {fileID: 744279323}
   - {fileID: 1087981824}
+  - {fileID: 464532424}
+  - {fileID: 930906508}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

diff --git a/RhythmGame/Assets/Script/GameManager.cs b/RhythmGame/Assets/Script/GameManager.cs
@@ -24,6 +24,11 @@ public static GameManager Instance
     public Text perfectCountText;
     public Text titleText;
 
+
+    public GameObject perfectFX;
+    public GameObject missFX;
+
+
     public VideoPlayer videoPlayer;
 
     private SongData currentSong;
@@ -40,6 +45,14 @@ public int missCount
         }
         set
         {
+            if (_missCount < value)
+            {
+                perfectFX.SetActive(false);
+                missFX.SetActive(false);
+                missFX.SetActive(true);
+            }
+
+
             missCountText.text = string.Format("Miss : {0}", value);
             _missCount = value;
         }
@@ -55,6 +68,14 @@ public int perfectCount
         }
         set
         {
+            if(_perfectCount < value)
+            {
+                missFX.SetActive(false);
+                perfectFX.SetActive(false);
+                perfectFX.SetActive(true);
+            }
+
+
             perfectCountText.text = string.Format("Perfect : {0}", value);
             _perfectCount = value;
         }

diff --git a/RhythmGame/Assets/Script/Key.cs b/RhythmGame/Assets/Script/Key.cs
@@ -17,7 +17,6 @@ void Update()
     {
         if(Input.GetKeyDown(keyCode)) // 누른 시점
         {
-            NoteManager.Notes.RemoveAll(t => t == null);
             foreach (var note in NoteManager.Notes.Where(t => t.keyCode == keyCode)
                 .OrderBy(t => Mathf.Abs(this.transform.position.y - t.transform.position.y)))
             {

diff --git a/RhythmGame/Assets/Script/Note.cs b/RhythmGame/Assets/Script/Note.cs
@@ -15,10 +15,10 @@ public void Init(KeyCode _keyCode, float _speed = 300f)
 
     public void Hit(float dif)
     {
-        if (dif > NoteManager.NOTE_MISS_TUNEL * NoteManager.Instance.noteSpeedTimeRatio)
+        if (dif > NoteManager.NOTE_HIT_TUNEL * NoteManager.Instance.noteSpeedTimeRatio)
             return;
 
-        if(dif > NoteManager.NOTE_PERFECT_TUNEL * NoteManager.Instance.noteSpeedTimeRatio) // 30.1f ~ 50 사이는 미스
+        if(dif > NoteManager.NOTE_MISS_TUNEL * NoteManager.Instance.noteSpeedTimeRatio) // 30.1f ~ 50 사이는 미스
         {
             GameManager.Instance.missCount++;
         }
@@ -32,6 +32,7 @@ public void Hit(float dif)
 
     void Remove()
     {
+        NoteManager.Notes.Remove(this);
         Destroy(gameObject);
     }
 

diff --git a/RhythmGame/Assets/Script/NoteManager.cs b/RhythmGame/Assets/Script/NoteManager.cs
@@ -21,8 +21,9 @@ public static NoteManager Instance
 
     public const float NOTE_START_POSITION = 800f;
     public const float NOTE_DEFAULT_SPEED = 300f;
-    public const float NOTE_PERFECT_TUNEL = 50f;
-    public const float NOTE_MISS_TUNEL = 30f;
+    //public const float NOTE_PERFECT_TUNEL = 50f;
+    public const float NOTE_HIT_TUNEL = 100f;
+    public const float NOTE_MISS_TUNEL = 50f;
 
 
 

diff --git a/RhythmGame/Assets/Script/PerfectFX.cs b/RhythmGame/Assets/Script/PerfectFX.cs
@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class PerfectFX : MonoBehaviour
+{
+
+    private int destValue = 54;
+
+    public Text targetText;
+
+    private void OnEnable()
+    {
+        targetText.enabled = true;
+        targetText.fontSize = 1;
+
+        StopCoroutine(TweenAnimation());
+        StartCoroutine(TweenAnimation());
+    }
+    private void OnDisable()
+    {
+        targetText.enabled = false;
+        StopCoroutine(TweenAnimation());
+        targetText.fontSize = 1;
+    }
+
+
+    IEnumerator TweenAnimation()
+    {
+
+        while(targetText.fontSize <= 54)
+        {
+            yield return new WaitForSeconds(0.01f);
+            targetText.fontSize += 4;
+        }
+
+
+        yield return new WaitForSeconds(1f);
+        gameObject.SetActive(false);
+    }
+
+}
diff --git a/RhythmGame/Assets/Script/PerfectFX.cs.meta b/RhythmGame/Assets/Script/PerfectFX.cs.meta