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

Id hardcoded

Browse source
This commit is contained in:
Franziska 2021-04-07 18:30:05 +02:00
parent 7472c73182
commit a7b35b386c
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
website/javascript.js
View file

@ -6,7 +6,7 @@ let reloadButton = document.getElementById("reload");
let saveButton = document.getElementById("save"); let saveButton = document.getElementById("save");
let url = "ws://10.9.1.129:8080/"; let url = "ws://10.9.1.129:8080/";
var players = []; var players = [];
let Id = Math.floor(Math.random()*10000000000000000).toString(16) let Id = "Test" //Math.floor(Math.random()*10000000000000000).toString(16)
var ws = new WebSocket(url + Id); var ws = new WebSocket(url + Id);
document.getElementById("p4").innerHTML = "" + Id; document.getElementById("p4").innerHTML = "" + Id;
@ -16,7 +16,7 @@ ws.onmessage = function(evt){
var msg = evt.data; var msg = evt.data;
var obj = JSON.parse(msg); var obj = JSON.parse(msg);
var valid = false; var valid = false;
console.log (obj);
/*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/ /*Changes Tick of one Player in players. Updates the Playerlist and current Player.*/
if (obj.eventType == "SetPlayerTickE") { if (obj.eventType == "SetPlayerTickE") {
valid = true; valid = true;
@ -57,17 +57,18 @@ ws.onmessage = function(evt){
if (obj.eventType == "InitializeTickLeisteE") { if (obj.eventType == "InitializeTickLeisteE") {
valid = true; valid = true;
players = []; players = [];
console.log(obj);
for (i = 0; i<obj.tickLeiste.length;i++){ for (i = 0; i<obj.tickLeiste.length;i++){
for (j =0;j<obj.tickLeiste[i][1].length;j++ ){ for (j =0;j<obj.tickLeiste[i][1].length;j++ ){
if (obj.tickLeiste[i][0].tickType == "Tick"){ if (obj.tickLeiste[i][0].tickType == "Tick"){
AddPlayer({Tick: obj.tickLeiste[i][0].tickValue, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]}); AddPlayer({Tick: obj.tickLeiste[i][0].tickValue, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
} }
else { else {
AddPlayer({Tick: obj.tickLeiste[i][0].tickType, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]}); AddPlayer({Tick: obj.tickLeiste[i][0].tickType, UUID: obj.tickLeiste[i][1][j][0], Name: obj.tickLeiste[i][1][j][1]});
} }
} }
} }
console.log(obj);
PlayerList(); PlayerList();
CurrentPlayer(); CurrentPlayer();
@ -107,11 +108,11 @@ 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 + '"}}'); ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '"}}');
} }
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 + '"}}'); ws.send('{"requestType" : "AddPlayerTickR", "playerName" : "' + document.getElementById("A1").value + '" , "tick" : {"tickType" : "' + type + '"}}');
} }
else { else {
type = "Tick"; type = "Tick";
@ -211,6 +212,7 @@ function AddPlayer(player){
} }
if (i == 1 && added == false){ if (i == 1 && added == false){
players.splice(0,0,player); players.splice(0,0,player);
break;
} }
} }
} }
@ -259,7 +261,7 @@ function loadFile(input){
function initializeJSONFormat(arr) { function initializeJSONFormat(arr) { // JSON ändern
var tick = -999; var tick = -999;
var tickleiste = ""; var tickleiste = "";
var type = ""; var type = "";