Merge branch 'develop' into 'feature/atm-system'

# Conflicts:
#   ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
This commit is contained in:
VegaZ
2019-04-02 18:50:17 +02:00
parent bed35f8f08
commit 63838e133a
20 changed files with 1226 additions and 42 deletions

View File

@@ -1,7 +1,8 @@
export default function worldInteraction() {
var atmBrowser: BrowserMp;
mp.events.add("SERVER:ShowAtmUi", (atmId, atmBalance) => {
//INTERACT: ATM
mp.events.add("SERVER:ShowAtmUi", (atmId) => {
mp.gui.cursor.show(true, true);
mp.gui.chat.show(false);
mp.game.ui.displayHud(false);
@@ -9,4 +10,36 @@
atmBrowser = mp.browsers.new("package://assets/html/atm/index.html");
});
}
mp.events.add("CEF:closeATM", () => {
mp.gui.cursor.show(false, false);
mp.gui.chat.show(true);
mp.game.ui.displayHud(true);
mp.game.ui.displayRadar(true);
atmBrowser.destroy();
});
mp.events.add("CEF:atmAction", (site, inputField1, inputField2) => {
switch (site) {
//GELD EINZAHLEN in1
case 0:
mp.events.call("SERVER:SET_HANDMONEY", inputField1 * -1); //GEHT NACH HANDMONEY.TS
mp.events.callRemote("CLIENT:ATM_ACTION", site, inputField1, inputField2);
break;
//GELD AUSZAHLEN in1
case 1:
mp.events.call("SERVER:SET_HANDMONEY", inputField1); //GEHT NACH HANDMONEY.TS
mp.events.callRemote("CLIENT:ATM_ACTION", site, inputField1, inputField2)
break;
//GELD ÜBERWEISEN in1 = Kontonr // in2 = Betrag
case 2:
break;
}
});
}