Commit e280e68a authored by Gabriel Olescki's avatar Gabriel Olescki

Corrigindo merge

parent 96b7a69c
......@@ -22,13 +22,11 @@ MainMenu.prototype = {
create: function() {
game.state.add('mapState', mapState);
<<<<<<< HEAD
//musica do menu
//musica do menu
musicaMenu = game.add.audio('musicaMenu');
musicaMenu.play();
=======
>>>>>>> AtividadeQuebraCabeca
background = game.add.sprite(0, 0, 'background');
background.width = game.width;
background.height = game.height;
......
......@@ -34,13 +34,9 @@ mapState.prototype = {
ocean = game.add.sprite(0, 0, 'ocean');
ocean.width = game.width;
ocean.height = game.height;
<<<<<<< HEAD
//som do oceano
//som do oceano
somOceano = game.add.audio('somOceano');
somOceano.play();
=======
>>>>>>> AtividadeQuebraCabeca
ilhaTerror = game.add.sprite(W/5, H/5, 'ilhaTerror');
ilhaTerror.animations.add('ilhaTBrilha', [2, 3, 2, 3, 2, 3, 2, 0], 7, false);
......@@ -97,7 +93,7 @@ mapState.prototype = {
if (recebedor == null) //Chamar animacao transicao de cena
recebedor = setTimeout("this.dispose; game.state.start('AtividadeMascara'); clearTimeout(recebedor); recebedor = null", 250);
}
//Se Chegou NA ILHA RED
else if (this.verificaIntersects(boat, islandRed) && notTouching[1])
{
......@@ -106,14 +102,14 @@ mapState.prototype = {
if (recebedor == null) //Chamar animacao transicao de cena
recebedor = setTimeout("this.dispose; game.state.start('AtividadeQuebraCabeca'); clearTimeout(recebedor); recebedor = null", 250);
}
//Se Chegou NA ILHA Yello
else if (this.verificaIntersects(boat, islandYellow) && notTouching[2])
{
boat.body.velocity.setTo(0, 0);
notTouching[2] = false;
}
//Se Chegou NA ILHA Arco
else if (this.verificaIntersects(boat, ilhaArco) && notTouching[3])
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment