Merge branch 'dev'

* dev: [build] disable DebugPanel for master build [Scanner] - Fixed game not playable the second time by reseting gameActive in Configuration to true Revert "[build] disable DebugPanel"
vgwb · Dec 2, 2016 · f3cf31a · f3cf31a
2 parents 1a47579 + 3ca1ae7
commit f3cf31a
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/Assets/_games/Scanner/_configurationscripts/ScannerConfiguration.cs b/Assets/_games/Scanner/_configurationscripts/ScannerConfiguration.cs
@@ -56,19 +56,11 @@ public static void SetConfiguration(float _difficulty, int _variation) {
         }
         #endregion
 
-		public int nCorrect = 1;
-
-        public IQuestionBuilder SetupBuilder() {
-
-            IQuestionBuilder builder = null;
-
-			int nPacks = 7; // One Extra for tutorial
-			nCorrect = 1;
-			int nWrong = 4;
-
-            var builderParams = new Teacher.QuestionBuilderParameters();
-            builderParams.wordFilters.excludeColorWords = true;
-            builderParams.wordFilters.requireDrawings = true;
+		void SetupVariables()
+		{
+			gameActive = true;
+			beltSpeed = 1f;
+			facingCamera = true;
 
 			Difficulty = Difficulty < 0.13f ? 0.13f : Difficulty;
 
@@ -113,7 +105,22 @@ public IQuestionBuilder SetupBuilder() {
 			{
 				facingCamera = false;
 			}
+		}
 
+		public int nCorrect = 1;
+
+        public IQuestionBuilder SetupBuilder() {
+
+            IQuestionBuilder builder = null;
+			SetupVariables();
+
+			int nPacks = 7; // One Extra for tutorial
+			nCorrect = 1;
+			int nWrong = 4;
+
+            var builderParams = new Teacher.QuestionBuilderParameters();
+            builderParams.wordFilters.excludeColorWords = true;
+            builderParams.wordFilters.requireDrawings = true;
 
 			switch (Variation)
 			{