Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts: Library/CurrentLayout.dwlt Library/ScriptAssemblies/Assembly-CSharp.dll Library/ScriptAssemblies/Assembly-CSharp.dll.mdb Library/assetDatabase3 Library/metadata/67/67c155c08d2087f48bc84070e25da137
EPSIProjetWatchIT · Jan 18, 2014 · 5c0691c · 5c0691c
2 parents 7e2214e + a7d4a5e
commit 5c0691c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 7 deletions.
diff --git a/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs b/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs
@@ -29,13 +29,18 @@ public class KinectMebu : MonoBehaviour {
 
 	private GameObject[] menu = new GameObject[3];
 
+	GameObject[] listeGui;
+	GameObject guiChargement;
+
 	// Use this for initialization
 	void Start () {
 		bonePos = new Vector3[2,(int)Kinect.NuiSkeletonPositionIndex.Count];
 		menu [0] = GameObject.Find ("GUI Text Jouer");
 		menu [1] = GameObject.Find ("GUI Text Option");
 		menu [2] = GameObject.Find ("GUI Text Quitter");
-
+		listeGui = GameObject.FindGameObjectsWithTag ("GuiMenu");
+		guiChargement = GameObject.Find ("Affichage chargement");
+		guiChargement.guiText.text = "";
 
 	}
 
@@ -80,6 +85,10 @@ void Update () {
 					audio.Stop();
 					audio.volume = 1;
 					audio.PlayOneShot(chateau);
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
 					Application.LoadLevel("Scene_Chateau_2");
 
 				}
@@ -88,8 +97,14 @@ void Update () {
 
 			if (pass && peuxValider)
 			{
-				if (tableauBoolPos[0])
-					Application.LoadLevel("Scene_grotte");
+				if (tableauBoolPos[0]){
+					foreach (GameObject gui in listeGui) {
+						gui.SetActive(false);		
+					}
+					guiChargement.guiText.text = "Chargement...";
+					Application.LoadLevel ("Scene_grotte");
+				}
+
 				if (tableauBoolPos[1])
 					Application.LoadLevel("MenuOption");
 				if (tableauBoolPos[2])

diff --git a/Assets/Scenes/Scene_Chateau_2.unity b/Assets/Scenes/Scene_Chateau_2.unity
@@ -91714,7 +91714,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 186fad70311718e4e8a16e1b0b7aa77d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  variation: 5
+  variation: 15
   destruction: 1
 --- !u!1 &2091658501
 GameObject:

diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/metadata/67/67c155c08d2087f48bc84070e25da137 b/Library/metadata/67/67c155c08d2087f48bc84070e25da137
diff --git a/WatchGit-csharp.sln b/WatchGit-csharp.sln
@@ -17,7 +17,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																																																																																									GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																																																												GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/WatchGit.sln b/WatchGit.sln
@@ -29,7 +29,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-																																																																																																																																																																																																								GlobalSection(MonoDevelopProperties) = preSolution
+																																																																																																																																																																																																											GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Assembly-CSharp.csproj
 		Policies = $0
 		$0.TextStylePolicy = $1

diff --git a/WatchGit.userprefs b/WatchGit.userprefs
@@ -2,7 +2,9 @@
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
   <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs">
     <Files>
-      <File FileName="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs" Line="83" Column="47" />
+      <File FileName="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs" Line="91" Column="51" />
+      <File FileName="Assets\Scripts\Menu\Chargement.cs" Line="1" Column="1" />
+      <File FileName="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs" Line="177" Column="1" />
       <File FileName="Assets\Scripts\Chateau\StartParcourChateau.cs" Line="1" Column="1" />
       <File FileName="Assets\Scripts\Grotte\StartParcour.cs" Line="1" Column="1" />
     </Files>
@@ -24,6 +26,7 @@
               <Node name="Grotte" expanded="True">
                 <Node name="Elements" expanded="True" />
               </Node>
+              <Node name="Menu" expanded="True" />
               <Node name="Personnage" expanded="True">
                 <Node name="Grotte" expanded="True" />
               </Node>