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

Remove some commented lines

Browse Source
This commit is contained in:
VegaZ
2018-12-27 18:20:27 +01:00
parent 3df210c023
commit 4ea09f0034
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Client/Interaction/interaction.js
View File

@@ -133,6 +133,20 @@ mp.events.add("render", () => {
mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250); mp.game.graphics.drawRect(0.5 + 0.07, 0.5 + 0.1, 0.06, 0.04, declineColor, 100, 100, 250);
mp.game.graphics.set2dLayer(5); mp.game.graphics.set2dLayer(5);
mp.game.graphics.drawText("~g~Annehmen", [0.5 - 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.drawText("~r~Ablehnen", [0.5 + 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.set2dLayer(6);
if (isMouseOverTradeItem(pos[0], pos[1])) { if (isMouseOverTradeItem(pos[0], pos[1])) {
mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220); mp.game.graphics.drawRect(pos[0] / screenX, pos[1] / screenY + 0.055, 0.14, 0.08, 0, 0, 0, 220);
@@ -163,22 +177,8 @@ mp.events.add("render", () => {
}); });
} }
mp.game.graphics.set2dLayer(6);
mp.game.graphics.drawText("~g~Annehmen", [0.5 - 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.drawText("~r~Ablehnen", [0.5 + 0.07, 0.5 + 0.08], {
font: 4,
color: [112, 128, 144, 254],
scale: [0.6, 0.6],
outline: true,
});
mp.game.graphics.set2dLayer(7); mp.game.graphics.set2dLayer(7);
timerBarSize = tradeTimeLeft / 30 * 0.5; timerBarSize = tradeTimeLeft / 30 * 0.5;
if (tradeTimeLeft > 0) { if (tradeTimeLeft > 0) {
mp.game.graphics.drawText(tradeTimeLeft.toFixed(0), [0.5, 0.5 + 0.1312], { mp.game.graphics.drawText(tradeTimeLeft.toFixed(0), [0.5, 0.5 + 0.1312], {

5
Server/Managers/InteractionManager.cs
View File

@@ -31,7 +31,6 @@ namespace reallife_gamemode.Server.Managers
InventoryManager.GetUserItems(player); InventoryManager.GetUserItems(player);
tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize); tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize);
player.TriggerEvent("startTradeRequestTimer"); player.TriggerEvent("startTradeRequestTimer");
//player.TriggerEvent("openTradeMenu", targetPlayer);
} }
[RemoteEvent("tradeDecision")] [RemoteEvent("tradeDecision")]
@@ -39,19 +38,17 @@ namespace reallife_gamemode.Server.Managers
{ {
var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray); var tradeItems = JsonConvert.DeserializeObject<string[][]>(tradeItemArray);
Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName); Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName);
//player.SendChatMessage(tradeItemArray);
//player.SendChatMessage(tradeSelection);
if (tradeSelection == "accept") if (tradeSelection == "accept")
{ {
InventoryManager.GetUserItems(player); InventoryManager.GetUserItems(player);
tradeRequester.TriggerEvent("clearTradeItems"); tradeRequester.TriggerEvent("clearTradeItems");
player.TriggerEvent("showTradeItems", tradeItemArray); player.TriggerEvent("showTradeItems", tradeItemArray);
//TODO: Geld abziehen
} }
else else
{ {
tradeRequester.TriggerEvent("unlockTradeItems"); tradeRequester.TriggerEvent("unlockTradeItems");
} }
} }
} }
} }