From 54d9e576694b39a4eeaf65378c67e47c4815e88c Mon Sep 17 00:00:00 2001 From: VegaZ Date: Thu, 27 Sep 2018 21:27:24 +0200 Subject: [PATCH] Found the lost infobox (M4tr1x) --- Client/Gui/infobox.js | 44 ++++++++++++++++++++++++++++++++++++------ Server/Events/Login.cs | 2 +- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/Client/Gui/infobox.js b/Client/Gui/infobox.js index 63f9cb0f..6c818000 100644 --- a/Client/Gui/infobox.js +++ b/Client/Gui/infobox.js @@ -5,11 +5,11 @@ */ var currentdate; +var dateString; var timeString; var draw = false; -var draw = false; let posX = 0.92; let posY = 0.45; let width = 0.1; @@ -32,8 +32,14 @@ var nHour; var nMinute; var nSecond; -mp.events.add("draw", () => { +var playerName; +var playerId; + +mp.events.add("draw", (pName, pId) => { + playerName = pName; + playerId = pId; draw = true; + }); mp.events.add("render", () => { @@ -105,15 +111,41 @@ mp.events.add("render", () => { } - timeString = "~r~Datum: ~s~" + nDay + ". " + nMonth + " " + year + "\n~r~Uhrzeit: ~s~" + nHour + ":" + nMinute + ":" + nSecond + " Uhr"; - - mp.game.graphics.drawRect(posX, posY, width, height, colorR, colorG, colorB, colorA); - mp.game.graphics.drawText(timeString, [0.92, 0.35], + + dateString = nDay + ". " + nMonth + " " + year; + timeString = nHour + ":" + nMinute + ":" + nSecond + " Uhr"; + mp.game.graphics.requestStreamedTextureDict("digitaloverlay", true); + //static + mp.game.graphics.drawSprite("digitaloverlay", "static1", posX, posY, width, height, 0, 0, 255, 0, 88); + //mp.game.graphics.drawRect(posX, posY, width, height, colorR, colorG, colorB, colorA); + mp.game.graphics.drawText(playerName + " (" + playerId + ")", [0.92, 0.351], { font: 4, color: [255, 255, 255, 255], scale: [0.5, 0.5], outline: true }) + + mp.game.graphics.drawText(dateString + "\n" + timeString, [0.938, 0.381], + { + font: 4, + color: [255, 255, 255, 255], + scale: [0.5, 0.5], + outline: true + }) + mp.game.graphics.drawText("~r~Datum: ", [0.89, 0.381], + { + font: 4, + color: [255, 255, 255, 255], + scale: [0.5, 0.5], + outline: true + }) + mp.game.graphics.drawText("~r~Uhrzeit: ", [0.891, 0.411], + { + font: 4, + color: [255, 255, 255, 255], + scale: [0.5, 0.5], + outline: true + }) } }); \ No newline at end of file diff --git a/Server/Events/Login.cs b/Server/Events/Login.cs index 84cf1e14..032b9b55 100644 --- a/Server/Events/Login.cs +++ b/Server/Events/Login.cs @@ -46,7 +46,7 @@ namespace reallife_gamemode.Server.Events player.SetData("isLoggedIn", true); player.SetData("spec", true); - player.TriggerEvent("draw"); + player.TriggerEvent("draw", player.Name, player.Handle.Value); player.Position = new Vector3(user.PositionX, user.PositionY, user.PositionZ); } }