aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
VegaZ
2018-09-23 12:17:57 +02:00
parent 1d500a0169 7e843cca60
commit e455c9efef
4 changed files with 144 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
Client/Gui/infobox.js Normal file
View File

@@ -0,0 +1,119 @@
/**
* @overview Life of German Reallife - Gui Infobox infobox.js
* @author VegaZ
* @copyright (c) 2008 - 2018 Life of German
*/
var currentdate;
var timeString;
var draw = false;
var draw = false;
let posX = 0.92;
let posY = 0.45;
let width = 0.1;
let height = 0.2;
let colorR = 0;
let colorG = 0;
let colorB = 0;
let colorA = 72;
var day;
var month;
var year;
var hour;
var minute;
var second;
var nDay;
var nMonth;
var nHour;
var nMinute;
var nSecond;
mp.events.add("draw", () => {
draw = true;
});
mp.events.add("render", () => {
if (draw === true) {
currentdate = new Date();
day = currentdate.getDate();
month = currentdate.getMonth();
year = currentdate.getFullYear();
hour = currentdate.getHours();
minute = currentdate.getMinutes();
second = currentdate.getSeconds();
if (day < 10) {
nDay = "0" + day;
} else nDay = day;
if (hour < 10) {
nHour = "0" + hour;
} else nHour = hour;
if (minute < 10) {
nMinute = "0" + minute;
} else nMinute = minute;
if (second < 10) {
nSecond = "0" + second;
} else nSecond = second;
switch (month) {
case 0:
nMonth = "Jan.";
break;
case 1:
nMonth = "Feb.";
break;
case 2:
nMonth = "Mär.";
break;
case 3:
nMonth = "Apr.";
break;
case 4:
nMonth = "Mai";
break;
case 5:
nMonth = "Jun.";
break;
case 6:
nMonth = "Jul.";
break;
case 7:
nMonth = "Aug.";
break;
case 8:
nMonth = "Sep.";
break;
case 9:
nMonth = "Okt.";
break;
case 10:
nMonth = "Nov.";
break;
case 11:
nMonth = "Dez.";
break;
}
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],
{
font: 4,
color: [255, 255, 255, 255],
scale: [0.5, 0.5],
outline: true
})
}
});

3
Client/index.js
View File

@@ -4,6 +4,7 @@
* @copyright (c) 2008 - 2018 Life of German
*/
require('./Gui/infobox.js');
require('./Login/main.js');
require('./Save/main.js');
require('./Save/save.js');
require('./Save/save.js');

4
Server/Events/Login.cs
View File

@@ -39,9 +39,11 @@ namespace reallife_gamemode.Server.Events
}
else
{
player.TriggerEvent("loginSuccess");
player.TriggerEvent("loginSuccess");
NAPI.Player.SpawnPlayer(player, Main.DEFAULT_SPAWN_POSITION, Main.DEFAULT_SPAWN_HEADING);
player.SetData("isLoggedIn", true);
player.TriggerEvent("draw");
}
}
}

40
meta.xml
View File

@@ -6,42 +6,42 @@
<!--CS-->
<!--Model-->
<script src="Model/DatabaseContext.cs" type="server" lang="chsarp" />
<script src="/Model/DatabaseContext.cs" type="server" lang="chsarp" />
<!--Server-->
<!--Commands-->
<script src="Server/Commands/Admin.cs" type="server" lang="csharp" />
<script src="/Server/Commands/Admin.cs" type="server" lang="csharp" />
<!--Entities-->
<script src="Server/Entities/User.cs" type="server" lang="csharp" />
<script src="/Server/Entities/User.cs" type="server" lang="csharp" />
<!--Events-->
<script src="Server/Events/Connect.cs" type="server" lang="csharp" />
<script src="Server/Events/Death.cs" type="server" lang="csharp" />
<script src="Server/Events/Login.cs" type="server" lang="csharp" />
<script src="Server/Events/Register.cs" type="server" lang="csharp" />
<script src="Server/Events/SaveData.cs" type="server" lang="csharp" />
<script src="Server/Events/Spawn.cs" type="server" lang="csharp" />
<script src="/Server/Events/Connect.cs" type="server" lang="csharp" />
<script src="/Server/Events/Death.cs" type="server" lang="csharp" />
<script src="/Server/Events/Login.cs" type="server" lang="csharp" />
<script src="/Server/Events/Register.cs" type="server" lang="csharp" />
<script src="/Server/Events/SaveData.cs" type="server" lang="csharp" />
<script src="/Server/Events/Spawn.cs" type="server" lang="csharp" />
<!--Extensions-->
<script src="Server/Extensions/ClientExtension.cs" type="server" lang="csharp" />
<script src="/Server/Extensions/ClientExtension.cs" type="server" lang="csharp" />
<!--Managers-->
<script src="Server/Managers/LoadManager.cs" type="server" lang="csharp" />
<script src="/Server/Managers/LoadManager.cs" type="server" lang="csharp" />
<!--Saves-->
<script src="Server/Saves/SavedBlip.cs" type="server" lang="csharp" />
<script src="Server/Saves/SavedMarker.cs" type="server" lang="csharp" />
<script src="Server/Saves/SavedPed.cs" type="server" lang="csharp" />
<script src="Server/Saves/SavedPickup.cs" type="server" lang="csharp" />
<script src="Server/Saves/SavedTextLabel.cs" type="server" lang="csharp" />
<script src="Server/Saves/SavedVehicle.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedBlip.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedMarker.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedPed.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedPickup.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedTextLabel.cs" type="server" lang="csharp" />
<script src="/Server/Saves/SavedVehicle.cs" type="server" lang="csharp" />
<!--Services-->
<script src="Server/Services/ChatService.cs" type="server" lang = "csharp" />
<script src="Server/Services/ClientService.cs" type="server" lang="csharp" />
<script src="/Server/Services/ChatService.cs" type="server" lang = "csharp" />
<script src="/Server/Services/ClientService.cs" type="server" lang="csharp" />
<!--Util-->
<script src="Server/Util/AdminLevel.cs" type="server" lang="csharp" />
<script src="/Server/Util/AdminLevel.cs" type="server" lang="csharp" />
</meta>