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 16:06:11 +02:00
parent e0104bb9b2
commit 1713bd8616
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Interaction/factioninteraction.ts
View File

@@ -130,7 +130,7 @@ export default function factionInteraction(globalData: IGlobalData) {
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(ticketReason => { input.getValue(ticketReason => {
mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), JSON.stringify(ticketPrice), JSON.stringify(ticketReason)); mp.events.callRemote("CLIENT:InteractionMenu_LSPD_Ticket3", JSON.stringify(ticketName), ticketPrice, JSON.stringify(ticketReason));
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
}); });
}); });

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

@@ -34,6 +34,9 @@ export default function (globalData: IGlobalData) {
var ticketItem = new UIMenuItem("Strafticket", "Strafticket annehmen/ablehnen"); 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) => { mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount) => {
mp.game.graphics.notify("" + ticket_amount);
var accountData: AccountData = JSON.parse(accountDataJson); var accountData: AccountData = JSON.parse(accountDataJson);
//var ticket_amount = JSON.parse(ticket_amountJson); //var ticket_amount = JSON.parse(ticket_amountJson);

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

@@ -147,7 +147,12 @@ namespace ReallifeGamemode.Server.Events
bool factionInvite = player.HasData("accept_faction_invite"); bool factionInvite = player.HasData("accept_faction_invite");
bool groupInvite = player.HasData("accept_group_invite"); bool groupInvite = player.HasData("accept_group_invite");
bool ticket_boolean = player.HasData("ticket_boolean"); bool ticket_boolean = player.HasData("ticket_boolean");
int ticket_amount = NAPI.Data.GetEntityData(player, "ticket_amount"); int ticket_amount;
if (player.HasData("ticket_amount"))
{
ticket_amount = player.GetData<int>("ticket_amount");
}
else return;
player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount); player.TriggerEvent("SERVER:InteractionMenu_OpenMenu", JsonConvert.SerializeObject(accountData), faction, group, factionInvite, groupInvite, ticket_boolean, ticket_amount);
} }

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

@@ -372,10 +372,10 @@ namespace ReallifeGamemode.Server.Managers
} }
} }
[RemoteEvent("CLIENT:InteractionMenu_LSPD_Ticket3")] [RemoteEvent("CLIENT:InteractionMenu_LSPD_Ticket3")]
public void InteractionMenu_LSPD_Ticket3(Player player, string jsonNameOrId, string jsoAmount, string jsonReason) public void InteractionMenu_LSPD_Ticket3(Player player, string jsonNameOrId, string stringAmount, string jsonReason)
{ {
string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId); string nameOrId = (string)JsonConvert.DeserializeObject(jsonNameOrId);
int amount = Int32.Parse((string)JsonConvert.DeserializeObject(jsoAmount)); int amount = Int32.Parse(stringAmount);
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);
@@ -397,8 +397,8 @@ namespace ReallifeGamemode.Server.Managers
target.SendNotification($"~b~{player.GetUser().FactionRank.RankName} | {playername} ~w~hat dir ein Ticket in Höhe von ~y~{amount}$ ~w~gestellt.", true); 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.SendNotification($"~w~Grund: ~g~{reason}~w~. ~x~Strafticket im Interaktionsmenü annehmen.", true);
target.SetData("ticket_boolean", true); target.SetData("ticket_boolean", true);
NAPI.Data.SetEntityData(target, "ticket_amount", amount); target.SetData<int>("ticket_amount", amount);
NAPI.Data.SetEntityData(target, "ticket_player", player); target.SetData<Player>("ticket_player", player);
} }
else else
{ {