Gestion de difficulte dans les niveaux

Coreection de la taille de la commode
EPSIProjetWatchIT · Jan 18, 2014 · c7bb399 · c7bb399
1 parent c165ace
commit c7bb399
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 36 deletions.
diff --git a/Assets/Scenes/Scene_Chateau_2.unity b/Assets/Scenes/Scene_Chateau_2.unity
@@ -3852,7 +3852,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_LocalPosition.y
-      value: .699999988
+      value: .459999979
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_LocalPosition.z
@@ -3880,15 +3880,15 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_LocalScale.x
-      value: 2
+      value: 1.79999995
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_LocalScale.y
-      value: 2
+      value: 1.79999995
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_LocalScale.z
-      value: 2
+      value: 1.79999995
       objectReference: {fileID: 0}
     - target: {fileID: 100000, guid: 0771f695613a392409570c3e6149c3d5, type: 3}
       propertyPath: m_TagString
@@ -35860,8 +35860,8 @@ Transform:
   m_PrefabInternal: {fileID: 72636108}
   m_GameObject: {fileID: 863933357}
   m_LocalRotation: {x: -.707106829, y: 0, z: 0, w: .707106829}
-  m_LocalPosition: {x: 1.49006987, y: .699999988, z: -.800000072}
-  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_LocalPosition: {x: 1.49006987, y: .459999979, z: -.800000072}
+  m_LocalScale: {x: 1.79999995, y: 1.79999995, z: 1.79999995}
   m_Children:
   - {fileID: 2128907490}
   m_Father: {fileID: 0}

diff --git a/Assets/Scripts/Chateau/StartParcourChateau.cs b/Assets/Scripts/Chateau/StartParcourChateau.cs
@@ -2,7 +2,10 @@
 using System.Collections;
 
 public class StartParcourChateau : MonoBehaviour {
-
+
+	private const int DUR = 2;
+	private const int MOYEN = 1;
+	private const int FACILE = 0;
 	private const float SOL = 0.035f;
 	private const float PLAFOND = 1f;
 	private const float VOIEG = 0.8f;
@@ -32,10 +35,13 @@ public class StartParcourChateau : MonoBehaviour {
 	GameObject[] morceau = new GameObject[4];
 	int ajoute = 0;
 	public bool avance = false;
+	private int difficulte = 1;
 
 		// Use this for initialization
 	void Start () {
-		probabiliteObstacle = PROBAINIT;
+		difficulte = Fichiers.getDifficulte ();
+
+		probabiliteObstacle = difficulte == FACILE ? PROBAINIT - 10 : difficulte == MOYEN ? PROBAINIT : PROBAINIT + 10;
 
 		//Instanciation des variables avant desactivation, pour garder une trace.
 		elements[0] = GameObject.Find("Vase");
@@ -179,7 +185,7 @@ void genererObstacles(GameObject[] GROTTES, int tailleGrotte)
 							nouvelElement.transform.localRotation = Quaternion.Euler(0f, rotationArmure,0f);
 							break;
 						case 2: //Commonde
-							nouvelElement.transform.localPosition = new Vector3(zone,-0.3f,voies[voieChoisie]);
+							nouvelElement.transform.localPosition = new Vector3(zone,-0.54f,voies[voieChoisie]);
 							float rotationCommode = 0f;
 
 							if (voies[voieChoisie] == VOIEG)
@@ -201,7 +207,7 @@ void genererObstacles(GameObject[] GROTTES, int tailleGrotte)
 						}
 					}
 					//On réinitialise la probabilité d'avoir un obstacle
-					probabiliteObstacle  = PROBAINIT;
+					probabiliteObstacle = difficulte == FACILE ? PROBAINIT - 10 : difficulte == MOYEN ? PROBAINIT : PROBAINIT + 10;
 				}
 				else
 				{

diff --git a/Assets/Scripts/Fichiers.cs b/Assets/Scripts/Fichiers.cs
@@ -47,14 +47,16 @@ public static void setScore(int score)
 
 	 public static int getDifficulte()
 	{
-		int value = 0;
-		StreamReader file = new StreamReader ("difficulte.txt");
-		value = int.Parse(file.ReadLine());
-		file.Close ();
+		int value = 1;
+		if (File.Exists ("difficulte.txt")) {
+			StreamReader file = new StreamReader ("difficulte.txt");
+			value = int.Parse(file.ReadLine());
+			file.Close ();		
+		}
 		return value;
 	}
 
-	public static void setDifficulte(int value=0)
+	public static void setDifficulte(int value = 1)
 	{
 		StreamWriter file = new StreamWriter ("difficulte.txt");
 		file.WriteLine (value.ToString ());

diff --git a/Assets/Scripts/Grotte/StartParcour.cs b/Assets/Scripts/Grotte/StartParcour.cs
@@ -3,6 +3,9 @@
 
 public class StartParcour : MonoBehaviour {
 
+	private const int DUR = 2;
+	private const int MOYEN = 1;
+	private const int FACILE = 0;
 	private const float SOL = -0.8f;
 	private const float PLAFOND = 1f;
 	private const float VOIEG = -0.8f;
@@ -33,12 +36,16 @@ public class StartParcour : MonoBehaviour {
 	int ajoute = 0;
 	public bool avance = false;
 	private Camera cameraScene;
-	private 
+	private int difficulte = 1;
 
 	// Use this for initialization
 	void Start () {
+
+		difficulte = Fichiers.getDifficulte ();
+
+		probabiliteObstacle = difficulte == FACILE ? PROBAINIT - 10 : difficulte == MOYEN ? PROBAINIT : PROBAINIT + 10;
+
 		cameraScene = Camera.main;
-		probabiliteObstacle = PROBAINIT;
 
 		//Instanciation des variables avant desactivation, pour garder une trace.
 		elements[0] = GameObject.Find("Bat");
@@ -192,7 +199,7 @@ void genererObstacles(GameObject[] GROTTES, int tailleGrotte)
 						}
 					}
 					//On réinitialise la probabilité d'avoir un obstacle
-					probabiliteObstacle  = PROBAINIT;
+					probabiliteObstacle = difficulte == FACILE ? PROBAINIT - 10 : difficulte == MOYEN ? PROBAINIT : PROBAINIT + 10;
 				}
 				else
 				{

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/expandedItems b/Library/expandedItems
diff --git a/Library/metadata/28/28ef6e2d9644a1240a988d74b42d86bf b/Library/metadata/28/28ef6e2d9644a1240a988d74b42d86bf
diff --git a/Library/metadata/a6/a667b4dc5037c7645babd2c8f90a8a5b b/Library/metadata/a6/a667b4dc5037c7645babd2c8f90a8a5b
diff --git a/Library/metadata/ec/ec1de1260a6372242bdcdcd24f7f6d5e b/Library/metadata/ec/ec1de1260a6372242bdcdcd24f7f6d5e
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,29 +1,19 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="MonoDevelop.Default" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\Chateau\StartParcourChateau.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets\Scripts\Grotte\StartParcour.cs">
     <Files>
-      <File FileName="Assets\Scripts\Chateau\StartParcourChateau.cs" Line="197" Column="70" />
-      <File FileName="Assets\Scripts\Chateau\StartParcourChateau.cs" Line="214" Column="1" />
-      <File FileName="Assets\Scripts\Grotte\Elements\GestionAffichageParcour.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Personnage\Grotte\Collisions.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Personnage\Chateau\CollisionsChateau.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Personnage\Chateau\MouvementChateau.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Personnage\Grotte\Mouvement.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Grotte\StartParcour.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\RotationCoffre.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Chateau\GestionAffichageParcourChateau.cs" Line="1" Column="1" />
-      <File FileName="Assets\Scripts\Grotte\Elements\LifeChanges.cs" Line="1" Column="1" />
+      <File FileName="Assets\Scripts\Chateau\StartParcourChateau.cs" Line="44" Column="114" />
+      <File FileName="Assets\Scripts\Grotte\StartParcour.cs" Line="13" Column="33" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
           <Node name="Assembly-CSharp" expanded="True">
             <Node name="Scripts" expanded="True">
-              <Node name="Chateau" expanded="True">
-                <Node name="StartParcourChateau.cs" selected="True" />
-              </Node>
+              <Node name="Chateau" expanded="True" />
               <Node name="Grotte" expanded="True">
                 <Node name="Elements" expanded="True" />
+                <Node name="StartParcour.cs" selected="True" />
               </Node>
               <Node name="Personnage" expanded="True">
                 <Node name="Grotte" expanded="True" />