BETA

HanatakeYurii · Dec 4, 2015 · b3c1868 · b3c1868
1 parent 40dd6c2
commit b3c1868
Show file tree

Hide file tree

Showing 51 changed files with 96,400 additions and 8 deletions.
diff --git a/.vs/Playground2015_Project2/v14/.suo b/.vs/Playground2015_Project2/v14/.suo
diff --git a/Assets/Resources/dusts.xml b/Assets/Resources/dusts.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <poussieres>
     <poussiere>
-      <Dustcollected>false</Dustcollected>
+      <Dustcollected>true</Dustcollected>
     </poussiere>
     <poussiere>
-      <Dustcollected>false</Dustcollected>
+      <Dustcollected>true</Dustcollected>
     </poussiere>
     <poussiere>
-      <Dustcollected>false</Dustcollected>
+      <Dustcollected>true</Dustcollected>
     </poussiere>
     <poussiere>
       <Dustcollected>true</Dustcollected>

diff --git a/Assets/Resources/dusts.xml.meta b/Assets/Resources/dusts.xml.meta
diff --git a/Assets/Resources/gramophone.xml b/Assets/Resources/gramophone.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Windows-1252"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <gramophones>
     <gramophone>

diff --git a/Assets/Resources/gramophone.xml.meta b/Assets/Resources/gramophone.xml.meta
diff --git a/Assets/Scenes/Menu/Menu.unity b/Assets/Scenes/Menu/Menu.unity
diff --git a/Assets/Scripts/Sound/SoundLevelController.cs b/Assets/Scripts/Sound/SoundLevelController.cs
@@ -11,6 +11,13 @@ public class SoundLevelController : MonoBehaviour
 
     void Start ()
     {
+        m_gameManag = GameObject.FindGameObjectWithTag("GameManager");
+
+        m_gramoManag = m_gameManag.GetComponent<GramoManager>();
+        Debug.Log(m_gramoManag);
+        m_dustManag = m_gameManag.GetComponent<DustManager>();
+        Debug.Log(m_dustManag);
+
         m_HighPassFilter = m_AudioSource1.GetComponent<AudioHighPassFilter>();
         m_HighPassFilter.cutoffFrequency = 600;
 
@@ -33,7 +40,6 @@ void FixedUpdate ()
 
     void Balance()
     {
-
         // Calcul percentage of items found
         float BalancePercent = m_GrabbedCount / m_TotalCount;
 
@@ -55,6 +61,8 @@ void SetTotalItemsCount()
         float MaxDustNb = m_dustManag.getDustTotal();
 
         m_TotalCount = MaxGramoNb + MaxDustNb;
+
+        Debug.Log(m_TotalCount);
     }
 
     void SetGrabbedCount()
@@ -63,9 +71,12 @@ void SetGrabbedCount()
         float GrabbedDustNb = m_dustManag.getTotalCollectedDust();
 
         m_GrabbedCount = GrabbedDustNb + GrabbedGramoNb;
+
+        Debug.Log(m_GrabbedCount);
     }
 
     #region Private properties
+    GameObject m_gameManag;
     GramoManager m_gramoManag;
     DustManager m_dustManag;
     AudioHighPassFilter m_HighPassFilter;

diff --git a/Build/DustNGroove_Beta.exe b/Build/DustNGroove_Beta.exe
diff --git a/Build/DustNGroove_Beta_Data/Managed/Assembly-CSharp.dll b/Build/DustNGroove_Beta_Data/Managed/Assembly-CSharp.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/Assembly-CSharp.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/Assembly-CSharp.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/Mono.Security.dll b/Build/DustNGroove_Beta_Data/Managed/Mono.Security.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/Mono.Security.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/Mono.Security.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.Core.dll b/Build/DustNGroove_Beta_Data/Managed/System.Core.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.Core.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/System.Core.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.Xml.dll b/Build/DustNGroove_Beta_Data/Managed/System.Xml.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.Xml.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/System.Xml.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.dll b/Build/DustNGroove_Beta_Data/Managed/System.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/System.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/System.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.Networking.dll b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.Networking.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.Networking.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.Networking.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.UI.dll b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.UI.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.UI.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.UI.dll.mdb
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.dll b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.dll
diff --git a/Build/DustNGroove_Beta_Data/Managed/UnityEngine.dll.mdb b/Build/DustNGroove_Beta_Data/Managed/UnityEngine.dll.mdb