Mise a jour du chargement pour le chateau

EPSIProjetWatchIT · Jan 18, 2014 · 0322310 · 0322310
1 parent 3f7630e
commit 0322310
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 5 deletions.
diff --git a/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs b/Assets/Kinect/Script/Kinect/Gesture/KinectMebu.cs
@@ -85,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");
 
 				}

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
@@ -1,9 +1,10 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
   <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs">
     <Files>
-      <File FileName="Assets\Scripts\Menu\Chargement.cs" Line="29" Column="1" />
-      <File FileName="Assets\Kinect\Script\Kinect\Gesture\KinectMebu.cs" Line="33" Column="27" />
+      <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>