Merge branch 'master' of https://git.kucatdog.net/eseiker/ButtonPusher

Assets/Scene/SetSelect.unity

@@ -484,8 +484,8 @@ GameObject:
   m_Component:
   - component: {fileID: 609057691}
   - component: {fileID: 609057690}
-  - component: {fileID: 609057689}
   - component: {fileID: 609057692}
+  - component: {fileID: 609057689}
   m_Layer: 0
   m_Name: Managers
   m_TagString: Untagged

Assets/Scene/Title.unity

@@ -327,6 +327,46 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1302085955
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1302085957}
+  - component: {fileID: 1302085956}
+  m_Layer: 0
+  m_Name: TitleManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1302085956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1302085955}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 877b81d1b36ae5c4591ad9e49f0c8873, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1302085957
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1302085955}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1370, y: 440, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1491452028
 GameObject:
   m_ObjectHideFlags: 0

Assets/Script/GameManager.cs

@@ -35,7 +35,7 @@ public class GameManager : MonoBehaviour {
             combo = value;
         }
     }
-    public int LongestCombo { get; private set; }
+    public int LongestCombo { get; set; }
     public int Score { get; set; }
     public Dictionary<Judge, int> JudgeCount = new Dictionary<Judge, int>
     {

Assets/Script/JudgeManager.cs

@@ -82,8 +82,7 @@ public class JudgeManager : MonoBehaviour
         elapsedTime += Time.deltaTime * 1000;
         float timing = elapsedTime + latency;
 
-        offset.transform.position = new Vector3(
-            -timing * ScrollSpeed, 0, 0);
+        offset.transform.position = new Vector3(-timing * ScrollSpeed, 0, 0);
 
         new Action(() =>
         {
@@ -205,6 +204,7 @@ public class JudgeManager : MonoBehaviour
 
         Debug.Log(judge.Name + (isMotion ? " Motion" : " Note"));
         Debug.Log(GameManager.Instance.Combo);
+        Debug.Log(GameManager.Instance.LongestCombo);
 
         judgeText.SetActive(true);
         judgeText.GetComponent<Text>().text = judge.Name;

Assets/Script/MotionSampleDisplay.cs

@@ -15,7 +15,7 @@ public class MotionSampleDisplay : MonoBehaviour
     private float velocity;
     private float acceleration;
 
-    private float distance = 2f;
+    private float distance = 3f;
 
     // Use this for initialization
     void Start()
@@ -27,8 +27,10 @@ public class MotionSampleDisplay : MonoBehaviour
         left.GetComponent<SpriteRenderer>().sprite = sprite;
         right.GetComponent<SpriteRenderer>().sprite = sprite;
 
-        left.transform.Translate(-distance, 0, 0);
-        right.transform.Translate(distance, 0, 0);
+        left.transform.Translate(-distance, -0.8f, 0);
+        left.transform.localScale = new Vector3(0.5f, 0.5f);
+        right.transform.Translate(distance, -0.8f, 0);
+        right.transform.localScale = new Vector3(0.5f, 0.5f);
     }
 
     // Update is called once per frame

Assets/Script/ScoreDisplayManager.cs

@@ -21,14 +21,25 @@ public class ScoreDisplayManager : MonoBehaviour {
         Good.text = GameManager.Instance.JudgeCount[Judge.JudgeList[1]].ToString();
         Bad.text = GameManager.Instance.JudgeCount[Judge.JudgeList[2]].ToString();
         Miss.text = GameManager.Instance.JudgeCount[Judge.JudgeList[3]].ToString();
-        Combo.text = GameManager.Instance.Combo.ToString();
+        Combo.text = GameManager.Instance.LongestCombo.ToString();
+
     }
 
     // Update is called once per frame
     void Update () {
         if (Input.anyKey)
         {
+            GameManager.Instance.Score = 0;
+            GameManager.Instance.JudgeCount[Judge.JudgeList[0]] = 0;
+            GameManager.Instance.JudgeCount[Judge.JudgeList[1]] = 0;
+            GameManager.Instance.JudgeCount[Judge.JudgeList[2]] = 0;
+            GameManager.Instance.JudgeCount[Judge.JudgeList[3]] = 0;
+            GameManager.Instance.LongestCombo = 0;
+            Destroy(this);
+
             GameManager.Instance.SceneTransition("SetSelect");
+            
+            
         }
     }
 }

Assets/TitleManager.cs → Assets/Script/TitleManager.cs

@@ -11,6 +11,10 @@ public class TitleManager : MonoBehaviour {
 	
 	// Update is called once per frame
 	void Update () {
-		
-	}
+        if (Input.anyKey)
+        {
+            Destroy(this);
+            GameManager.Instance.SceneTransition("SetSelect");
+        }
+    }
 }

Assets/Script/TrackManager.cs

@@ -40,8 +40,8 @@ public class TrackManager : MonoBehaviour {
 
         if (selectedTrackItem == null)
             return;
-        Artist.text = selectedTrackItem.gameObject.GetComponent<TrackInfoHolder>().trackInfo.Artist.ToString();
-        BPM.text = selectedTrackItem.gameObject.GetComponent<TrackInfoHolder>().trackInfo.BPM.ToString();
+        Artist.text = "Artist  :" + selectedTrackItem.gameObject.GetComponent<TrackInfoHolder>().trackInfo.Artist.ToString();
+        BPM.text = "BPM    :" + selectedTrackItem.gameObject.GetComponent<TrackInfoHolder>().trackInfo.BPM.ToString();
 
         for (int i = 0; i < trackInfo.transform.childCount; i++)
             Destroy(trackInfo.transform.GetChild(i).gameObject);

Assets/Tracks/Test/Test.bpe

@@ -2,7 +2,7 @@
 #ARTIST 128
 #GENRE None
 #BPM 128
-#PLAYLEVEL 
+#PLAYLEVEL 0
 
 #TRACKLIST Something - Someone
 #TRACKLIST Probably - Amumal

Assets/Tracks/Tutorial/test.bpe

-#TITLE 
-#ARTIST 
+#TITLE Tutorial1
+#ARTIST DJH
 #GENRE 
-#BPM 
-#PLAYLEVEL 
+#BPM 120
+#PLAYLEVEL 0
 
 #000LBT 000000000000AA00000000000000000000AA000000000000
 #000LMO 00000000000000000000HU00000000000000000000000000

Assets/Tracks/Tutorial/test2.bpe

-#TITLE 
-#ARTIST 
+#TITLE Tutorial2
+#ARTIST DJH
 #GENRE 
 #BPM 120
 #PLAYLEVEL 0