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

Assets/Tracks/Tutorial.meta → Assets/Resources/Title.meta

 fileFormatVersion: 2
-guid: 7c71eb6382b65024390d02b33054ad2d
+guid: 6cae70220e14079409f53a9cd90cc73c
 folderAsset: yes
-timeCreated: 1501323034
+timeCreated: 1503587734
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Resources/Title/titlebg.png.meta

+fileFormatVersion: 2
+guid: 8b28d0dc520076a47bd7f0e384b8cfa0
+timeCreated: 1503587924
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Title/titletext.png.meta

+fileFormatVersion: 2
+guid: cea4c818a06118e48b57024edf2c77e1
+timeCreated: 1503587735
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 4
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Standalone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: iPhone
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  - buildTarget: Android
+    maxTextureSize: 2048
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Track Item.prefab

@@ -56,7 +56,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:

Assets/Scene/SetSelect.unity

@@ -391,6 +391,7 @@ GameObject:
   - component: {fileID: 609057691}
   - component: {fileID: 609057690}
   - component: {fileID: 609057689}
+  - component: {fileID: 609057692}
   m_Layer: 0
   m_Name: Managers
   m_TagString: Untagged
@@ -439,6 +440,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &609057692
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 609057688}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6e697643158480b4ba850d906eac1bc2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &634338382
 GameObject:
   m_ObjectHideFlags: 0

Assets/Script/InputManager.cs

@@ -22,7 +22,13 @@ public class InputManager : MonoBehaviour {
         }
     }
 
-    private bool IsButtonDown { get; set; }
+    private KeyCode theButton = KeyCode.Space | KeyCode.Joystick1Button0;
+
+    private bool IsButtonDownPrev { get; set; }
+    private bool IsButtonDown
+    {
+        get { return Input.GetKey(theButton); }
+    }
     
     public MotionState CurrentMotionState { get; set; }
 
@@ -30,7 +36,7 @@ public class InputManager : MonoBehaviour {
     {
         get
         {
-            return !IsButtonDown && Input.anyKey;
+            return !IsButtonDownPrev && IsButtonDown;
         }
     }
 
@@ -38,7 +44,7 @@ public class InputManager : MonoBehaviour {
     {
         get
         {
-            return IsButtonDown && !Input.anyKey;
+            return IsButtonDownPrev && !IsButtonDown;
         }
     }
 
@@ -46,7 +52,7 @@ public class InputManager : MonoBehaviour {
     {
         get
         {
-            return IsButtonDown && Input.anyKey;
+            return IsButtonDownPrev && IsButtonDown;
         }
     }
 
@@ -58,6 +64,6 @@ public class InputManager : MonoBehaviour {
     // Update is called once per frame
     void Update()
     {
-        IsButtonDown = Input.anyKey;
+        IsButtonDownPrev = IsButtonDown;
     }
 }
\ No newline at end of file

Assets/Script/MotionNote.cs

@@ -62,6 +62,8 @@ public abstract class MotionNote : Note
 
     protected static Sprite LoadNewSprite(string FilePath, float PixelsPerUnit = 100.0f)
     {
+        return null;
+
         Sprite NewSprite = new Sprite();
         Texture2D SpriteTexture = LoadTexture(FilePath);
 

Assets/Script/TrackManager.cs

@@ -24,14 +24,17 @@ public class TrackManager : MonoBehaviour {
         currentBackgroundIndex = (currentBackgroundIndex + 1) % 2;
         trackList.GetComponent<RawImage>().texture = backgrounds[currentBackgroundIndex];
 
-        GameManager.Instance.CurrentTrack = trackList.transform.GetChild(2).GetComponent<TrackInfoHolder>().trackInfo;
-        Debug.Log(GameManager.Instance.CurrentTrack.Title);
+        if (selectedTrackItem != null)
+            selectedTrackItem.GetComponentInChildren<Text>().color = Color.white;
+        selectedTrackItem = trackList.transform.GetChild(2).gameObject;
+        selectedTrackItem.GetComponentInChildren<Text>().color = Color.black;
     }
 
     // Use this for initialization
     void Start()
     {
         LoadTracks();
+        TrackBrowse();
     }
 	
     // Update is called once per frame
@@ -47,6 +50,8 @@ public class TrackManager : MonoBehaviour {
             trackList.transform.GetChild(trackList.transform.childCount - 1).SetAsFirstSibling();
             TrackBrowse();
         }
+        if (InputManager.Instance.IsButtonPressed)
+            StartTrack();
     }
     
     void LoadTracks()
@@ -54,7 +59,9 @@ public class TrackManager : MonoBehaviour {
         var files = new DirectoryInfo("Assets/Tracks")
             .GetFiles("*.bpe", SearchOption.AllDirectories);
 
-        TrackInfo[] tracks = files.Select(s => new TrackInfo(s)).ToArray();
+        List<TrackInfo> tracks = files.Select(s => new TrackInfo(s)).ToList();
+        while (tracks.Count() < 5)
+            tracks.AddRange(tracks);
 
         foreach (TrackInfo track in tracks)
         {
@@ -73,6 +80,8 @@ public class TrackManager : MonoBehaviour {
 
         GameManager.Instance.CurrentTrack = holder.trackInfo;
 
+        Destroy(this);
+
         GameManager.Instance.SceneTransition("InGame");
     }
 }
\ No newline at end of file

Assets/Tracks/Test.meta

+fileFormatVersion: 2
+guid: a3a5d9cfc7425bc4e8020ffd9fa7cea5
+folderAsset: yes
+timeCreated: 1503582657
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Tracks/Test/Test.bpe

+#TITLE PARANOiA -Test-
+#ARTIST 128
+#GENRE None
+#BPM 128
+#PLAYLEVEL 
+
+#001SBT AAAAAAAA
+#002SMO CPCPCPCP
+#003LMO BH00
+#004LMO BH00

Assets/Tracks/Tutorial/tutorial1.bpe.meta → Assets/Tracks/Test/Test.bpe.meta

 fileFormatVersion: 2
-guid: 3460e0f5820b5e84b85eed642afe9c38
-timeCreated: 1501736693
+guid: 5ed10dbe99e5df949a1647e3e633e6cb
+timeCreated: 1503582657
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Tracks/Test/Test.wav.meta

+fileFormatVersion: 2
+guid: 39b6be399847d4b4e8a2341a88a21454
+timeCreated: 1503582660
+licenseType: Free
+AudioImporter:
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Tracks/Tutorial/tutorial1.bpe

-#TITLE Tutorial
-#ARTIST Various Artists
-#GENRE TUTORIAL CORE
-#BPM 120
-#PLAYLEVEL 0
-
-#002SBT AA000000000000000000000000AA
-
-#003LBT AA00000000000000AA00BB00BB000000
-#004LBT AA00
-#008LBT 00AA
\ No newline at end of file