diff --git a/app/services/blocks-gallery.js b/app/services/blocks-gallery.js index 3c034a4bb..afe1598d2 100644 --- a/app/services/blocks-gallery.js +++ b/app/services/blocks-gallery.js @@ -1256,6 +1256,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 index deca6a3d1..25d898632 100644 --- a/app/utils/staticData/desafios.js +++ b/app/utils/staticData/desafios.js @@ -1648,7 +1648,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', @@ -1667,7 +1667,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', @@ -1788,7 +1788,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', @@ -1806,7 +1806,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.json b/package.json index 7c28fb9bf..b625813a2 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "creador-de-desafios-pilasbloques": "^1.0.1", "mulang": "^6.0.5", "pilas-bloques-ember-intl": "^1.1.2", - "pilas-bloques-exercises": "1.4.7", + "pilas-bloques-exercises": "1.4.12", "pilasweb": "^0.5.0", "proceds-blockly": "^1.1.0", "ramda": "^0.28.0", diff --git a/public/iconos/icono.marcadorBlanco.png b/public/iconos/icono.marcadorBlanco.png new file mode 100644 index 000000000..8593bb159 Binary files /dev/null and b/public/iconos/icono.marcadorBlanco.png differ diff --git a/tests/integration/ejerciciosPilas/ImagenesPreCarga-test.js b/tests/integration/ejerciciosPilas/ImagenesPreCarga-test.js index 5cda287d8..2b652c0b7 100644 --- 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" ] )