Browse Source

modified the way the player progress is displayed in the game to only increse if level was completed | modified variable names from name to func_name if they received a function to facilitate code readability | currently in the proccess of removing duplicated variables and decreasing the use of global variables

lairaalmas 5 years ago
parent
commit
2f002429bf
100 changed files with 125 additions and 125 deletions
  1. 0 0
      TEMPORARIOS/comandos do git.odt
  2. 0 0
      TEMPORARIOS/funcoes-do-phaser.odt
  3. 125 125
      assets/cn/save.php
  4. 0 0
      assets/fonts/glyphicons-halflings-regular.eot
  5. 0 0
      assets/fonts/glyphicons-halflings-regular.svg
  6. 0 0
      assets/fonts/glyphicons-halflings-regular.ttf
  7. 0 0
      assets/fonts/glyphicons-halflings-regular.woff
  8. 0 0
      assets/fonts/glyphicons-halflings-regular.woff2
  9. 0 0
      assets/fx/beep.mp3
  10. 0 0
      assets/fx/beep.ogg
  11. 0 0
      assets/fx/error.mp3
  12. 0 0
      assets/fx/error.ogg
  13. 0 0
      assets/fx/ok.mp3
  14. 0 0
      assets/fx/ok.ogg
  15. 0 0
      assets/img/airballoon_base.png
  16. 0 0
      assets/img/airballoon_upper.png
  17. 0 0
      assets/img/bg.jpg
  18. 0 0
      assets/img/bg_map.png
  19. 0 0
      assets/img/birch.png
  20. 0 0
      assets/img/cloud.png
  21. 0 0
      assets/img/farm.png
  22. 0 0
      assets/img/flag.png
  23. 0 0
      assets/img/flag/BRAZ.jpg
  24. 0 0
      assets/img/flag/FRAN.jpg
  25. 0 0
      assets/img/flag/PERU.jpg
  26. 0 0
      assets/img/flag/UNST.jpg
  27. 0 0
      assets/img/floor.png
  28. 0 0
      assets/img/game/backup/five-s.png
  29. 0 0
      assets/img/game/backup/four-c.png
  30. 0 0
      assets/img/game/backup/four-s.png
  31. 0 0
      assets/img/game/backup/one-c.png
  32. 0 0
      assets/img/game/backup/one-s.png
  33. 0 0
      assets/img/game/backup/three-c.png
  34. 0 0
      assets/img/game/backup/three-s.png
  35. 0 0
      assets/img/game/backup/two-c.png
  36. 0 0
      assets/img/game/backup/two-s.png
  37. 0 0
      assets/img/garage (copy).png
  38. 0 0
      assets/img/garage.png
  39. 0 0
      assets/img/help/arrow.png
  40. 0 0
      assets/img/help/double.png
  41. 0 0
      assets/img/help/down.png
  42. 0 0
      assets/img/help/error.png
  43. 0 0
      assets/img/help/ok.png
  44. 0 0
      assets/img/help/pointer.png
  45. 0 0
      assets/img/house.png
  46. 0 0
      assets/img/kid/lost.png
  47. 0 0
      assets/img/kid/run.png
  48. 0 0
      assets/img/kid/walk.png
  49. 0 0
      assets/img/menu/audio_48x48.png
  50. 0 0
      assets/img/menu/back.png
  51. 0 0
      assets/img/menu/block.png
  52. 0 0
      assets/img/menu/eraser.png
  53. 0 0
      assets/img/menu/help.png
  54. 0 0
      assets/img/menu/home.png
  55. 0 0
      assets/img/menu/info.png
  56. 0 0
      assets/img/menu/language.png
  57. 0 0
      assets/img/menu/list.png
  58. 0 0
      assets/img/menu/menu.png
  59. 0 0
      assets/img/menu/progressBar.png
  60. 0 0
      assets/img/menu/view.png
  61. 0 0
      assets/img/operator/add.png
  62. 0 0
      assets/img/operator/blue_block.jpg
  63. 0 0
      assets/img/operator/equal.png
  64. 0 0
      assets/img/operator/multiply.png
  65. 0 0
      assets/img/operator/red_block.jpg
  66. 0 0
      assets/img/operator/separator.png
  67. 0 0
      assets/img/operator/subtract.png
  68. 0 0
      assets/img/pgbar.png
  69. 0 0
      assets/img/place.png
  70. 0 0
      assets/img/place_a.png
  71. 0 0
      assets/img/place_b.png
  72. 0 0
      assets/img/road.png
  73. 0 0
      assets/img/rock.png
  74. 0 0
      assets/img/school (copy).png
  75. 0 0
      assets/img/school.png
  76. 0 0
      assets/img/sign.png
  77. 0 0
      assets/img/tractor/frame-0.png
  78. 0 0
      assets/img/tractor/frame-1.png
  79. 0 0
      assets/img/tractor/frame-2.png
  80. 0 0
      assets/img/tractor/frame-3.png
  81. 0 0
      assets/img/tractor/frame-4.png
  82. 0 0
      assets/img/tractor/frame-5.png
  83. 0 0
      assets/img/tractor/frame-6.png
  84. 0 0
      assets/img/tractor/frame-7.png
  85. 0 0
      assets/img/tractor/frame-8.png
  86. 0 0
      assets/img/tractor/frame-9.png
  87. 0 0
      assets/img/tractor/frame.png
  88. 0 0
      assets/img/tree.png
  89. 0 0
      assets/img/tree2.png
  90. 0 0
      assets/img/tree3.png
  91. 0 0
      assets/img/tree4.png
  92. 0 0
      assets/languages/en_US.json
  93. 0 0
      assets/languages/es_PE.json
  94. 0 0
      assets/languages/fr_FR.json
  95. 0 0
      assets/languages/pt_BR.json
  96. 0 0
      css/bootstrap-theme.css
  97. 0 0
      css/bootstrap-theme.css.map
  98. 0 0
      css/bootstrap-theme.min.css
  99. 0 0
      css/bootstrap-theme.min.css.map
  100. 0 0
      css/bootstrap.css

+ 0 - 0
TEMPORARIOS/comandos do git.odt


+ 0 - 0
TEMPORARIOS/funcoes-do-phaser.odt


+ 125 - 125
assets/cn/save.php

@@ -1,126 +1,126 @@
-<?php
-
-// ATENCAO ao
-// * nome da base de dados: db_ifractions
-// * nome da tabela dados : ifractions
-
-// assets/cn/save.php on line 23, referer: http://milanesa.ime.usp.br/ifractions1/
-
-/// @see js/circleOne.js
-/// @see js/squareOne.js
-/// @see js/squareTwo.js
-
-function remove_accents ($stripAccents) {
-  /*
-  $stripAccents = strtr($stripAccents,
-         'àáâãäçèéêëìíîïñòóôõöùúûüýÿÀ�ÂÃÄÇÈÉÊËÌ�Î�ÑÒÓÔÕÖÙÚÛÜ�',
-         'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
-  $stripAccents = preg_replace('/[^\x20-\x7E]/','', $stripAccents);
-  */
-  return $stripAccents;
-  }
-
-// Monta vetor [0,1] de dados da m<E1>quina cliente
-function ipMaquina0 () {
-  if (getenv("HTTP_CLIENT_IP"))
-    $ip = getenv("HTTP_CLIENT_IP");
-  elseif (getenv("HTTP_X_FORWARDED_FOR"))
-    $ip = getenv("HTTP_X_FORWARDED_FOR");
-  elseif (getenv("REMOTE_ADDR"))
-    $ip = getenv("REMOTE_ADDR");
-  $resp[0] = $ip;
-  $resp[1] = gethostbyaddr($ip);
-  return $resp;
-  }
-
-// Monta vetor [0,1] de dados da m<E1>quina cliente
-function ipMaquina () {
-  if (getenv("HTTP_CLIENT_IP"))
-    $ip = getenv("HTTP_CLIENT_IP");
-  elseif (getenv("HTTP_X_FORWARDED_FOR"))
-    $ip = getenv("HTTP_X_FORWARDED_FOR");
-  elseif (getenv("REMOTE_ADDR"))
-    $ip = getenv("REMOTE_ADDR");
-  $strIP = $ip;
-  $resp = gethostbyaddr($ip);
-  if (isset($resp) && strlen($resp)>0) {
-    $strIP .= "; " . $resp;
+    <?php
+
+    // ATENCAO ao
+    // * nome da base de dados: db_ifractions
+    // * nome da tabela dados : ifractions
+
+    // assets/cn/save.php on line 23, referer: http://milanesa.ime.usp.br/ifractions1/
+
+    /// @see js/circleOne.js
+    /// @see js/squareOne.js
+    /// @see js/squareTwo.js
+
+    function remove_accents ($stripAccents) {
+      /*
+      $stripAccents = strtr($stripAccents,
+             'àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ',
+             'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY');
+      $stripAccents = preg_replace('/[^\x20-\x7E]/','', $stripAccents);
+      */
+      return $stripAccents;
     }
-  return $strIP;
-  }
-
-
-$servername = "localhost";
-$username = "root"; // put here the name of user root of MySQL
-$password = "put_paswd"; // put here the password of user root of MySQL
-$dbname = "put_name_of_base"; // put here the name of data base used to register iFraction use
-
-// Create connection
-$conn = new mysqli($servername, $username, $password, $dbname);
-// Check connection
-if ($conn->connect_error) {
-  die("Connection failed: " . $conn->connect_error);
-  }
-
-
-// $ip = $_REQUEST["s_ip"];
-$ip = ipMaquina();
-/*
-$vet_ip = ipMaquina0();
-$ip = "";
-if (isset($vet_ip[0]) && strlen($vet_ip[0]>0))
-  $ip = $vet_ip[0];
-if (isset($vet_ip[1]) && strlen($vet_ip[1]>0))
-  if (strlen($ip)>0)
-    $ip = $ip . " - " . $vet_ip[1];
-  else
-    $ip = $vet_ip[1];
-*/
-
-$play = $_REQUEST["s_name"];
-$date = date("Y-m-d H:i:s");
-$lang = $_REQUEST["s_lang"];
-$game = $_REQUEST["s_game"];
-$mode = $_REQUEST["s_mode"];
-$oper = $_REQUEST["s_oper"];
-$leve = $_REQUEST["s_leve"];
-$posi = $_REQUEST["s_posi"];
-$resu = $_REQUEST["s_resu"];
-$time = $_REQUEST["s_time"];
-$deta = $_REQUEST["s_deta"];
-
-$play0 = $play; // /var/www/html/ifractions1/js/preMenu.js: insert_name
-$play = remove_accents($play); // /js/squareOne.js:vars=s_ip=143.107.45.11&s_name=&s_lang=pt&s_game=Square&s_mode=A&s_oper=Plus&s_leve=1&s_posi=1&s_resu=true&s_time=3&s_deta=numBlocks:3, valBlocks: 1,1,1, blockIndex: 2, floorIndex: 2; url=assets/cn/save.php
-
-if (is_object($lang))
-  $lang = json_decode($lang);
-
-// Table 'ifractions': id s_hostip s_playername s_datetime s_lang s_game s_mode s_operator s_level s_mappos s_result s_time s_details
-$sql = "INSERT INTO ifractions
-(s_hostip, s_playername, s_datetime, s_lang, s_game, s_mode, s_operator, s_level, s_mappos, s_result, s_time, s_details)
-VALUES
-('$ip', '$play', '$date', '$lang', '$game', '$mode', '$oper', $leve, $posi, '$resu', $time, '$deta')";
-
-// Register in database
-if ($conn->query($sql) === TRUE) {
-  print "Gravado/Grabado";
-  $result = "OK";
-} else {
-  print "Error: " . $sql . "<br>" . $conn->error;
-  $result = "Erro: " . $conn->error;
-  }
-
-
-//DEBUG
-// js/menu.js : var menuState = { player_info = ... username ...}
-// welcome
-// index.php: game.state.add('name', nameState);
-$name = $_REQUEST["name"];
-$username = $_REQUEST["username"];
-$data = date('Y_m_d_H_i_s');
-$fp = fopen('../../temp/file_' . $data . ".txt", 'w');
-fwrite($fp, "nome=" . $play0 . ", name=" . $name . ", username=" . $username . "\n" . $sql . "\nResultado: " . $result);
-fclose($fp);
-
-$conn->close();
-?> 
+
+    // Monta vetor [0,1] de dados da m<E1>quina cliente
+    function ipMaquina0 () {
+      if (getenv("HTTP_CLIENT_IP"))
+        $ip = getenv("HTTP_CLIENT_IP");
+      elseif (getenv("HTTP_X_FORWARDED_FOR"))
+        $ip = getenv("HTTP_X_FORWARDED_FOR");
+      elseif (getenv("REMOTE_ADDR"))
+        $ip = getenv("REMOTE_ADDR");
+      $resp[0] = $ip;
+      $resp[1] = gethostbyaddr($ip);
+      return $resp;
+      }
+
+    // Monta vetor [0,1] de dados da m<E1>quina cliente
+    function ipMaquina () {
+      if (getenv("HTTP_CLIENT_IP"))
+        $ip = getenv("HTTP_CLIENT_IP");
+      elseif (getenv("HTTP_X_FORWARDED_FOR"))
+        $ip = getenv("HTTP_X_FORWARDED_FOR");
+      elseif (getenv("REMOTE_ADDR"))
+        $ip = getenv("REMOTE_ADDR");
+      $strIP = $ip;
+      $resp = gethostbyaddr($ip);
+      if (isset($resp) && strlen($resp)>0) {
+        $strIP .= "; " . $resp;
+        }
+      return $strIP;
+      }
+
+
+    $servername = "localhost";
+    $username = "root"; // put here the name of user root of MySQL
+    $password = "put_paswd"; // put here the password of user root of MySQL
+    $dbname = "put_name_of_base"; // put here the name of data base used to register iFraction use
+    
+    // Create connection
+    $conn = new mysqli($servername, $username, $password, $dbname);
+    // Check connection
+    if ($conn->connect_error) {
+      die("Connection failed: " . $conn->connect_error);
+    }
+
+
+    // $ip = $_REQUEST["s_ip"];
+    $ip = ipMaquina();
+    /*
+    $vet_ip = ipMaquina0();
+    $ip = "";
+    if (isset($vet_ip[0]) && strlen($vet_ip[0]>0))
+      $ip = $vet_ip[0];
+    if (isset($vet_ip[1]) && strlen($vet_ip[1]>0))
+      if (strlen($ip)>0)
+        $ip = $ip . " - " . $vet_ip[1];
+      else
+        $ip = $vet_ip[1];
+    */
+
+    $play = $_REQUEST["s_name"];
+    $date = date("Y-m-d H:i:s");
+    $lang = $_REQUEST["s_lang"];
+    $game = $_REQUEST["s_game"];
+    $mode = $_REQUEST["s_mode"];
+    $oper = $_REQUEST["s_oper"];
+    $leve = $_REQUEST["s_leve"];
+    $posi = $_REQUEST["s_posi"];
+    $resu = $_REQUEST["s_resu"];
+    $time = $_REQUEST["s_time"];
+    $deta = $_REQUEST["s_deta"];
+
+    $play0 = $play; // /var/www/html/ifractions1/js/preMenu.js: insert_name
+    $play = remove_accents($play); // /js/squareOne.js:vars=s_ip=143.107.45.11&s_name=&s_lang=pt&s_game=Square&s_mode=A&s_oper=Plus&s_leve=1&s_posi=1&s_resu=true&s_time=3&s_deta=numBlocks:3, valBlocks: 1,1,1, blockIndex: 2, floorIndex: 2; url=assets/cn/save.php
+
+    if (is_object($lang))
+      $lang = json_decode($lang);
+
+    // Table 'ifractions': id s_hostip s_playername s_datetime s_lang s_game s_mode s_operator s_level s_mappos s_result s_time s_details
+    $sql = "INSERT INTO ifractions
+    (s_hostip, s_playername, s_datetime, s_lang, s_game, s_mode, s_operator, s_level, s_mappos, s_result, s_time, s_details)
+    VALUES
+    ('$ip', '$play', '$date', '$lang', '$game', '$mode', '$oper', $leve, $posi, '$resu', $time, '$deta')";
+
+    // Register in database
+    if ($conn->query($sql) === TRUE) {
+      print "Gravado/Grabado";
+      $result = "OK";
+    } else {
+      print "Error: " . $sql . "<br>" . $conn->error;
+      $result = "Erro: " . $conn->error;
+      }
+
+
+    //DEBUG
+    // js/menu.js : var menuState = { player_info = ... username ...}
+    // welcome
+    // index.php: game.state.add('name', nameState);
+    $name = $_REQUEST["name"];
+    $username = $_REQUEST["username"];
+    $data = date('Y_m_d_H_i_s');
+    $fp = fopen('../../temp/file_' . $data . ".txt", 'w');
+    fwrite($fp, "nome=" . $play0 . ", name=" . $name . ", username=" . $username . "\n" . $sql . "\nResultado: " . $result);
+    fclose($fp);
+
+    $conn->close();
+    ?> 

+ 0 - 0
assets/fonts/glyphicons-halflings-regular.eot


+ 0 - 0
assets/fonts/glyphicons-halflings-regular.svg


+ 0 - 0
assets/fonts/glyphicons-halflings-regular.ttf


+ 0 - 0
assets/fonts/glyphicons-halflings-regular.woff


+ 0 - 0
assets/fonts/glyphicons-halflings-regular.woff2


+ 0 - 0
assets/fx/beep.mp3


+ 0 - 0
assets/fx/beep.ogg


+ 0 - 0
assets/fx/error.mp3


+ 0 - 0
assets/fx/error.ogg


+ 0 - 0
assets/fx/ok.mp3


+ 0 - 0
assets/fx/ok.ogg


+ 0 - 0
assets/img/airballoon_base.png


+ 0 - 0
assets/img/airballoon_upper.png


+ 0 - 0
assets/img/bg.jpg


+ 0 - 0
assets/img/bg_map.png


+ 0 - 0
assets/img/birch.png


+ 0 - 0
assets/img/cloud.png


+ 0 - 0
assets/img/farm.png


+ 0 - 0
assets/img/flag.png


+ 0 - 0
assets/img/flag/BRAZ.jpg


+ 0 - 0
assets/img/flag/FRAN.jpg


+ 0 - 0
assets/img/flag/PERU.jpg


+ 0 - 0
assets/img/flag/UNST.jpg


+ 0 - 0
assets/img/floor.png


+ 0 - 0
assets/img/game/backup/five-s.png


+ 0 - 0
assets/img/game/backup/four-c.png


+ 0 - 0
assets/img/game/backup/four-s.png


+ 0 - 0
assets/img/game/backup/one-c.png


+ 0 - 0
assets/img/game/backup/one-s.png


+ 0 - 0
assets/img/game/backup/three-c.png


+ 0 - 0
assets/img/game/backup/three-s.png


+ 0 - 0
assets/img/game/backup/two-c.png


+ 0 - 0
assets/img/game/backup/two-s.png


+ 0 - 0
assets/img/garage (copy).png


+ 0 - 0
assets/img/garage.png


+ 0 - 0
assets/img/help/arrow.png


+ 0 - 0
assets/img/help/double.png


+ 0 - 0
assets/img/help/down.png


+ 0 - 0
assets/img/help/error.png


+ 0 - 0
assets/img/help/ok.png


+ 0 - 0
assets/img/help/pointer.png


+ 0 - 0
assets/img/house.png


+ 0 - 0
assets/img/kid/lost.png


+ 0 - 0
assets/img/kid/run.png


+ 0 - 0
assets/img/kid/walk.png


+ 0 - 0
assets/img/menu/audio_48x48.png


+ 0 - 0
assets/img/menu/back.png


+ 0 - 0
assets/img/menu/block.png


+ 0 - 0
assets/img/menu/eraser.png


+ 0 - 0
assets/img/menu/help.png


+ 0 - 0
assets/img/menu/home.png


+ 0 - 0
assets/img/menu/info.png


+ 0 - 0
assets/img/menu/language.png


+ 0 - 0
assets/img/menu/list.png


+ 0 - 0
assets/img/menu/menu.png


+ 0 - 0
assets/img/menu/progressBar.png


+ 0 - 0
assets/img/menu/view.png


+ 0 - 0
assets/img/operator/add.png


+ 0 - 0
assets/img/operator/blue_block.jpg


+ 0 - 0
assets/img/operator/equal.png


+ 0 - 0
assets/img/operator/multiply.png


+ 0 - 0
assets/img/operator/red_block.jpg


+ 0 - 0
assets/img/operator/separator.png


+ 0 - 0
assets/img/operator/subtract.png


+ 0 - 0
assets/img/pgbar.png


+ 0 - 0
assets/img/place.png


+ 0 - 0
assets/img/place_a.png


+ 0 - 0
assets/img/place_b.png


+ 0 - 0
assets/img/road.png


+ 0 - 0
assets/img/rock.png


+ 0 - 0
assets/img/school (copy).png


+ 0 - 0
assets/img/school.png


+ 0 - 0
assets/img/sign.png


+ 0 - 0
assets/img/tractor/frame-0.png


+ 0 - 0
assets/img/tractor/frame-1.png


+ 0 - 0
assets/img/tractor/frame-2.png


+ 0 - 0
assets/img/tractor/frame-3.png


+ 0 - 0
assets/img/tractor/frame-4.png


+ 0 - 0
assets/img/tractor/frame-5.png


+ 0 - 0
assets/img/tractor/frame-6.png


+ 0 - 0
assets/img/tractor/frame-7.png


+ 0 - 0
assets/img/tractor/frame-8.png


+ 0 - 0
assets/img/tractor/frame-9.png


+ 0 - 0
assets/img/tractor/frame.png


+ 0 - 0
assets/img/tree.png


+ 0 - 0
assets/img/tree2.png


+ 0 - 0
assets/img/tree3.png


+ 0 - 0
assets/img/tree4.png


+ 0 - 0
assets/languages/en_US.json


+ 0 - 0
assets/languages/es_PE.json


+ 0 - 0
assets/languages/fr_FR.json


+ 0 - 0
assets/languages/pt_BR.json


+ 0 - 0
css/bootstrap-theme.css


+ 0 - 0
css/bootstrap-theme.css.map


+ 0 - 0
css/bootstrap-theme.min.css


+ 0 - 0
css/bootstrap-theme.min.css.map


+ 0 - 0
css/bootstrap.css


Some files were not shown because too many files changed in this diff