Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ReyDoran/JR-Grupo-H
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alpuerro
Alpuerro committed Jan 16, 2020
2 parents 8c7cb15 + 897ce2b commit 96068e1
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 57 deletions.
1 change: 0 additions & 1 deletion Juego/.settings/org.eclipse.core.resources.prefs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
20 changes: 11 additions & 9 deletions Juego/src/main/resources/static/login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class Login extends Phaser.Scene

this.online = this.add.image(gameWidth*35/50, gameHeight*35/50, 'online').setAlpha(0).setScale(0.5).setInteractive();

this.userCreatedText = this.add.text(gameWidth*(25/100), gameHeight*(30/80),"",{ font: '32px Courier', fill: '#00ff00'});
this.userCreatedText = this.add.text(gameWidth*(25/100), gameHeight*(30/80),"",{ font: '32px Courier', fill: '#00ff00'});

this.back.on('pointerdown', function (pointer){
nam.style.display = 'none';
Expand All @@ -226,8 +226,10 @@ class Login extends Phaser.Scene
signUp.style.display = 'none';
chat.style.display = 'none';
send.style.display = 'none';

document.getElementById("chat_div").style.visibility = "hidden";
document.getElementById("chatfeed").style.visibility = "hidden";

loadchat = false;
this.chatmes.setText("");
this.conected.setText("");
Expand Down Expand Up @@ -305,16 +307,15 @@ class Login extends Phaser.Scene
}
if (loggedIn == true)
{

chatFeed.style.display = 'initial';
this.log.setText("");
chatFeed.style.display = 'initial';
this.log.setText("");
this.reg.setText("");
errorlogin = false;
errorregister = false;
loggedIn = false;
this.onlineConfirmationTimer = this.time.addEvent({ delay: 500, callback: this.onlineConfirmationGet, loop: true, callbackScope: this});
this.getChatTimer = this.time.addEvent({ delay: 250, callback: this.getchat, loop: true, callbackScope: this});
this.getUsersTimer = this.time.addEvent({ delay: 500, callback: this.getusers, loop: true, callbackScope: this});
this.getChatTimer = this.time.addEvent({ delay: 250, callback: this.getchat, loop: true, callbackScope: this});
this.getUsersTimer = this.time.addEvent({ delay: 500, callback: this.getusers, loop: true, callbackScope: this});
this.disableLogin();
this.showOnlineMenu();
loadchat = true;
Expand Down Expand Up @@ -344,6 +345,7 @@ class Login extends Phaser.Scene
if(backMenu)
{
this.fall.setText("El servidor se ha caido");

this.backMenuFuncTimer = this.time.addEvent({ delay: 4000, callback: this.backMenuFunc, loop: false, callbackScope: this});
}
if(match)
Expand All @@ -363,6 +365,7 @@ class Login extends Phaser.Scene

loggedInToTrue() {
loggedIn = true;

this.userCreatedText.setText("");
document.getElementById("chat_div").style.visibility = "visible";
document.getElementById("chatfeed").style.visibility = "visible";
Expand All @@ -389,8 +392,8 @@ class Login extends Phaser.Scene

$.get('http://'+URLdomain+'/users', function(users){
if (users!=null){
us = users[0];
us2 = users[1];
us = users[0];
us2 = users[1];
}
});
let connectedText = "";
Expand Down Expand Up @@ -454,7 +457,6 @@ class Login extends Phaser.Scene
})
}


registerUser()
{
$.ajax({
Expand Down
1 change: 1 addition & 0 deletions Juego/src/main/resources/static/menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Menu extends Phaser.Scene {
super({key:"menu"});
}


preload() {

}
Expand Down
21 changes: 12 additions & 9 deletions Juego/target/classes/static/login.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ class Login extends Phaser.Scene

this.online = this.add.image(gameWidth*35/50, gameHeight*35/50, 'online').setAlpha(0).setScale(0.5).setInteractive();

this.userCreatedText = this.add.text(gameWidth*(25/100), gameHeight*(30/80),"",{ font: '32px Courier', fill: '#00ff00'});
this.userCreatedText = this.add.text(gameWidth*(25/100), gameHeight*(30/80),"",{ font: '32px Courier', fill: '#00ff00'});


this.back.on('pointerdown', function (pointer){
nam.style.display = 'none';
Expand All @@ -226,8 +227,10 @@ class Login extends Phaser.Scene
signUp.style.display = 'none';
chat.style.display = 'none';
send.style.display = 'none';

document.getElementById("chat_div").style.visibility = "hidden";
document.getElementById("chatfeed").style.visibility = "hidden";

loadchat = false;
this.chatmes.setText("");
this.conected.setText("");
Expand Down Expand Up @@ -305,20 +308,20 @@ class Login extends Phaser.Scene
}
if (loggedIn == true)
{

chatFeed.style.display = 'initial';
this.log.setText("");
chatFeed.style.display = 'initial';
this.log.setText("");
this.reg.setText("");
errorlogin = false;
errorregister = false;
loggedIn = false;
this.onlineConfirmationTimer = this.time.addEvent({ delay: 500, callback: this.onlineConfirmationGet, loop: true, callbackScope: this});
this.getChatTimer = this.time.addEvent({ delay: 250, callback: this.getchat, loop: true, callbackScope: this});
this.getUsersTimer = this.time.addEvent({ delay: 500, callback: this.getusers, loop: true, callbackScope: this});
this.getChatTimer = this.time.addEvent({ delay: 250, callback: this.getchat, loop: true, callbackScope: this});
this.getUsersTimer = this.time.addEvent({ delay: 500, callback: this.getusers, loop: true, callbackScope: this});
this.disableLogin();
this.showOnlineMenu();
loadchat = true;
}

if (registered == true) {
this.log.setText("");
this.reg.setText("");
Expand Down Expand Up @@ -363,6 +366,7 @@ class Login extends Phaser.Scene

loggedInToTrue() {
loggedIn = true;

this.userCreatedText.setText("");
document.getElementById("chat_div").style.visibility = "visible";
document.getElementById("chatfeed").style.visibility = "visible";
Expand All @@ -389,8 +393,8 @@ class Login extends Phaser.Scene

$.get('http://'+URLdomain+'/users', function(users){
if (users!=null){
us = users[0];
us2 = users[1];
us = users[0];
us2 = users[1];
}
});
let connectedText = "";
Expand Down Expand Up @@ -454,7 +458,6 @@ class Login extends Phaser.Scene
})
}


registerUser()
{
$.ajax({
Expand Down
1 change: 0 additions & 1 deletion Juego/target/classes/static/menu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ class Menu extends Phaser.Scene {
this.disableTutorial1();
this.showMainMenu();
}, this);

//Interfaz por encima de casi todo
this.bg_estatica = this.add.sprite(gameWidth*11/20,gameHeight/2,'bg_estatica').setAlpha(0.05);
this.anims.create({
Expand Down
37 changes: 1 addition & 36 deletions Juego/users.txt
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1 @@
ReyDoran
JohnColtrane
1
Tovilu
MurrayRothbard
2
alpuerro
china
3
pandoust
wazowski
4
1234
1234
5


6
alberto
hola
7
tovilu
ttt
8
vick
vi
9
Alberto
hola
10
No Alberto
hola
11
no alberto

12

33 changes: 32 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Si escogemos jugar deberemos primero elegir personaje.

Tambien deberemos elegir las habilidades que tendra este.

![](https://imgur.com/7tlzCjm.jpeg)
![](https://imgur.com/0Tv4DHE)

Despues de lo anterior aparecera el video en el cual deberemos memorizar bien los personajes que pasan porque no harán una pregunta.

Expand All @@ -57,6 +57,37 @@ Por ultimo tendremos que mover a nuestro personaje a la respuesta que se no habr

![](https://imgur.com/rmsEi1W.png)

# ----------------------------- Fase 3 -----------------------------

En esta tercera fase hemos cambiado muchas cosas en el apartado estético, hemos cambiado toda la interfaz por completo, tanto la de in-game como la de los distintos menús, hemos aprovechado la televisión que hay en el juego, para aprovecharla como nexo principal entre las distintas pantallas.
Nada más empezar hemos implementado un vídeo a modo de introducción del juego que de pie a la pantalla con el título, a continuación,
la pantalla .

![](https://i.imgur.com/Mz7RBgp.png)

Una vez avanzas la pantalla, accedes al nuevo menú principal con las opciones de jugar, on line y tutorial.

![](https://i.imgur.com/a9vqgm9.png)

En esta tercera fase hemos cambiado por completo el tutorial, siguiendo las sugerencias recibidas tras la presentación de la anterior fase.
![](https://i.imgur.com/byDtPdc.png)

Una vez le damos a jugar, en la nueva pantalla de selección de personaje aparecen los 4 personajes disponibles, además hemos mejorado la parte de respuestas visuales para la parte de usuario.
![](https://i.imgur.com/QBTqkMe.png)

Tras esto, la pantalla de selección de habilidades es bastante parecida a la anterior, aún así hemos cambiado algo el diseño de las cartas.
![](https://i.imgur.com/0Tv4DHE.png)

En la parte de la cinemática hemos cambiado el tipo de fuente y el tamaño de las preguntas, para hacer más visible estas.
![](https://i.imgur.com/bb3vPbb.png)

Finalmente la nueva pantalla de juego, que ha sufrido múltiples cambios para mejorar su aspecto y funcionalidad.

![](https://i.imgur.com/zoeGQvD.png)




Jesús de Pando Galán - [email protected] - [email protected] - Pandouman
Tomás Pérez Martínez - [email protected] - [email protected] - Tovilu
Manuel Pérez Ramil - [email protected] - [email protected] - ReyDoran
Expand Down

0 comments on commit 96068e1

Please sign in to comment.