Merge remote-tracking branch 'origin/notemovement'

RhythmKata/Assets/Resources/SFX/SFX Project/sfx Project/Samples/Recorded.meta

-fileFormatVersion: 2
-guid: d9a533cec04e2124e9c31541b4f63e72
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

RhythmKata/Assets/Scripts/CameraController.cs

@@ -13,10 +13,7 @@ public class CameraController : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        if (Input.GetMouseButtonDown(0))
-		{
-			CameraShake(0.2f, 0.1f);
-		}
+
     }
 
 	private void OnDrawGizmos()

RhythmKata/Assets/Scripts/EdgeNoteObject.cs

@@ -28,7 +28,7 @@ public class EdgeNoteObject : NoteObject
     {
         PlayJudgeSfx(type);
 
-        PlayEngine.inst.HandleNoteJudge(type.type);
+        PlayEngine.inst.HandleNoteJudge(type);
         BlinkLight light = Instantiate(PlayEngine.inst.edgeHitEffectPrefab, -5 * direction, Quaternion.identity);
         light.transform.LookAt(Vector3.zero);
         light.Init(type.type);

RhythmKata/Assets/Scripts/NoteObject.cs

@@ -77,7 +77,7 @@ public abstract class NoteObject : MonoBehaviour
             if (trailRenderer) trailRenderer.enabled = false;
             
 
-            PlayEngine.inst.HandleNoteJudge(judge.type);
+            PlayEngine.inst.HandleNoteJudge(judge);
         }
     }
 

RhythmKata/Assets/Scripts/PlayEngine.cs

@@ -41,8 +41,10 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
     private MotionTracker leftHandTracker = new MotionTracker();
     private MotionTracker rightHandTracker = new MotionTracker();
 
-    private int combo;
-    private int score;
+	public int maxCombo;
+    public int combo;
+    public int score;
+	public int perfect, hit, miss;
 
     [SerializeField]
     private Transform HitEffectObjects;
@@ -74,6 +76,8 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
         audioSource.clip = audioFile;
         audioSource.PlayScheduled(playOffset + dspTime);
         Debug.Log(playOffset);
+
+		combo = maxCombo = score = miss = perfect = hit = 0;
     }
 
     void OnEnable()
@@ -157,6 +161,13 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
                     throw e;
                 }
             }
+
+			if (!audioSource.isPlaying)
+			{
+				level = null;
+				IngameUIManager.inst.UpdateResultUIs(perfect, hit, miss, score, combo);
+				IngameUIManager.inst.ChangeUISet(UISetType.RESULT);
+			}
         }
 
         if (Input.GetKeyDown(KeyCode.LeftArrow))
@@ -236,17 +247,32 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
 
     // 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)
+    public void HandleNoteJudge(JudgeResult result)
     {
+		JudgeType type = result.type;
         if (type == JudgeType.Ignore)
             return;
         combo = type != JudgeType.Miss ? combo + 1 : 0;
-        score += (int)type;
+		maxCombo = Mathf.Max(maxCombo, combo);
+        score += (int)type * (result.correctHand ? 2 : 1) + combo;
 
         IngameUIManager.inst.UpdateComboUI(combo);
         IngameUIManager.inst.UpdateScoreUI(score);
 
-        foreach (var renderer in HitEffectObjects.GetComponentsInChildren<MeshRenderer>())
+		switch (type)
+		{
+			case JudgeType.Miss:
+				miss++;
+				break;
+			case JudgeType.Hit:
+				hit++;
+				break;
+			case JudgeType.Perfect:
+				perfect++;
+				break;
+		}
+
+		foreach (var renderer in HitEffectObjects.GetComponentsInChildren<MeshRenderer>())
         {
             Color col = Color.white;
             switch (type)

RhythmKata/Assets/Scripts/ReloadNoteObject.cs

@@ -34,7 +34,7 @@ public class ReloadNoteObject : NoteObject
             Instantiate(hitEffect, transform.position, Quaternion.identity);
             StartCoroutine(DissolveRoutine());
 
-            PlayEngine.inst.HandleNoteJudge(judge.type);
+            PlayEngine.inst.HandleNoteJudge(judge);
         }
     }