瀏覽代碼

fix start diskQntity
diskSelector not showing at activity resolution

bernardo 3 年之前
父節點
當前提交
2a978807c6
共有 4 個文件被更改,包括 183377 次插入12 次删除
  1. 2 3
      index.html
  2. 3 2
      js/integration-functions.js
  3. 183359 0
      js/phaser.js
  4. 13 7
      js/phaserConfig.js

+ 2 - 3
index.html

@@ -4,8 +4,7 @@
 <head>
     <meta charset="UTF-8" />
     <title>iHanoi</title>
-    <!-- Eliminar esta referencia externa! Melhor seria eliminar o Phaser!!! -->
-    <script src="https://cdn.jsdelivr.net/npm/phaser@3.16.2/dist/phaser.js"></script>
+    <script src="js/phaser.js"></script>
     <script src="js/jquery-3.3.1.min.js"></script>
     <style type="text/css">
         body {
@@ -23,4 +22,4 @@
 
 </body>
 
-</html>
+</html>

+ 3 - 2
js/integration-functions.js

@@ -30,6 +30,7 @@ function getAnswer() {
         }
         return studentAnswer; // teacherReturn;
     } else { //se for o professor acessando, mostra a pagina de elaboração
+        diskSelectorButton.destroy();
         return "Número de Discos: " + diskQntity;
     }
 }
@@ -65,9 +66,9 @@ function getiLMContent() {
         // Observe que esse método faz parte do arquivo js/iarithmetic-functions.js
         res = d.split(" ");
         console.log(res[3]);
+        restart((res[3])); //restart the game with the amount of disks defined by the teacher
 
-        // setQntityDisks(parseInt(res[3])); // Este metodo NAO esta' definido!
-        //andar até o estado do ultimo envio
+        //goes to students last state
         if (res.length > 4) {
             res = d.split(/[\r]?\n/);
             for (i = 3; i < res.length; i++) {

File diff suppressed because it is too large
+ 183359 - 0
js/phaser.js


+ 13 - 7
js/phaserConfig.js

@@ -10,6 +10,7 @@ var redoButton, undoButton, restartButton, diskSelectorButton;
 var scene, tween;
 var wrongMoveSprite; 
 var outputMsgBox;
+var teacherVersion = true;
 
 class sceneGame extends Phaser.Scene {
     constructor() {
@@ -38,13 +39,14 @@ class sceneGame extends Phaser.Scene {
 
         //Only loads disk selection if its the teacher using
         try {
-            if (iLMparameters.iLM_PARAM_SendAnswer == 'true')
-                this.load.image('diskSelector', 'assets/diskSelector.png');
+            if (iLMparameters.iLM_PARAM_SendAnswer != 'true')   
+                teacherVersion = false;
             console.log("iAssign version");
         } catch (e) {
-            this.load.image('diskSelector', 'assets/diskSelector.png');
+            //this.load.image('diskSelector', 'assets/diskSelector.png');
             console.log("web-version");
         }
+        if (teacherVersion == true)  this.load.image('diskSelector', 'assets/diskSelector.png');
         //load all imgs needed for the exercise
         for (var i = 0; i < 6; i++) {
 
@@ -80,10 +82,14 @@ class sceneGame extends Phaser.Scene {
             restart();
         });
 
-        diskSelectorButton = this.add.sprite(1200, 90, 'diskSelector').setDisplaySize(80, 70).setInteractive({ useHandCursor: true });
-        diskSelectorButton.on('pointerdown', function(pointer) {
-            this.scene.start('sceneDiskSelection');
-        }, this);
+        
+        if (teacherVersion == true){
+            diskSelectorButton = this.add.sprite(1200, 90, 'diskSelector').setDisplaySize(80, 70).setInteractive({ useHandCursor: true });
+            diskSelectorButton.on('pointerdown', function(pointer) {
+                this.scene.start('sceneDiskSelection');
+            }, this);
+        }
+        //loads only if its the teacher seeing or if its not on iAssign
 
 
         //Towers