Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

This commit is contained in:
Fabian Wessels
2020-08-02 17:21:56 +02:00
9 changed files with 141 additions and 91 deletions

View File

@@ -35,7 +35,7 @@ export default function (globalData: IGlobalData) {
taxiCallsMenu.ItemSelect.on((item: NativeUI.UIMenuItem, index: number) => {
mp.events.callRemote("CLIENT:JobManager_TaxiJob_AcceptCall", item.Text);
menu.Close();
menu.Close(true);
});
}
} else if (status === 1) { // Spieler hat aktiven Auftrag
@@ -55,7 +55,7 @@ export default function (globalData: IGlobalData) {
} else {
return;
}
menu.Close();
menu.Close(true);
});
menu.MenuClose.on(() => {

View File

@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="de" >
<!-- Header -->
<head>
@@ -39,7 +39,7 @@
<div class="bg-box4">Kontostand</div>
<div class="bg-box5">Informationen</div>
<div class="bg-box6">Verlauf</div>
<div class="bg-box7">Karte Auswerfen</div>
<div class="bg-box7">Karte auswerfen</div>
<div class="bg-box8"></div>
</div>
</div>

View File

@@ -16,6 +16,11 @@ export default function attachmentManager(game: IGame) {
attachments: {},
addFor: function (entityRage, id) {
if (!entityRage) {
return;
}
let entity;
if (entityRage.type === "player") {
entity = game.players.at(entityRage.remoteId);