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

try fix Trade html window

Browse Source
This commit is contained in:
Lukas Moungos
2019-07-28 23:07:07 +02:00
parent 32b1e3d9eb
commit 4a98213965
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ReallifeGamemode.Client/inventory/inventory.ts
View File

@@ -3,24 +3,24 @@
export default function inventory(globalData: GlobalData): void { export default function inventory(globalData: GlobalData): void {
var invBrowser: BrowserMp = null; var invBrowser: BrowserMp = null;
var handelBrowser: BrowserMp = null;
var itemIdArr; var itemIdArr;
var itemAmountArr; var itemAmountArr;
var money; var money;
mp.events.add("openTradeWindow", (money1, itemIdArr1, itemAmountArr1) => { mp.events.add("openTradeWindow", (money1, itemIdArr1, itemAmountArr1) => {
if (!globalData.InMenu) { if (!globalData.InMenu) {
if (invBrowser !== null) { if (handelBrowser !== null) {
try { try {
invBrowser.destroy() handelBrowser.destroy()
invBrowser = null; handelBrowser = null;
} finally { } finally {
mp.gui.cursor.show(false, false); mp.gui.cursor.show(false, false);
} }
return; return;
} }
mp.gui.cursor.show(true, true); mp.gui.cursor.show(true, true);
invBrowser = mp.browsers.new("package://assets/html/inventory/handel/handelakzeptieren.html"); handelBrowser = mp.browsers.new("package://assets/html/inventory/handel/handelakzeptieren.html");
itemIdArr = itemIdArr1; itemIdArr = itemIdArr1;
itemAmountArr = itemAmountArr1; itemAmountArr = itemAmountArr1;
@@ -54,21 +54,26 @@ export default function inventory(globalData: GlobalData): void {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}");`); invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}");`);
}); });
mp.events.add("CEF:BrowserLoadedTrade", () => { mp.events.add("CEF:BrowserLoadedTrade", () => {
invBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}","${JSON.stringify(money)}");`); handelBrowser.execute(`setItems("${JSON.stringify(itemIdArr)}","${JSON.stringify(itemAmountArr)}","${JSON.stringify(money)}");`);
}); });
mp.events.add("CEF:acceptTrade", () => { mp.events.add("CEF:acceptTrade", () => {
mp.events.callRemote('acceptTrade'); if (handelBrowser !== null) {
invBrowser.destroy() mp.events.callRemote('acceptTrade');
invBrowser = null; handelBrowser.destroy()
mp.gui.cursor.show(false, false); handelBrowser = null;
mp.gui.cursor.show(false, false);
}
}); });
mp.events.add("CEF:declineTrade", () => { mp.events.add("CEF:declineTrade", () => {
mp.events.callRemote('declineTrade'); if (handelBrowser !== null) {
invBrowser.destroy() mp.events.callRemote('declineTrade');
invBrowser = null; handelBrowser.destroy()
mp.gui.cursor.show(false, false); handelBrowser = null;
mp.gui.cursor.show(false, false);
}
}); });
mp.events.add("CEF:UseItemInv", (itemId) => { mp.events.add("CEF:UseItemInv", (itemId) => {

5
ReallifeGamemode.Server/Managers/ManagerOfInventory.cs
View File

@@ -97,6 +97,7 @@ namespace ReallifeGamemode.Server.Managers
TradeItems[user.Id] = (itemIdArr, itemAmountArr); TradeItems[user.Id] = (itemIdArr, itemAmountArr);
TradeValue[user.Id] = value; TradeValue[user.Id] = value;
target.SetData("tradePartner", user.Id); target.SetData("tradePartner", user.Id);
target.SetData("trade", user.LogUserId);
SendTradeOffer(target,client); SendTradeOffer(target,client);
} }
@@ -151,8 +152,8 @@ namespace ReallifeGamemode.Server.Managers
[RemoteEvent("declineTrade")] [RemoteEvent("declineTrade")]
public void ServerEvent_declineTrade(Client client) public void ServerEvent_declineTrade(Client client)
{ {
int id = client.GetData("tradePartner"); int id = client.GetData("trade");
Client target = ClientService.GetClientByNameOrId(id.ToString()); Client target = ClientService.GetClientByNameOrId(""+id);
if (target == null || !target.IsLoggedIn()) if (target == null || !target.IsLoggedIn())
{ {
ChatService.PlayerNotFound(client); ChatService.PlayerNotFound(client);