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

Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

Browse Source
This commit is contained in:
michael.reiswich
2021-01-25 14:18:27 +01:00
parent b8815f79e9 1b4bf43d5d
commit eeb6c2368c
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Gui/playerlist.ts
View File

@@ -25,7 +25,7 @@ export default function playerList(globalData: IGlobalData): void {
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
pList = JSON.parse(playersJson); pList = JSON.parse(playersJson);
pList.forEach((player) => { pList.forEach((player) => {
playerlistBrowser.execute(`ad_row('${JSON.stringify(player.Id)}','${JSON.stringify(player.Name)}',0,0,'${JSON.stringify(player.Ping)}');`); playerlistBrowser.execute(`ad_row('${JSON.stringify(player.Id)}','${JSON.stringify(player.Name)}',${JSON.stringify(player.FactionName)},'${JSON.stringify(player.Ping)}');`);
}); });
} }
}); });

1
ReallifeGamemode.Client/assets/html/Playerlist/Tabliste.html
View File

@@ -16,7 +16,6 @@
<tr> <tr>
<th>ID</th> <th>ID</th>
<th>Spielername</th> <th>Spielername</th>
<th>Level</th>
<th>Fraktion</th> <th>Fraktion</th>
<th>Ping</th> <th>Ping</th>
</tr> </tr>

12
ReallifeGamemode.Client/assets/html/Playerlist/script.js
View File

@@ -1,7 +1,7 @@
function ad_row(id, name, level, faction, ping) { function ad_row(id, name, faction, ping) {
var table_id = "t1"; var table_id = "t1";
var table = document.getElementById(table_id); var table = document.getElementById(table_id);
var rows = table.getElementsByTagName('tr').length; var rows = table.getElementsByTagName('tr').length;
@@ -10,17 +10,13 @@ function ad_row(id, name, level, faction, ping) {
var td2 = document.createElement('td'); var td2 = document.createElement('td');
var td3 = document.createElement('td'); var td3 = document.createElement('td');
var td4 = document.createElement('td'); var td4 = document.createElement('td');
var td5 = document.createElement('td'); var test = faction;
var test = level;
var test2 = faction;
td1.innerHTML = ''+id; td1.innerHTML = ''+id;
td2.innerHTML = name.slice(1, -1); td2.innerHTML = name.slice(1, -1);
td3.innerHTML = 'WIP'; td3.innerHTML = ''+faction;
td4.innerHTML = 'WIP'; td4.innerHTML = ''+ping;
td5.innerHTML = ''+ping;
tr.appendChild(td1); tr.appendChild(td1);
tr.appendChild(td2); tr.appendChild(td2);
tr.appendChild(td3); tr.appendChild(td3);
tr.appendChild(td4); tr.appendChild(td4);
tr.appendChild(td5);
} }

15
ReallifeGamemode.Server/Events/Key.cs
View File

@@ -609,16 +609,17 @@ namespace ReallifeGamemode.Server.Events
} }
[RemoteEvent("keyPress:O")] [RemoteEvent("keyPress:O")]
public void KeyPressJ(Player player) public void KeyPressO(Player player)
{ {
if (!player.IsLoggedIn()) return; if (!player.IsLoggedIn()) return;
List<Player> players = NAPI.Pools.GetAllPlayers(); List<Player> players = NAPI.Pools.GetAllPlayers();
var listPlayers = players.Select(p => new var listPlayers = players.Select(p => new
{ {
Id = p.Handle.Value, Id = p.Handle.Value,
p.Name, p.Name,
p.Ping, p.Ping,
}); FactionName = p.GetUser().Faction.Name,
}) ;
player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers)); player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers));
} }