Merge branch 'develop' into superMaraton

Program-AR · Oct 20, 2023 · 2230c3f · 2230c3f
2 parents 6459177 + 89f7adb
commit 2230c3f
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 51 deletions.
diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js
@@ -1262,6 +1262,11 @@ export default Service.extend({
       icono: 'icono.titoFinalizacion.png',
       funcionSensor: 'estoyUltimaFila()',
     });
+
+    this.crearBloqueSensor('TocandoMeta', 'comeToTheEnd', {
+      icono: 'icono.marcadorBlanco.png',
+      funcionSensor: 'tocando("MetaFinal")',
+    });
 
     this.crearBloqueSensor('KmsTotales', 'kmToTravel', {
       icono: 'icono.kms.png',

diff --git a/app/utils/staticData/desafios.js b/app/utils/staticData/desafios.js
@@ -1636,7 +1636,7 @@ export const desafios = [
   {
     id: 242,
     nombre: '5.1.3a',
-    escena: `new EscenaDuba("[A,P?(0.6)]", {}, [0,1])`,
+    escena: `new EscenaDuba("[A,P?(0.6)]", {}, [1,0])`,
     estiloToolbox: 'sinCategorias',
     bloques: [
       'MoverACasillaAbajo',
@@ -1655,7 +1655,7 @@ export const desafios = [
   {
     id: 243,
     nombre: '5.1.3b',
-    escena: `new EscenaDuba(["[A,-,-]","[A,P,-]","[A,-,P]","[A,P,P]"], {}, [0,2])`,
+    escena: `new EscenaDuba(["[A,-,-]","[A,P,-]","[A,-,P]","[A,P,P]"], {}, [2,0])`,
     estiloToolbox: 'sinCategorias',
     bloques: [
       'MoverACasillaAbajo',
@@ -1776,7 +1776,7 @@ export const desafios = [
   {
     id: 248,
     nombre: '5.2.1a',
-    escena: `new EscenaDuba("[A,-,-,-,-,-,-,P?]", {}, [0,7])`,
+    escena: `new EscenaDuba("[A,-,-,-,-,-,-,P?]", {}, [7,0])`,
     estiloToolbox: 'sinCategorias',
     bloques: [
       'MoverACasillaAbajo',
@@ -1794,7 +1794,7 @@ export const desafios = [
   {
     id: 249,
     nombre: '5.2.1b',
-    escena: `new EscenaDuba("[A,#P,#P,#P,#P,#P,#P,#P]", { macros: { "P": "*>P?" }, coleccion: ["P"] }, [0,7])`,
+    escena: `new EscenaDuba("[A,#P,#P,#P,#P,#P,#P,#P]", { macros: { "P": "*>P?" }, coleccion: ["P"] }, [7,0])`,
     estiloToolbox: 'sinCategorias',
     bloques: [
       'MoverACasillaAbajo',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -64,8 +64,8 @@
     "clientjs": "^0.1.11",
     "creador-de-desafios-pilasbloques": "^1.0.1",
     "mulang": "^6.0.5",
-    "pilas-bloques-ember-intl": "^1.1.2",
-    "pilas-bloques-exercises": "1.4.9",
+    "pilas-bloques-ember-intl": "^1.1.2"
+    "pilas-bloques-exercises": "1.4.12",
     "pilasweb": "^0.5.0",
     "proceds-blockly": "^1.1.0",
     "ramda": "^0.28.0",
@@ -85,7 +85,7 @@
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^4.2.0",
-    "electron": "22.3.24",
+    "electron": "22.3.25",
     "electron-packager": "15.1.0",
     "electron-rebuild": "2.0.0",
     "ember-ajax": "^5.0.0",

diff --git a/public/iconos/icono.marcadorBlanco.png b/public/iconos/icono.marcadorBlanco.png
diff --git a/tests/integration/ejerciciosPilas/ImagenesPreCarga-test.js b/tests/integration/ejerciciosPilas/ImagenesPreCarga-test.js
@@ -16,17 +16,61 @@ moduloEjerciciosPilas('Imagenes Pre-carga', () => {
 
   testDePrecarga('EscenaDuba', `new EscenaDuba("[O,-,A,P,*]")`,
     [
-      "fondo.duba.png", "actor.duba.png", "actor.churrasco.png",
-      "casillas.duba.png", "obstaculo.duba1.png",
-      "obstaculo.duba2.png", "obstaculo.duba3.png", "obstaculo.duba4.png"
+      "fondo.duba.png",
+      "actor.duba.png", "actor.churrasco.png",
+      "marcador-duba.png",
+      "obstaculo.duba1.png", "obstaculo.duba2.png", "obstaculo.duba3.png", "obstaculo.duba4.png",
+      "casillas.duba.png"
     ]
   )
 
   testDePrecarga('EscenaLita', `new EscenaLita("[O,-,A,T,L,E]")`,
     [
-      "fondo.lita.png", "actor.lita.png", "actor.ensaladera.png", "actor.tomate.png", "actor.lechuga.png",
-      "casillas.lita.png", "obstaculo.lita1.png",
-      "obstaculo.lita2.png", "obstaculo.lita3.png", "obstaculo.lita4.png"
+      "fondo.lita.png",
+      "actor.lita.png", "actor.ensaladera.png", "actor.tomate.png", "actor.lechuga.png",
+      "marcador-lita.png",
+      "obstaculo.lita1.png", "obstaculo.lita2.png", "obstaculo.lita3.png", "obstaculo.lita4.png",
+      "casillas.lita.png"
+    ]
+  )
+
+  testDePrecarga('EscenaChuy', `new EscenaChuy("[O,-,A,T,E,U,P,G]")`,
+    [
+      "fondo.chuy.png",
+      "actor.chuy.png", "actor.trofeo.png", "actor.paleta.png", 'pelotaAnimada.png', "actor.pelota.png", 'actor.pelotita.png',
+      "marcador-chuy.png",
+      "obstaculo.chuy1.png", "obstaculo.chuy2.png", "obstaculo.chuy3.png", "obstaculo.chuy4.png",
+      "casillas.chuy.png"
+    ]
+  )
+
+  testDePrecarga('EscenaCapy', `new EscenaCapy("[O,-,A,T,Y,L,P]")`,
+    [
+      "fondo.capy.png",
+      "actor.capy.png", "actor.tacho.png", "actor.lata.png", "actor.papel.png",
+      "marcador-capy.png",
+      "obstaculo.capy1.png", "obstaculo.capy2.png", "obstaculo.capy3.png", "obstaculo.capy4.png",
+      "casillas.capy.png"
+    ]
+  )
+
+  testDePrecarga('EscenaManic', `new EscenaManic("[O,-,A,T,R,E,P]")`,
+    [
+      "fondo.manic.png",
+      "actor.manic.png", "actor.telescopio.png", "actor.estrella.png", "actor.planeta.png",
+      "marcador-manic.png",
+      "obstaculo.manic1.png", "obstaculo.manic2.png", "obstaculo.manic3.png", "obstaculo.manic4.png",
+      "casillas.manic.png"
+    ]
+  )
+
+  testDePrecarga('EscenaYvoty', `new EscenaYvoty("[O,-,A,C,P,K,L,M,T]")`,
+    [
+      "fondo.yvoty.png",
+      "actor.yvoty.png", "actor.celular.png", "actor.luciernaga.png", "actor.cargador.png", "actor.mariposa.png", "compu_animada.png",
+      "marcador-yvoty.png",
+      "obstaculo.yvoty1.png", "obstaculo.yvoty2.png", "obstaculo.yvoty3.png", "obstaculo.yvoty4.png",
+      "casillas.yvoty.png"
     ]
   )