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

Refresh TicketSystem

Browse Source
This commit is contained in:
Mac_Slash
2020-04-11 14:29:11 +02:00
parent 23d27c28e3
commit b33a2b2bb6
2 changed files with 43 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReallifeGamemode.Client/Interaction/interactionmenu.ts
View File

@@ -31,7 +31,7 @@ export default function (globalData: IGlobalData) {
var vehiclesItem = new UIMenuItem("Fahrzeuge", "Zeige deine Fahrzeuge an"); var vehiclesItem = new UIMenuItem("Fahrzeuge", "Zeige deine Fahrzeuge an");
var ticketItem = new UIMenuItem("Ticket annehmen", "Strafticket annehmen"); var ticketItem = new UIMenuItem("Strafticket", "Strafticket annehmen/ablehnen");
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount: number) => { mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount: number) => {
var accountData: AccountData = JSON.parse(accountDataJson); var accountData: AccountData = JSON.parse(accountDataJson);
@@ -334,7 +334,7 @@ export default function (globalData: IGlobalData) {
return menu; return menu;
} }
function getTicketMenu(ticket_amount: number, parentMenu: NativeUI.Menu): NativeUI.Menu { function getTicketMenu(ticket_amount: number, parentMenu: NativeUI.Menu): NativeUI.Menu {
var factionMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}`, new Point(50, 50), null, null); var factionMenu = new NativeUI.Menu("Ticket", `Ticket in Höhe von ${ticket_amount}$`, new Point(50, 50), null, null);
factionMenu.AddItem(new UIMenuItem("Ticket annehmen")); factionMenu.AddItem(new UIMenuItem("Ticket annehmen"));
factionMenu.AddItem(new UIMenuItem("Ticket ablehnen")); factionMenu.AddItem(new UIMenuItem("Ticket ablehnen"));
factionMenu.Visible = false; factionMenu.Visible = false;

51
ReallifeGamemode.Server/Managers/InteractionManager.cs
View File

@@ -14,6 +14,7 @@ using ReallifeGamemode.Database;
using ReallifeGamemode.Services; using ReallifeGamemode.Services;
using ReallifeGamemode.Server.Types; using ReallifeGamemode.Server.Types;
using System.Buffers; using System.Buffers;
using Microsoft.EntityFrameworkCore;
/** /**
* @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) * @overview Life of German Reallife - Managers Interaction (InteractionManager.cs)
@@ -378,17 +379,32 @@ namespace ReallifeGamemode.Server.Managers
string reason = (string)JsonConvert.DeserializeObject(jsonReason); string reason = (string)JsonConvert.DeserializeObject(jsonReason);
Player target = PlayerService.GetPlayerByNameOrId(nameOrId); Player target = PlayerService.GetPlayerByNameOrId(nameOrId);
string playername = NAPI.Player.GetPlayerName(player); string playername = NAPI.Player.GetPlayerName(player);
string targetname = NAPI.Player.GetPlayerName(target); string targetname = NAPI.Player.GetPlayerName(target);
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~."); if (target == null || !target.IsLoggedIn())
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); {
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Strafticket im Interaktionsmenü annehmen.", true); ChatService.PlayerNotFound(player);
//target.SendChatMessage("Du kannst mit '/accept ticket' das Strafticket annehmen."); return;
target.SetData("ticket_boolean", true); }
//target.SetData("ticket_amount", amount); else if (target == player)
//target.SetSharedData("ticket_amount", amount); {
NAPI.Data.SetEntityData(target, "ticket_amount", amount); player.SendNotification("~r~Du kannst dir selbst keine Punkte setzen!");
NAPI.Data.SetEntityData(target, "ticket_player", player); }
else
{
if (amount > 0 && amount < 10000)
{
player.SendNotification($"~w~Du hast ~y~{targetname} ~w~ein Ticket in Höhe von ~b~{amount}$ ~w~gestellt. Grund: ~g~{reason}~w~.");
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true);
target.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Strafticket im Interaktionsmenü annehmen.", true);
target.SetData("ticket_boolean", true);
NAPI.Data.SetEntityData(target, "ticket_amount", amount);
NAPI.Data.SetEntityData(target, "ticket_player", player);
}
else
{
player.SendNotification("~r~Du kannst nur zwischen 1$ und 10000$ angeben!");
}
}
} }
[RemoteEvent("CLIENT:InteractionMenu_LSPD_Points3")] [RemoteEvent("CLIENT:InteractionMenu_LSPD_Points3")]
@@ -492,6 +508,21 @@ namespace ReallifeGamemode.Server.Managers
{ {
target.SendNotification($"~g~Du hast das Ticket über ~b~{ticket_amount}$ ~g~angenommen und bezahlt.", true); target.SendNotification($"~g~Du hast das Ticket über ~b~{ticket_amount}$ ~g~angenommen und bezahlt.", true);
player.SendNotification($"~y~{targetname} ~g~hat das Ticket über ~b~{ticket_amount}$ ~g~angenommen und bezahlt.", true); player.SendNotification($"~y~{targetname} ~g~hat das Ticket über ~b~{ticket_amount}$ ~g~angenommen und bezahlt.", true);
using (var dbContext = new DatabaseContext())
{
target.GetUser(dbContext).BankAccount.Balance -= ticket_amount;
if (player.GetUser().FactionId == 1)
{
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1).First().BankAccount.Balance += (int)(ticket_amount / 100 * 70);
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 3).First().BankAccount.Balance += (int)(ticket_amount / 100 * 30);
}
if (player.GetUser().FactionId == 1)
{
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 3).First().BankAccount.Balance += (int)(ticket_amount / 100 * 70);
dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Id == 1).First().BankAccount.Balance += (int)(ticket_amount / 100 * 30);
}
dbContext.SaveChanges();
}
target.ResetData("ticket_boolean"); target.ResetData("ticket_boolean");
NAPI.Data.ResetEntityData(target, "ticket_amount"); NAPI.Data.ResetEntityData(target, "ticket_amount");
NAPI.Data.ResetEntityData(target, "ticket_player"); NAPI.Data.ResetEntityData(target, "ticket_player");