Working..

Assets/JudgeModule.meta

+fileFormatVersion: 2
+guid: b8f0efef942ecaa4caff7cc221a81b9a
+folderAsset: yes
+timeCreated: 1518174436
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JudgeModule/MotionGageManager.cs

+using UnityEngine;
+using UnityEngine.UI;
+
+namespace JudgeModule
+{
+    class MotionGageManager
+    {
+        public GameObject motionGuage;
+        private float elapsedMotion;
+        private float motionTimeout;
+        private float elapsedTime = 0;
+
+        public void ResetGuage(float timeout = 0f)
+        {
+            if (timeout <= 0f)
+            {
+                elapsedMotion = 0f;
+                motionGuage.transform.parent.gameObject.SetActive(false);
+                return;
+            }
+
+            motionTimeout = timeout;
+            motionGuage.transform.parent.gameObject.SetActive(true);
+            motionGuage.SetActive(true);
+        }
+        public void UpdateGuage()
+        {
+            if (motionGuage.transform.parent.gameObject.activeInHierarchy)
+                UpdateTime();
+
+            if (elapsedMotion >= motionTimeout)
+                ResetGuage();
+            else
+                motionGuage.GetComponent<Image>().fillAmount = elapsedMotion / motionTimeout;
+        }
+
+        public float UpdateTime()
+        {
+            elapsedTime += (Time.deltaTime * 1000);
+
+            return elapsedTime;
+        }
+    }
+}

Assets/JudgeModule/MotionGageManager.cs.meta

+fileFormatVersion: 2
+guid: e8c5bce833e52b54c87644b6993c484c
+timeCreated: 1518174436
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/JudgeModule/NoteCondition.cs

+using StatusConvert;
+using System.Collections.Generic;
+
+namespace JudgeModule
+{
+    public class NoteCondition
+    {
+        private InputManager manager;
+        public NoteCondition(InputManager inputManager)
+        {
+            manager = inputManager;
+        }
+
+        public Dictionary<string, InputStatus> WrongInput(Note note)
+        {
+            if (note is MotionNote)
+                return new Dictionary<string, InputStatus>
+                {
+                    { "short", manager.ShortButtonStat },
+                    { "long",  manager.LongButtonStat  }
+                };
+            return new Dictionary<string, InputStatus>
+            {
+                { "short", manager.ShortMotionStat },
+                { "long",  manager.LongMotionStat  }
+            };
+        }
+
+        public Dictionary<string, InputStatus> JudgeInput(Note note)
+        {
+            if (note is MotionNote)
+                return new Dictionary<string, InputStatus>
+                {
+                    { "short", manager.MotionToInput((note as MotionNote).MotionName, "short") },
+                    { "long",  manager.MotionToInput((note as MotionNote).MotionName, "long")  }
+                };
+            return new Dictionary<string, InputStatus>
+            {
+                { "short", manager.ShortButtonStat },
+                { "long",  manager.LongButtonStat  }
+            };
+        }
+
+        public bool IsShortNoteEntered(Note note)
+        {
+            return JudgeInput(note)["short"] == InputStatus.Entered;
+        }
+
+        public bool IsLongNoteStartCorrectly(Note note)
+        {
+            return JudgeInput(note)["long"] == InputStatus.Entered &&
+                   !note.Activated;
+        }
+
+        public bool IsLongNoteHoldCorrectly(Note note)
+        {
+            var stat = JudgeInput(note);
+            return (
+                        stat["long"] == InputStatus.Entered ||
+                        stat["long"] == InputStatus.Continuing
+                   ) &&
+                   note.Activated;
+        }
+
+        public bool IsLongNoteFinishCorrectly(Note note, float timing)
+        {
+            return JudgeInput(note)["long"] == InputStatus.Stopped &&
+                   note.Activated &&
+                   Judge.IsNoteEnd(note, timing);
+        }
+
+        public bool IsLongNoteFinishIncorrectly(Note note, float timing)
+        {
+            var stat = JudgeInput(note);
+            return stat["long"] == InputStatus.Stopped &&
+                   (
+                        !note.Activated ||
+                        !Judge.IsNoteEnd(note, timing)
+                   );
+        }
+
+        public bool IsWrongInput(Note note)
+        {
+            var stat = WrongInput(note);
+            return stat["short"] == InputStatus.Entered ||
+                   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/NoteCondition.cs.meta

+fileFormatVersion: 2
+guid: 7a1cd9d6ab06da646b5a4d1ad104a036
+timeCreated: 1518174436
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MotionNotes/Clap.cs

-using System;
-using System.Collections;
 using UnityEngine;
 
 public class Clap : MotionNote

Assets/MotionNotes/Guard.cs

-using System;
-using System.Collections;
 using UnityEngine;
 
 public class Guard : MotionNote

Assets/MotionNotes/HandDown.cs

-using System;
-using System.Collections;
-using UnityEngine;
+using UnityEngine;
 
 public class HandDown : MotionNote
 {

Assets/MotionNotes/HandUp.cs

-using System;
-using System.Collections;
-using UnityEngine;
+using UnityEngine;
 
 public class HandUp : MotionNote
 {

Assets/MotionNotes/Headphone.cs

-using System;
-using System.Collections;
-using UnityEngine;
+using UnityEngine;
 
 public class Headphone : MotionNote
 {

Assets/MotionNotes/Jesus.cs

-using System;
-using System.Collections;
-using UnityEngine;
+using UnityEngine;
 
 public class Jesus : MotionNote
 {

Assets/MotionNotes/Jump.cs

-using System;
-using System.Collections;
 using UnityEngine;
 
 public class Jump : MotionNote

Assets/MotionNotes/OnTheTable.cs

-using System;
-using System.Collections;
-using UnityEngine;
+using UnityEngine;
 
 public class OnTheTable : MotionNote
 {

Assets/MotionNotes/PushUp.cs

-using System;
-using System.Collections;
 using UnityEngine;
 
 public class PushUp : MotionNote

Assets/Script/Judge.cs

@@ -57,6 +57,12 @@ public class Judge
         return elapsedTime - timing > BadTime;
     }
 
+    public static bool IsNoteStart(Note note, float elapsedTime)
+    {
+        return note is MotionNote &&
+               !note.Activated;
+    }
+
     public static bool IsNoteEnd(Note note, float elapsedTime)
     {
         return elapsedTime - note.EndTiming <= BadTime;

Assets/Script/JudgeManager.cs

-using StatusConvert;
+using JudgeModule;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -41,6 +41,7 @@ public class JudgeManager : MonoBehaviour
 
     private InputManager input;
     private NoteCondition condition;
+    private List<Note> notes;
 
     void SetObjectRef()
     {
@@ -66,9 +67,9 @@ public class JudgeManager : MonoBehaviour
     void LoadGameObjects()
     {
         motionSampleDisplayPrefab = Resources.Load("Motion Sample Display") as GameObject;
-        GameManager.Instance.CurrentTrack.Notes.ForEach(LoadNote);
-        //if (GameManager.Instance.defaultSound != null)
-        //    Instantiate(GameManager.Instance.defaultSound);
+        notes = GameManager.Instance.CurrentTrack.Notes.ToList();
+        notes.ForEach(LoadNote);
+
         var sounds = GameObject.Find("Sounds");
         sounds.transform.Cast<Transform>()
                         .ToList()
@@ -115,6 +116,15 @@ public class JudgeManager : MonoBehaviour
         if (note == null)
             return;
 
+        if (condition.IsWrongInput(note))
+        {
+            WrongNoteProc(note);
+            return;
+        }
+
+        if (Judge.IsNoteStart(note, timing))
+            PlaySampleMotion(note as MotionNote);
+
         if (note.IsLong)
             JudgeLongNote(note, timing);
         else
@@ -136,25 +146,31 @@ public class JudgeManager : MonoBehaviour
         return null;
     }
 
+    void PlaySampleMotion(MotionNote note)
+    {
+        GameObject motionSample = Instantiate(motionSampleDisplayPrefab);
+        MotionSampleDisplay msd = motionSample.GetComponent<MotionSampleDisplay>();
+        msd.sprite = note.Image;
+        msd.timeout = MsPerBeat;
+        note.Activated = true;
+        note.MotionSampleDisplay = msd;
+    }
+
     void JudgeShortNote(Note note, float timing)
     {
-        if (condition.IsWrongInput(note))
-            WrongNoteProc(note);
-        else if (condition.IsShortNoteEntered(note))
+        if (condition.IsShortNoteEntered(note))
             EnteredNoteProc(note, timing);
     }
 
     void JudgeLongNote(Note note, float timing)
     {
-        if (condition.IsWrongInput(note))
-            WrongNoteProc(note);
-        else if (condition.IsLongNoteStartCorrectly(note))
+        if (condition.IsLongNoteStartCorrectly(note))
             EnteredNoteProc(note, timing);
-        else if (condition.IsLongNoteHoldCorrectly(note))
+        if (condition.IsLongNoteHoldCorrectly(note))
             ContinuingNoteProc(note, timing);
-        else if (condition.IsLongNoteFinishCorrectly(note, timing))
+        if (condition.IsLongNoteFinishCorrectly(note, timing))
             CorrectlyStoppedNoteProc(note, timing);
-        else if (condition.IsLongNoteFinishIncorrectly(note, timing))
+        if (condition.IsLongNoteFinishIncorrectly(note, timing))
             IncorrectlyStoppedNoteProc(note, timing);
     }
 
@@ -174,7 +190,9 @@ public class JudgeManager : MonoBehaviour
     {
         SetJudge(Judge.TestJudge(note, timing));
 
-        if (!note.IsLong)
+        if (note.IsLong)
+            note.Activated = true;
+        else
             DeactivateNote(note);
     }
 
@@ -274,135 +292,4 @@ public class JudgeManager : MonoBehaviour
             onResult = true;
         }
     }
-
-    private class NoteCondition
-    {
-        private InputManager manager;
-        public NoteCondition(InputManager inputManager)
-        {
-            manager = inputManager;
-        }
-
-        public Dictionary<string, InputStatus> WrongInput(Note note)
-        {
-            if (note is MotionNote)
-                return new Dictionary<string, InputStatus>
-                {
-                    { "short", manager.ShortButtonStat },
-                    { "long",  manager.LongButtonStat  }
-                };
-            return new Dictionary<string, InputStatus>
-            {
-                { "short", manager.ShortMotionStat },
-                { "long",  manager.LongMotionStat  }
-            };
-        }
-
-        public Dictionary<string, InputStatus> JudgeInput(Note note)
-        {
-            if (note is MotionNote)
-                return new Dictionary<string, InputStatus>
-                {
-                    { "short", manager.MotionToInput((note as MotionNote).MotionName, "short") },
-                    { "long",  manager.MotionToInput((note as MotionNote).MotionName, "long")  }
-                };
-            return new Dictionary<string, InputStatus>
-            {
-                { "short", manager.ShortButtonStat },
-                { "long",  manager.LongButtonStat  }
-            };
-        }
-
-        public bool IsShortNoteEntered(Note note)
-        {
-            return JudgeInput(note)["short"] == InputStatus.Entered;
-        }
-
-        public bool IsLongNoteStartCorrectly(Note note)
-        {
-            return JudgeInput(note)["long"] == InputStatus.Entered &&
-                   !note.Activated;
-        }
-
-        public bool IsLongNoteHoldCorrectly(Note note)
-        {
-            var stat = JudgeInput(note);
-            return (
-                        stat["long"] == InputStatus.Entered ||
-                        stat["long"] == InputStatus.Continuing
-                   ) &&
-                   note.Activated;
-        }
-
-        public bool IsLongNoteFinishCorrectly(Note note, float timing)
-        {
-            return JudgeInput(note)["long"] == InputStatus.Stopped &&
-                   note.Activated &&
-                   Judge.IsNoteEnd(note, timing);
-        }
-
-        public bool IsLongNoteFinishIncorrectly(Note note, float timing)
-        {
-            var stat = JudgeInput(note);
-            return stat["long"] == InputStatus.Stopped &&
-                   (
-                        !note.Activated ||
-                        !Judge.IsNoteEnd(note, timing)
-                   );
-        }
-
-        public bool IsWrongInput(Note note)
-        {
-            var stat = WrongInput(note);
-            return stat["short"] == InputStatus.Entered ||
-                   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);
-        }
-    }
 }
-
-class MotionGageManager
-{
-    public GameObject motionGuage;
-    private float elapsedMotion;
-    private float motionTimeout;
-    private float elapsedTime = 0;
-
-    public void ResetGuage(float timeout = 0f)
-    {
-        if (timeout <= 0f)
-        {
-            elapsedMotion = 0f;
-            motionGuage.transform.parent.gameObject.SetActive(false);
-            return;
-        }
-
-        motionTimeout = timeout;
-        motionGuage.transform.parent.gameObject.SetActive(true);
-        motionGuage.SetActive(true);
-    }
-    public void UpdateGuage()
-    {
-        if (motionGuage.transform.parent.gameObject.activeInHierarchy)
-            UpdateTime();
-
-        if (elapsedMotion >= motionTimeout)
-            ResetGuage();
-        else
-            motionGuage.GetComponent<Image>().fillAmount = elapsedMotion / motionTimeout;
-    }
-
-    public float UpdateTime()
-    {
-        elapsedTime += (Time.deltaTime * 1000);
-
-        return elapsedTime;
-    }
-}
\ No newline at end of file

Assets/TrackAnalysis/ButtonNoteMaker.cs

@@ -5,7 +5,8 @@
         override protected
             bool
             NotValidType(
-                string type)
+                string type,
+                string code)
         {
             return type.Substring(1) != "BT";
         }
@@ -17,7 +18,7 @@
                 string type,
                 float timing)
         {
-            return new Note(code, type, timing);
+            return new Note(code, type, timing, 0);
         }
 
         override protected

Assets/TrackAnalysis/MotionNoteMaker.cs

@@ -7,11 +7,11 @@ namespace TrackAnalysis
         override protected
             bool
             NotValidType(
-                string type)
+                string type,
+                string code)
         {
-            Type motionType;
             return type.Substring(1) != "MO" ||
-                !MotionNote.keymap.TryGetValue(type, out motionType);
+                !MotionNote.keymap.ContainsKey(code);
         }
 
         override protected
@@ -22,7 +22,7 @@ namespace TrackAnalysis
                 float timing)
         {
             return (MotionNote)Activator.CreateInstance
-                (MotionNote.keymap[type], code, timing);
+                (MotionNote.keymap[code], code, timing, 0);
         }
 
         override protected

Assets/TrackAnalysis/NoteMakerBase.cs

@@ -11,7 +11,7 @@
                 string type,
                 float timing)
         {
-            if (NotValidType(type))
+            if (NotValidType(type, code))
                 return null;
             if (IsShort(type))
                 return MakeShort(code, type, timing);
@@ -50,7 +50,8 @@
         abstract protected
             bool
             NotValidType(
-                string type);
+                string type,
+                string code);
         abstract protected
             Note
             MakeShort(

Assets/TrackAnalysis/NoteSignGenerator.cs

@@ -59,9 +59,16 @@ namespace TrackAnalysis
                 Func<int, float> calcTiming,
                 Func<string, float, Note> concreteNote)
         {
-            return DiscreteRange(range, x => currentCode(x))
+            var disrange = DiscreteRange(range, x => currentCode(x));
+            var disRange = disrange.ToList();
+            var notes = disrange
+            .Select(x => concreteNote(currentCode(x), calcTiming(x)));
+            var Notes = notes.ToList();
+            return notes.Where(x => x != null);
+
+            /*return disrange
             .Select(x => concreteNote(currentCode(x), calcTiming(x)))
-            .Where(x => x != null);
+            .Where(x => x != null);*/
         }
 
         private static
@@ -70,7 +77,7 @@ namespace TrackAnalysis
                 IEnumerable<int> range,
                 Func<int, string> currentCode)
         {
-            return range.Where(x => currentCode(x).Equals("00"));
+            return range.Where(x => !currentCode(x).Equals("00"));
         }
     }
 }
\ No newline at end of file