Button Note judgment works correctly

Assets/InitTestScene636511952132748649.unity.meta

-fileFormatVersion: 2
-guid: a83a7fa7a4f7f6b4382c0b23b43fe313
-timeCreated: 1515566013
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636539850929906532.unity.meta

-fileFormatVersion: 2
-guid: 0526a2bf9c9fda24dbecff65be3f2158
-timeCreated: 1518355893
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636539965245787098.unity.meta

-fileFormatVersion: 2
-guid: d2389f6a9e58d0a4a81444158153a41c
-timeCreated: 1518367324
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636539972224041284.unity.meta

-fileFormatVersion: 2
-guid: 3f008c816a8e510448068950e12fa82f
-timeCreated: 1518368022
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636540527754821606.unity.meta

-fileFormatVersion: 2
-guid: c58b960471464594ba79b7b4bb9d8456
-timeCreated: 1518423575
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636540763273503500.unity.meta

-fileFormatVersion: 2
-guid: 2a5bdfec747c5554bb8e1836bbde9bfa
-timeCreated: 1518447127
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636543585396989581.unity.meta

-fileFormatVersion: 2
-guid: ed97868d86289994081e09ef995f7591
-timeCreated: 1518729339
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636543587637149517.unity.meta

-fileFormatVersion: 2
-guid: 27c0dfb4f46da394bbdf8d34b0a9ed87
-timeCreated: 1518729563
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636544444652815272.unity.meta

-fileFormatVersion: 2
-guid: 8fcf519fe09af4c4b8185353f0def4ef
-timeCreated: 1518815265
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636545218775398421.unity.meta

-fileFormatVersion: 2
-guid: 3e4992bf17dae8e44b8880d8867b91ea
-timeCreated: 1518892677
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/InitTestScene636545523835105176.unity.meta

-fileFormatVersion: 2
-guid: b5f132dad262fcc43a19502f6a0ee9e3
-timeCreated: 1518923184
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/JudgeModule/Judge.cs

@@ -29,8 +29,8 @@ namespace JudgeModule
         private const float PerfectTime = 80f,
                             GoodTime    = 100f,
                             BadTime     = 120f;
-    
-        public float ButtonTimingRange { get; private set; }
+
+        private float ButtonTimingRange;
         public int   Score { get; private set; }
         public bool  IsBreak { get; private set; }
         public Color Color { get; private set; }
@@ -38,15 +38,28 @@ namespace JudgeModule
         public static readonly Judge BAD     = JudgeList[2];
         public static readonly Judge MISS    = JudgeList[3];
         public static readonly Judge Perfect = JudgeList[0];
-        public static readonly
-            float MaxButtonTimingRange = BadTime;
-    
+
+        private static readonly float LongTimingBonus = 50;
+        private static readonly float MotionTimingBonus = 100;
+
+        public float TimingRange(bool isLong, bool isMotion)
+        {
+            return ButtonTimingRange +
+                (isLong ? LongTimingBonus : 0) +
+                (isMotion ? MotionTimingBonus : 0);
+        }
+
+        public float TimingRange(Note note)
+        {
+            return TimingRange(note.IsLong, note is MotionNote);
+        }
+
         public static Judge TestJudge(Note note, float elapsedTime, bool end = false)
         {
             float timing = end ? note.EndTiming : note.StartTiming;
             float difference = elapsedTime - timing;
     
-            var result = JudgeList.Where(x => Mathf.Abs(difference) < x.ButtonTimingRange).ToList();
+            var result = JudgeList.Where(x => Mathf.Abs(difference) < x.TimingRange(note)).ToList();
     
             return result.Count == 0 ? JudgeList.Last() : result[0];
         }
@@ -54,7 +67,7 @@ namespace JudgeModule
         public static bool IsPastNote(Note note, float elapsedTime)
         {
             float timing = note.IsLong && note.Activated ? note.EndTiming : note.StartTiming;
-            return elapsedTime - timing > BadTime;
+            return elapsedTime - timing > BAD.TimingRange(note);
         }
     
         public static bool IsNoteStart(Note note, float elapsedTime)
@@ -65,16 +78,14 @@ namespace JudgeModule
     
         public static bool IsNoteEnd(Note note, float elapsedTime)
         {
-            var difference = elapsedTime - note.EndTiming;
-            return difference <= BadTime &&
-                   difference >= 0;
+            return Mathf.Abs(elapsedTime - note.EndTiming) <= BAD.TimingRange(note);
         }
 
         public static bool IsNoteProgress(Note note, float elapsedTime, float interval)
         {
             var timing = note.StartTiming + (interval * (note.JudgeCount + 1));
 
-            return Mathf.Abs(elapsedTime - timing) < PerfectTime &&
+            return Mathf.Abs(elapsedTime - timing) < Perfect.TimingRange(note) &&
                    Mathf.Abs(elapsedTime - timing) <
                        Mathf.Abs(elapsedTime - (timing - interval));
         }

Assets/JudgeModule/JudgeManager.cs

@@ -6,11 +6,14 @@ namespace JudgeModule
 {
     public class JudgeManager
     {
-        private NoteCondition condition;
-        private List<Note> notes;
-        private NoteJudger judger;
+        private NoteCondition       condition;
+        private List<Note>          notes;
+        private NoteJudger          judger;
 
-        private float interval;
+        private float               interval;
+        private GameObject          sample,
+                                    appear;
+        private MotionSampleDisplay sampleDisplay;
 
         public JudgeManager(InputManager input,
                             Action endgame,
@@ -20,16 +23,28 @@ namespace JudgeModule
             condition = new NoteCondition(input);
             judger = new NoteJudger(objects, endgame);
             interval = 60 * 1000f / bpm;
+
+            appear    = objects["appear"];
+            sample    = objects["sample"];
+            sampleDisplay = sample.GetComponent<MotionSampleDisplay>();
+            sample.SetActive(false);
         }
 
         public void JudgeNote(Note note, float timing)
         {
+            if (Judge.IsPastNote(note, timing) ||
+                note.Component.transform.position.x > appear.transform.position.x)
+                return;
+
             if (condition.IsWrongInput(note))
             {
                 judger.WrongNoteProc(note);
                 return;
             }
 
+            if (Judge.IsNoteStart(note, timing))
+                PlaySampleMotion(note as MotionNote, timing);
+
             if (note.IsLong)
                 JudgeLongNote(note, timing);
             else
@@ -49,9 +64,24 @@ namespace JudgeModule
             else if (condition.IsLongNoteFinishCorrectly(note, timing))
                 judger.CorrectlyStoppedNoteProc(note, timing);
             else if (condition.IsLongNoteFinishIncorrectly(note, timing))
-                judger.IncorrectlyStoppedNoteProc(note, timing);
+                judger.IncorrectlyStoppedNoteProc(note);
             else if (condition.IsLongNoteHoldCorrectly(note))
                 judger.ContinuingNoteProc(note, timing, interval);
         }
+
+        void PlaySampleMotion(MotionNote note, float timing)
+        {
+            if (!note.SamplePlayed &&
+                Mathf.Abs(note.StartTiming - timing - interval) < 20f)
+            {
+                note.SamplePlayed = true;
+
+                sample.SetActive(false);
+                sample.SetActive(true);
+                
+                sampleDisplay.sprite = note.Image;
+                sampleDisplay.timeout = interval;
+            }
+        }
     }
 }

Assets/JudgeModule/MotionGageManager.cs

@@ -25,20 +25,15 @@ namespace JudgeModule
         }
         public void UpdateGuage()
         {
-            if (motionGuage.transform.parent.gameObject.activeInHierarchy)
-                UpdateTime();
-
             if (elapsedMotion >= motionTimeout)
                 ResetGuage();
             else
                 motionGuage.GetComponent<Image>().fillAmount = elapsedMotion / motionTimeout;
         }
 
-        public float UpdateTime()
+        public void UpdateTime(float delta)
         {
-            elapsedTime += (Time.deltaTime * 1000);
-
-            return elapsedTime;
+            elapsedTime += delta;
         }
     }
 }

Assets/JudgeModule/NoteCondition.cs

@@ -48,7 +48,11 @@ namespace JudgeModule
 
         public bool IsLongNoteStartCorrectly(Note note)
         {
-            return JudgeInput(note)["long"] == InputStatus.Entered &&
+            var stat = JudgeInput(note);
+            return (
+                        stat["long"] == InputStatus.Entered ||
+                        stat["long"] == InputStatus.Continuing
+                   ) &&
                    !note.Activated;
         }
 
@@ -85,12 +89,5 @@ namespace JudgeModule
                    stat["long"] == InputStatus.Entered ||
                    stat["long"] == InputStatus.Continuing;
         }
-
-        public bool IsNoteBroken(Note note, float timing, Judge judge)
-        {
-            return note.IsLong &&
-                   !Judge.IsNoteEnd(note, timing) &&
-                   (judge == Judge.BAD || judge == Judge.MISS);
-        }
     }
 }
\ No newline at end of file

Assets/JudgeModule/NoteJudger.cs

@@ -20,8 +20,8 @@ namespace JudgeModule
 
         public void WrongNoteProc(Note note)
         {
-            SetJudge(Judge.MISS);
-            DeactivateNote(note);
+            SetJudge(Judge.MISS, judgeText);
+            note.Component.Deactivate(deactives.transform);
 
             if (!(note is MotionNote))
                 EndGame();
@@ -31,47 +31,42 @@ namespace JudgeModule
         {
             var judge = Judge.TestJudge(note, timing);
 
-            SetJudge(judge);
+            SetJudge(judge, judgeText);
 
             if (note.IsLong && !judge.IsBreak)
                 note.Activated = true;
             else
-                DeactivateNote(note);
+                note.Component.Deactivate(deactives.transform);
         }
 
         public void ContinuingNoteProc(Note note, float timing, float interval)
         {
             if (Judge.IsNoteProgress(note, timing, interval))
             {
-                SetJudge(Judge.Perfect);
+                SetJudge(Judge.Perfect, judgeText);
                 ++note.JudgeCount;
             }
         }
 
         public void CorrectlyStoppedNoteProc(Note note, float timing)
         {
-            SetJudge(Judge.TestJudge(note, timing, true));
-            DeactivateNote(note);
+            SetJudge(Judge.TestJudge(note, timing, true), judgeText);
+            note.Component.Deactivate(deactives.transform);
         }
 
-        public void IncorrectlyStoppedNoteProc(Note note, float timing = 0)
+        public void IncorrectlyStoppedNoteProc(Note note)
         {
-            SetJudge(Judge.MISS);
-            DeactivateNote(note);
+            SetJudge(Judge.MISS, judgeText);
+            note.Component.Deactivate(deactives.transform);
         }
 
-        public void DeactivateNote(Note note)
-        {
-            note.Component.Deactivate();
-            note.Component.transform.SetParent(deactives);
-        }
-
-        public void SetJudge(Judge judge)
+        public static void SetJudge(Judge judge, GameObject judgeText)
         {
             AllSceneManager.Combo = judge.IsBreak ? 0 : AllSceneManager.Combo + 1;
             AllSceneManager.Score += judge.Score;
             AllSceneManager.JudgeCount[judge]++;
 
+            judgeText.SetActive(false);
             judgeText.SetActive(true);
             judgeText.GetComponent<Text>().text = judge.Name;
             judgeText.GetComponent<Text>().color = judge.Color;

Assets/Scene/extract.unity.meta

-fileFormatVersion: 2
-guid: 86ac16ed676e3b146b5b95996950d918
-timeCreated: 1518370980
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/test.unity.meta

 fileFormatVersion: 2
 guid: 6c36c432c541722448589b2dbad13896
-timeCreated: 1518346175
+timeCreated: 1519199131
 licenseType: Free
 DefaultImporter:
   externalObjects: {}

Assets/Script/GameManager.cs

-using JudgeModule;
-using System.Collections.Generic;
-using TrackAnalysis;
+using TrackAnalysis;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
@@ -18,7 +16,7 @@ public class GameManager : MonoBehaviour {
                     instance = new GameObject().AddComponent<GameManager>();
 
                 instance.CurrentTrack
-                    = new TrackInfo("Assets/Tracks/Test/Test.bpe");
+                    = new TrackInfo("Assets/Tracks/Tutorial/test2.bpe");
             }
 
             return instance;