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

Merge develop into ammunation

Browse Source
This commit is contained in:
VegaZ
2021-04-16 19:18:01 +02:00
parent a95ec44baa 95ae4cd227
commit 8799bfe81b
97 changed files with 7784 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/Interaction/ItemShop.ts
View File

@@ -26,10 +26,9 @@ export default function itemShopList(globalData: IGlobalData) {
function addItems(data) {
// Fill it
for (const item of data) {
const tempItem = new UIMenuItem(item.Name, "");
const tempItem = new UIMenuItem(item.Name, item.Description);
tempItem.SetRightLabel(`${item.Price > 0 ? `$${item.Price}` : "FREE"}`);
@@ -70,6 +69,8 @@ export default function itemShopList(globalData: IGlobalData) {
// Reset some variables
currentMenuIdx = -1;
menuTransition = false;
items = [];
// Create a new main menu
@@ -84,6 +85,7 @@ export default function itemShopList(globalData: IGlobalData) {
// Main menu events
mainMenu.ItemSelect.on((selectedItem, itemIndex) => {
const nextItem = items[itemIndex];
mp.console.logInfo(JSON.stringify(items));
mp.events.callRemote("SERVER:BuyItems", nextItem.Name);
});

8
ReallifeGamemode.Client/Interaction/bankmenu.ts
View File

@@ -137,9 +137,11 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add('removeFactionBankmenu', () => {
mp.gui.cursor.show(false, false);
factionBankmenu.Close(true);
globalData.InMenu = false;
if (globalData.InMenu && factionBankmenu) {
mp.gui.cursor.show(false, false);
factionBankmenu.Close(true);
globalData.InMenu = false;
}
});