Revert "모션노트 완료"

This reverts commit d618a691.

Revert to time before merge conflict cf75c447 and 969139ca.

Assets/MotionNotes/Clap.cs

@@ -22,33 +22,13 @@ public class Clap : MotionNote
 
     public override void Checkpoint()
     {
-<<<<<<< HEAD
         IsChecked = (InputManager.Instance.CurrentMotionState
             & MotionState.CLAP_PREPARE) != 0;
-=======
-        var motion = InputManager.Instance.CurrentMotionState;
-
-        if ((motion & MotionState.CLAP_PREPARE) == 0)
-            return;
-
-        IsChecked = true;
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     }
 
     public override bool FinalJudgeAction()
     {
-<<<<<<< HEAD
         return (InputManager.Instance.CurrentMotionState
             & MotionState.CLAP_DONE) != 0;
-=======
-        var motion = InputManager.Instance.CurrentMotionState;
-
-        if (IsChecked && (motion & MotionState.CLAP_DONE) != 0)
-        {
-            return true;
-        }
-
-        return false;
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     }
 }

Assets/MotionNotes/Guard.cs

@@ -7,51 +7,18 @@ public class Guard : MotionNote
     enum Hand { Both, Left, Right }
     Hand hand;
 
-<<<<<<< HEAD
     MotionState prepare, done;
 
     private static Sprite image;
-=======
-    private static Sprite imageB = LoadNewSprite("");
-    private static Sprite imageL = LoadNewSprite("");
-    private static Sprite imageR = LoadNewSprite("");
-
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     public override Sprite Image
     {
         get
         {
-            switch (hand)
-            {
-                default:
-                case Hand.Both:
-                    return imageB;
-                case Hand.Left:
-                    return imageL;
-                case Hand.Right:
-                    return imageR;
-            }
-        }
-    }
-
-    private bool isChecked = false;
-    public override bool IsChecked
-    {
-        get
-        {
-            return isChecked;
+            return image;
         }
     }
 
-<<<<<<< HEAD
     public Guard(string key, float timing) : this(timing)
-=======
-    public Guard(string key, float timing) : this(key, timing, 0f)
-    {
-    }
-
-    public Guard(string key, float timing, float end = 0f) : this(timing, end)
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     {
         switch (key)
         {
@@ -85,11 +52,7 @@ public class Guard : MotionNote
     {
     }
 
-<<<<<<< HEAD
      public override void Checkpoint()
-=======
-    public override IEnumerator Checkpoint(MotionNote obj)
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     {
         IsChecked = (InputManager.Instance.CurrentMotionState
             & prepare) != 0;
@@ -97,11 +60,7 @@ public class Guard : MotionNote
 
     public override bool FinalJudgeAction()
     {
-<<<<<<< HEAD
         return (InputManager.Instance.CurrentMotionState
             & done) != 0;
-=======
-        return false;
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     }
 }

Assets/MotionNotes/Jump.cs

@@ -20,46 +20,10 @@ public class Jump : MotionNote
     {
     }
 
-<<<<<<< HEAD
     public override void Checkpoint()
     {
         IsChecked = (InputManager.Instance.CurrentMotionState
             & MotionState.JUMP_PREPARE) != 0;
-=======
-    private bool isChecked = false;
-    public override bool IsChecked
-    {
-        get
-        {
-            return isChecked;
-        }
-    }
-
-    private float spineHeight = 0f;
-    private int downCount;
-
-    public override IEnumerator Checkpoint(MotionNote obj)
-    {
-        float currentSpineHeight
-            = InputManager.Instance
-            .Joints[Windows.Kinect.JointType.SpineBase].Position.Y;
-
-        while (spineHeight == 0f || downCount < 10 && currentSpineHeight <= spineHeight - 0.1f)
-        {
-            spineHeight = currentSpineHeight;
-            currentSpineHeight
-               = InputManager.Instance
-               .Joints[Windows.Kinect.JointType.SpineBase].Position.Y;
-
-            downCount++;
-            yield return false;
-        }
-
-        if (downCount >= 10)
-            Activated = true;
-
-        yield break;
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     }
 
     public override bool FinalJudgeAction()

Assets/MotionNotes/PushUp.cs

@@ -46,20 +46,7 @@ public class PushUp : MotionNote
     {
     }
 
-<<<<<<< HEAD
      public override void Checkpoint()
-=======
-    private bool isChecked = false;
-    public override bool IsChecked
-    {
-        get
-        {
-            return isChecked;
-        }
-    }
-
-    public override IEnumerator Checkpoint(MotionNote obj)
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
     {
         IsChecked = (InputManager.Instance.CurrentMotionState
             & prepare) != 0;

Assets/Script/MotionNote.cs

@@ -24,7 +24,6 @@ public abstract class MotionNote : Note
         = new Dictionary<string, Type>
         {
             { "CP", typeof(Clap) },
-<<<<<<< HEAD
 
             { "JP", typeof(Jump) },
 
@@ -56,8 +55,6 @@ public abstract class MotionNote : Note
             { "RH", typeof(Headphone) },
 
             { "OT", typeof(OnTheTable) },
-=======
->>>>>>> 264d73d3155335b370d118cddd1ace963868a28c
         };
 
     protected static Sprite LoadNewSprite(string FilePath, float PixelsPerUnit = 100.0f)