Splittertech/tickLeisteClient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AddPlayer gefixt

Browse source 
JSON gefixt
This commit is contained in:
Franziska 2021-04-07 17:30:07 +02:00
parent 71c495a905
commit 0d91cb7c54
1 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

50
website/javascript.js
View file

@ -4,7 +4,7 @@ let changeTickButton = document.getElementById("changeTick");
let changeIdButton = document.getElementById("tickLeistenId"); let changeIdButton = document.getElementById("tickLeistenId");
let reloadButton = document.getElementById("reload"); let reloadButton = document.getElementById("reload");
let saveButton = document.getElementById("save"); let saveButton = document.getElementById("save");
let url = "wss://nerfingen.de:8080/"; let url = "ws://10.9.1.129:8080/";
var players = []; var players = [];
let Id = Math.floor(Math.random()*10000000000000000).toString(16) let Id = Math.floor(Math.random()*10000000000000000).toString(16)
var ws = new WebSocket(url + Id); var ws = new WebSocket(url + Id);
@ -22,10 +22,16 @@ ws.onmessage = function(evt){
valid = true; valid = true;
for (i = 0; i < players.length; i++){ for (i = 0; i < players.length; i++){
if (players[i].UUID == obj.playerUUID){ if (players[i].UUID == obj.playerUUID){
players[i].Tick = obj.tick.tickValue; if (obj.tick.tickType == "Tick"){
players[i].Tick = obj.tick.tickValue;
}
else {
players[i].Tick = obj.tick.tickType;
}
var pl = players[i]; var pl = players[i];
players.splice(i,1); players.splice(i,1);
AddPlayer(pl); AddPlayer(pl);
break;
} }
} }
PlayerList(); PlayerList();
@ -38,10 +44,10 @@ ws.onmessage = function(evt){
newPlayer.Name = obj.playerName; newPlayer.Name = obj.playerName;
newPlayer.UUID = obj.playerUUID; newPlayer.UUID = obj.playerUUID;
if (obj.tick.tickType == "Tick"){ if (obj.tick.tickType == "Tick"){
newPlayer.Tick = obj.tick.tickValue; newPlayer.Tick = obj.tick.tickValue;
} }
else { else {
newPlayer.Tick = tickType; newPlayer.Tick = obj.tick.tickType;
} }
AddPlayer(newPlayer); AddPlayer(newPlayer);
PlayerList(); PlayerList();
@ -95,14 +101,17 @@ addButton.onclick = function() {
var type = ""; var type = "";
if (document.getElementById("A2").value == "Abwarten") { if (document.getElementById("A2").value == "Abwarten") {
type = "Abwarten"; type = "Abwarten";
ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
} }
if (document.getElementById("A2").value == "Bereithalten") { if (document.getElementById("A2").value == "Bereithalten") {
type = "Bereithalten"; type = "Bereithalten";
ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : "' + document.getElementById("A2").value + '"}}');
} }
else { else {
type = "Tick"; type = "Tick";
ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
} }
ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '", "tickValue" : ' + document.getElementById("A2").value + '}}');
} }
/*When the Button is clicked, a RemovePlayerR request is send to the server.*/ /*When the Button is clicked, a RemovePlayerR request is send to the server.*/
@ -124,17 +133,18 @@ changeTickButton.onclick = function() {
for (i = 0; i < players.length; i++){ for (i = 0; i < players.length; i++){
if (players[i].Name == document.getElementById("C1").value){ if (players[i].Name == document.getElementById("C1").value){
UUID = players[i].UUID; UUID = players[i].UUID;
if (players[i].tick == "Abwarten" || players[i].tick == "Bereithalten"){ if (Tick == "Abwarten" || Tick == "Bereithalten"){
type = players[i].Tick; ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + Tick + '"}}');
break;
} }
else { else {
type = "Tick"; type = "Tick";
ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');
break;
} }
} }
} }
/*console.log(Tick);
console.log('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');*/
ws.send('{"requestType" : "SetPlayerTickR", "playerUUID" : "' + UUID + '", "tick" : {"tickType" : "' + type + '", "tickValue" : ' + Tick + '}}');
} }
/*When the Button is clicked, a new WebSocket connection is opened with the new ID*/ /*When the Button is clicked, a new WebSocket connection is opened with the new ID*/
@ -170,6 +180,10 @@ function CurrentPlayer(){
document.getElementById("p2").innerHTML = players[0].Name; document.getElementById("p2").innerHTML = players[0].Name;
document.getElementById("p1").innerHTML = "" + players[0].Tick; document.getElementById("p1").innerHTML = "" + players[0].Tick;
} }
else{
document.getElementById("p2").innerHTML = "-";
document.getElementById("p1").innerHTML = "-";
}
} }
function AddPlayer(player){ function AddPlayer(player){
@ -196,13 +210,21 @@ function AddPlayer(player){
} }
else { else {
for (i = 0; i<players.length;i++){ for (i = 0; i<players.length;i++){
if (player.Tick < players[i].Tick){ if (players[i].Tick == "Abwarten" || players[i].Tick == "Bereithalten"){
players.splice(i,0,player); players.splice(i,0,player);
added = true; added = true;
break; break
} }
if (i == players.length -1 && added == false){ else {
players.push(player); if (player.Tick < players[i].Tick){
players.splice(i,0,player);
added = true;
break;
}
if (i == (players.length -1) && added == false){
players.push(player);
break;
}
} }
} }
} }