Merge pull request #22 from MV50-Project/feature-changeSceneProperly+map

feature selection de la musique en fonction du disque
MV50-Project · Jun 6, 2024 · 6777d41 · 6777d41
2 parents a6c1f0a + fbbc38f
commit 6777d41
Show file tree

Hide file tree

Showing 11 changed files with 264 additions and 49 deletions.
diff --git a/Assets/Resources/song1Map.json b/Assets/Resources/song1Map.json
diff --git a/Assets/Resources/test.wav → Assets/Resources/song1Map.wav b/Assets/Resources/test.wav → Assets/Resources/song1Map.wav
diff --git a/Assets/Resources/test.wav.meta → Assets/Resources/song1Map.wav.meta b/Assets/Resources/test.wav.meta → Assets/Resources/song1Map.wav.meta
diff --git a/Assets/Resources/song1_noLead.wav → Assets/Resources/song1Map_nolead.wav b/Assets/Resources/song1_noLead.wav → Assets/Resources/song1Map_nolead.wav
diff --git a/Assets/Resources/song1_noLead.wav.meta → Assets/Resources/song1Map_nolead.wav.meta b/Assets/Resources/song1_noLead.wav.meta → Assets/Resources/song1Map_nolead.wav.meta
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
@@ -2691,7 +2691,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1213942263}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0ee573f7b21ae8d45941dd9c0bc55fed, type: 3}
   m_Name: 

diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -3966,7 +3966,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1038674918}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0ee573f7b21ae8d45941dd9c0bc55fed, type: 3}
   m_Name: 

diff --git a/Assets/prefabs/spheres/discoBall.prefab b/Assets/prefabs/spheres/discoBall.prefab
@@ -64,6 +64,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: discoBall
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 985c6436c58a8264dbc01b3c3911a7b7, type: 3}
+      propertyPath: m_TagString
+      value: cible
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

diff --git a/Assets/scripts/GameController.cs b/Assets/scripts/GameController.cs
@@ -86,7 +86,10 @@ private class Root
 
     private void Start()
     {
-        TextAsset map = Resources.Load<TextAsset>("song1Map");
+
+        string entryMethod = PlayerPrefs.GetString("EntryMethod", "none");
+        Debug.Log(entryMethod);
+        TextAsset map = Resources.Load<TextAsset>(entryMethod);
         readJsonMap(map);
         Debug.Log("lecture terminee");
         Debug.Log(songName);
@@ -97,7 +100,7 @@ private void Start()
 
         audioSource = GetComponent<AudioSource>();
         //AudioClip audioClip = Resources.Load<AudioClip>("song1_noLead");
-        AudioClip audioClip = Resources.Load<AudioClip>("test");
+        AudioClip audioClip = Resources.Load<AudioClip>(entryMethod);
 
         leadNotes[0] = Resources.Load<AudioClip>("sound1");
         leadNotes[1] = Resources.Load<AudioClip>("sound2");

diff --git a/Assets/scripts/GrabbableBehavior.cs b/Assets/scripts/GrabbableBehavior.cs
@@ -92,6 +92,7 @@ private void OnTriggerEnter(Collider other)
                 TryRelease(grabber);
             }
             grabType = GrabType.None;
+            PlayerPrefs.SetString("EntryMethod", "song1Map");
 
             //SceneManager.LoadScene("SampleScene");
         }

diff --git a/Assets/scripts/LaserHit.cs b/Assets/scripts/LaserHit.cs
@@ -87,13 +87,13 @@ private void FixedUpdate()
                 if (hit.rigidbody)
                 {
                     GameObject sphereHit = hit.rigidbody.gameObject;
-                    AudioSource soundHit = hit.rigidbody.gameObject.GetComponent<AudioSource>();
-                    sphereHit.transform.position = new Vector3(0, -2f, 0);
-                    soundHit.Play();
-                    StartCoroutine(DestroyObjectAfterDelay(sphereHit, 1f));
-
-
-
+                    if (sphereHit.CompareTag("cible"))
+                    {
+                        AudioSource soundHit = hit.rigidbody.gameObject.GetComponent<AudioSource>();
+                        sphereHit.transform.position = new Vector3(0, -2f, 0);
+                        soundHit.Play();
+                        StartCoroutine(DestroyObjectAfterDelay(sphereHit, 1f));
+                    }