ReloadNote 가시성 향상, 이펙트 추가

RhythmKata/Assets/Materials/DefaultNote 1.mat

@@ -99,7 +99,7 @@ Material:
     - _ZWrite: 1
     - _ccccc: 0.2393162
     m_Colors:
-    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _Flip: {r: 1, g: 1, b: 1, a: 1}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}

RhythmKata/Assets/Prefabs/HitEffects/ReloadEffect.prefab.meta

+fileFormatVersion: 2
+guid: 5344371414a58eb41aa267f487c5785f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

RhythmKata/Assets/Scenes/mergescene.unity

@@ -1788,6 +1788,26 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 606434533}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &627398499 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1987798860735362752, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
+    type: 3}
+  m_PrefabInstance: {fileID: 1406776873}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &627398503
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 627398499}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Convex: 0
+  m_CookingOptions: 14
+  m_Mesh: {fileID: 6827258281919849101, guid: 4d903fd8ede302944bd18fbe4d9d9d3c, type: 3}
 --- !u!1 &688029942
 GameObject:
   m_ObjectHideFlags: 0
@@ -3328,11 +3348,14 @@ MonoBehaviour:
   - {fileID: 1476454008853626157, guid: e0e69648f23437c4394a4c865b081a3c, type: 3}
   - {fileID: 4640709078173886797, guid: 578b592ddecefcb40961f3c98b2c3df7, type: 3}
   - {fileID: 4734231541000158426, guid: 416e07754d262cc4d87d8a3525a57b3f, type: 3}
+  ReloadNoteObject: {fileID: 6879579829033429641, guid: b9678686fc75ea54fbfe8db9366cdf26,
+    type: 3}
   test: 0
   hitEffectPrefabs:
   - {fileID: 5999576302179210679, guid: 39e07a022f545624db4f9f7a8480a8d3, type: 3}
   - {fileID: 5740315542072016546, guid: e640eeafa4d7b8645b26c885d7eba308, type: 3}
   - {fileID: 6174125659501725093, guid: b8ffb5b84b254524abff419289c5adfd, type: 3}
+  - {fileID: 2436767802828429886, guid: 5344371414a58eb41aa267f487c5785f, type: 3}
   edgeHitEffectPrefab: {fileID: 4885439205028740642, guid: 5fea3dd5a73f8574aa47be477618f7ff,
     type: 3}
   gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
@@ -3343,6 +3366,12 @@ MonoBehaviour:
   leftHand: 1
   rightHand: 2
   player: {fileID: 1862978657}
+  maxCombo: 0
+  combo: 0
+  score: 0
+  perfect: 0
+  hit: 0
+  miss: 0
   HitEffectObjects: {fileID: 1050898621}
 --- !u!4 &1402778658
 Transform:
@@ -3356,7 +3385,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1406776873
 PrefabInstance:
@@ -3408,7 +3437,7 @@ PrefabInstance:
     - target: {fileID: 7594273089694400589, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 7594273089694400589, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
         type: 3}

RhythmKata/Assets/Scripts/Core/Note.cs

@@ -291,7 +291,6 @@ class ReloadNote : ActionNote
     }
 }
 
-
 public enum NoteType
 {
     Front,

RhythmKata/Assets/Scripts/ReloadNoteObject.cs

@@ -18,21 +18,18 @@ public class ReloadNoteObject : NoteObject
     {
         PlayJudgeSfx(judge);
 
-        GameObject hitEffect = null;
-        // hit effect
-
-        if (judge.type == JudgeType.Perfect)
-            hitEffect = PlayEngine.inst.hitEffectPrefabs[0];
-        if (judge.type == JudgeType.Hit)
-            hitEffect = PlayEngine.inst.hitEffectPrefabs[1];
-        if (judge.type == JudgeType.Miss)
-            hitEffect = PlayEngine.inst.hitEffectPrefabs[2];
-        OnNoteHit?.Invoke(judge);
-
-        if (hitEffect && judge.type != JudgeType.Ignore)
+
+        if (judge.type != JudgeType.Ignore)
         {
-            Instantiate(hitEffect, transform.position, Quaternion.identity);
-            StartCoroutine(DissolveRoutine());
+
+			if (judge.type != JudgeType.Miss)
+			{
+				GameObject hitEffect = PlayEngine.inst.hitEffectPrefabs[3];
+				Instantiate(hitEffect);
+				gameObject.SetActive(false);
+			}
+			else
+				StartCoroutine(DissolveRoutine());
 
             PlayEngine.inst.HandleNoteJudge(judge);
         }
@@ -44,13 +41,13 @@ public class ReloadNoteObject : NoteObject
         MeshRenderer[] mrs = GetComponentsInChildren<MeshRenderer>();
 
         foreach (var mr in mrs) {
-            mat.SetColor("_Color", mr.material.color);
-            mat.SetColor("_Glow", (Color.white + mr.material.color) / 2);
+            mat.SetColor("_Color", Color.white);
+            mat.SetColor("_Glow", (Color.red + mr.material.color) / 2);
             mr.material = mat;
 
             Texture2D noise = new Texture2D(100, 100);
 
-            float scale = UnityEngine.Random.Range(20, 50);
+            float scale = UnityEngine.Random.Range(2, 5);
             for (int i = 0; i < noise.width; ++i)
             {
                 for (int j = 0; j < noise.height; ++j)
@@ -90,17 +87,15 @@ public class ReloadNoteObject : NoteObject
             var pos = cat.localPosition;
             cat.localPosition = new Vector3(pos.x, -0.25f * Mathf.Pow((remainedTime-0.01f) * 3, 4) + 1f, 1f);
         }
-        if (Mathf.Abs(remainedTime) < 0.1f)
-        {
-            foreach(var cat in cartridges)
-            {
-
-                var renderer = cat.gameObject.GetComponentInChildren<MeshRenderer>();
-                renderer.material.color = Color.Lerp(Color.white, Color.red, 1 - 4 * Mathf.Pow(remainedTime, 3));
-            }
-        }
-
-        text.position = endPoint + new Vector3(0, 0, 300) * remainedTime;
+		if (Mathf.Abs(remainedTime) < 0.1f)
+		{
+			foreach (var cat in cartridges)
+			{
+				var renderer = cat.gameObject.GetComponent<MeshRenderer>();
+				renderer.material.color = Color.Lerp(Color.white, Color.red, 1 - 4 * Mathf.Pow(remainedTime, 3));
+			}
+		}
+		text.position = endPoint + new Vector3(0, 0, 300) * remainedTime;
 
     }
 }