Commit f1259523 authored by 16서원빈's avatar 16서원빈 Committed by Chae Ho Shin

dd

parent 264d73d3
......@@ -90,7 +90,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -117,7 +117,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......@@ -144,7 +144,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
......
......@@ -1191,7 +1191,6 @@ GameObject:
- component: {fileID: 750753106}
- component: {fileID: 750753107}
- component: {fileID: 750753108}
- component: {fileID: 750753109}
m_Layer: 5
m_Name: Managers
m_TagString: Untagged
......@@ -1273,17 +1272,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 397b5aecede4d754abd2fba781e08f97, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &750753109
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 750753102}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b74d6acc8a48e6f44af437ab64e0cf88, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &765048384
GameObject:
m_ObjectHideFlags: 0
......
......@@ -13,6 +13,8 @@ public class GameManager : MonoBehaviour {
{
instance = FindObjectOfType(typeof(GameManager))
as GameManager;
if (instance == null)
instance = new GameObject().AddComponent<GameManager>();
instance.CurrentTrack
= new TrackInfo("Assets/Tracks/Test/Test.bpe");
......@@ -21,6 +23,9 @@ public class GameManager : MonoBehaviour {
return instance;
}
}
[SerializeField]
public AudioSource defaultSound;
public TrackInfo CurrentTrack { get; set; }
......
......@@ -78,7 +78,7 @@ public class JudgeManager : MonoBehaviour
else
motionGuage.GetComponent<Image>().fillAmount = elapsedMotion / motionTimeout;
}
// Use this for initialization
void Start()
{
......@@ -96,7 +96,8 @@ public class JudgeManager : MonoBehaviour
MotionGuageReset();
LoadNotes(GameManager.Instance.CurrentTrack.Notes);
Instantiate(GameManager.Instance.CurrentTrack.BGM);
Instantiate(GameManager.Instance.defaultSound);
}
// Update is called once per frame
......
......@@ -12,7 +12,7 @@ public class TrackInfo
public float BPM { get; private set; }
public int Level { get; private set; }
public AudioClip BGM { get; private set; }
public AudioSource BGM { get; private set; }
public List<string> TrackList { get; private set; }
......@@ -71,7 +71,7 @@ public class TrackInfo
TrackList.Add(value);
break;
case "#WAV":
BGM = new WWW("file:///" + file.DirectoryName + '\\' + value).GetAudioClip();
BGM = Resources.Load(value) as AudioSource;
break;
}
}
......
......@@ -4,7 +4,7 @@
#BPM 128
#PLAYLEVEL 0
#WAV Test.wav
#WAV Test
#TRACKLIST Something - Someone
#TRACKLIST Probably - Amumal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment