diff --git a/Client/Interaction/interaction.js b/Client/Interaction/interaction.js index 133c1de4..bad2e0be 100644 --- a/Client/Interaction/interaction.js +++ b/Client/Interaction/interaction.js @@ -132,7 +132,21 @@ mp.events.add("render", () => { mp.game.graphics.drawRect(0.5 - 0.07, 0.5 + 0.1, 0.06, 0.04, 100, acceptColor, 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])) { 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); + timerBarSize = tradeTimeLeft / 30 * 0.5; if (tradeTimeLeft > 0) { mp.game.graphics.drawText(tradeTimeLeft.toFixed(0), [0.5, 0.5 + 0.1312], { diff --git a/Server/Managers/InteractionManager.cs b/Server/Managers/InteractionManager.cs index 85604307..bfe31fb7 100644 --- a/Server/Managers/InteractionManager.cs +++ b/Server/Managers/InteractionManager.cs @@ -31,7 +31,6 @@ namespace reallife_gamemode.Server.Managers InventoryManager.GetUserItems(player); tradePartner.TriggerEvent("showTradeRequest", player.Name, tradeItems, tradePrize); player.TriggerEvent("startTradeRequestTimer"); - //player.TriggerEvent("openTradeMenu", targetPlayer); } [RemoteEvent("tradeDecision")] @@ -39,19 +38,17 @@ namespace reallife_gamemode.Server.Managers { var tradeItems = JsonConvert.DeserializeObject(tradeItemArray); Client tradeRequester = ClientService.GetClientByNameOrId(tradeRequesterName); - //player.SendChatMessage(tradeItemArray); - //player.SendChatMessage(tradeSelection); if (tradeSelection == "accept") { InventoryManager.GetUserItems(player); tradeRequester.TriggerEvent("clearTradeItems"); player.TriggerEvent("showTradeItems", tradeItemArray); + //TODO: Geld abziehen } else { tradeRequester.TriggerEvent("unlockTradeItems"); } - } } }