Fixed a bug that when the total number of notes exceeded 20

Button notes, short motion notes, and long motion notes pass through different lanes

Assets/JudgeModule/NoteManager.cs

@@ -141,7 +141,9 @@ namespace JudgeModule
                 foreach (var c in controllers)
                     if (c.EndPosition(ScrollSpeed) <= disappear.transform.position.x)
                     {
-                        c.transform.position = appear.transform.position;
+                        var pos = c.transform.position;
+                        pos.x = appear.transform.position.x;
+                        c.transform.position = pos;
                         c.transform.SetParent(appear.transform);
                         c.gameObject.SetActive(false);
                         disables[name].Remove(c);
@@ -184,11 +186,11 @@ namespace JudgeModule
             var cntActive = notes.Count < waits[name].Count ?
                 notes.Count : waits[name].Count;
 
+            for (int i = 0; i < cntActive; ++i)
+                AssignNote(notes[i], waits[name][i], timing);
+
             enables[name].AddRange(waits[name].GetRange(0, cntActive));
             waits[name].RemoveRange(0, cntActive);
-
-            for (int i = 0; i < cntActive; ++i)
-                AssignNote(notes[i], enables[name][i], timing);
         }
 
         private List<Note> GetSpecificNotes(IEnumerable<Note> lastnotes, NoteType type)
@@ -205,6 +207,12 @@ namespace JudgeModule
             controller.transform.position = initialPos +
             Vector3.right * ((note.StartTiming - timing) * ScrollSpeed);
 
+            if (controller.name == "SMO")
+                controller.transform.position += (Vector3.up * 50);
+
+            if (controller.name == "LMO")
+                controller.transform.position += (Vector3.down * 50);
+
             controller.transform.SetParent(noteobj.transform);
             controller.gameObject.SetActive(true);
 

Assets/Script/GameManager.cs

@@ -16,7 +16,7 @@ public class GameManager : MonoBehaviour {
                     instance = new GameObject().AddComponent<GameManager>();
 
                 instance.CurrentTrack
-                    = new TrackInfo("Assets/Tracks/Tutorial/tmp.bpe");
+                    = new TrackInfo("Assets/Tracks/Tutorial/temp2.bpe");
             }
 
             return instance;

Assets/Script/InGameManager.cs

 using JudgeModule;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -40,6 +39,12 @@ public class InGameManager : MonoBehaviour
 
                 var controller = obj.AddComponent<Controller>();
                 controller.Instance = new Note(0, 0);
+
+                if (obj.name != "BeatLine" &&
+                    obj.name != "MeasureLine")
+                    obj.transform.localScale = new Vector3(1, 1.0f / 3, 1);
+
+                obj.gameObject.SetActive(false);
             });
         }
     }

Assets/Tracks/Tutorial/tmp0.bpe

+#TITLE test
+#ARTIST asdf
+#GENRE asdf
+#BPM 240
+#PLAYLEVEL 0
+
+#000SBT 00AA00AA
+#001SBT 00AA00AA
+#002SBT 00AA00AA
+#003SBT 00AA00AA
+#004SBT 00AA00AA
+#005SBT 00AA00AA
+#006SBT 00AA00AA
+#007SBT 00AA00AA
+#008SBT 00AA00AA
+#009SBT 00AA00AA
+#010SBT 00AA00AA
+#011SBT 00AA00AA
+#012SBT 00AA00AA
+#013SBT 00AA00AA
+#014SBT 00AA00AA
+#015SBT 00AA00AA
+#016SBT 00AA00AA
+#017SBT 00AA00AA
\ No newline at end of file

Assets/Tracks/Tutorial/tmp0.bpe.meta

+fileFormatVersion: 2
+guid: 4de644c7f27586549a8d8739e1ce1b00
+timeCreated: 1519658433
+licenseType: Free
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: