From dd5292e3db662a0530b63081565fefaeb461df6c Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 5 Jul 2020 16:46:59 +0200 Subject: [PATCH] fix handmoney (SET:HANDMONEY auskommentiert) --- ReallifeGamemode.Client/Gui/handmoney.ts | 2 +- ReallifeGamemode.Client/Interaction/bankmenu.ts | 10 ++++++++-- ReallifeGamemode.Server/Bank/bank.cs | 15 ++++++++++----- ReallifeGamemode.Server/Commands/AdminCommands.cs | 4 ++-- .../DrivingSchool/DrivingSchool.cs | 4 ++-- .../DrivingSchool/PlaneSchool.cs | 2 +- .../Events/UpdateCharacterCloth.cs | 2 +- .../Managers/InventoryManager.cs | 2 +- 8 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ReallifeGamemode.Client/Gui/handmoney.ts b/ReallifeGamemode.Client/Gui/handmoney.ts index 27cc1df5..e183bde8 100644 --- a/ReallifeGamemode.Client/Gui/handmoney.ts +++ b/ReallifeGamemode.Client/Gui/handmoney.ts @@ -39,7 +39,7 @@ export default function handMoney(globalData: IGlobalData) { } if (showMoneyChange > 0) { showMoneyChange--; - if (difference < 0) { + if (difference > 0) { var alpha = 255; if (showMoneyChange <= 70) { diff --git a/ReallifeGamemode.Client/Interaction/bankmenu.ts b/ReallifeGamemode.Client/Interaction/bankmenu.ts index 74ff7779..8c4a2379 100644 --- a/ReallifeGamemode.Client/Interaction/bankmenu.ts +++ b/ReallifeGamemode.Client/Interaction/bankmenu.ts @@ -1,4 +1,10 @@ -import * as NativeUI from '../libs/NativeUI'; +/** +* @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) +* @author MichaPlays +* @copyright (c) 2008 - 2018 Life of German +*/ + +import * as NativeUI from '../libs/NativeUI'; import InputHelper from '../inputhelper'; const Menu = NativeUI.Menu; @@ -233,7 +239,7 @@ export default function bankMenuHandle(globalData: IGlobalData) { mp.events.add("CLIENT:bank_factionname", (name) => { paymentname = name; globalData.InInput = true; - var input = new InputHelper("Wie viel möchtest du Überweisen??", globalData); + var input = new InputHelper("Wie viel möchtest du Überweisen?", globalData); mp.gui.cursor.show(true, true); input.show(); input.getValue(amount => { diff --git a/ReallifeGamemode.Server/Bank/bank.cs b/ReallifeGamemode.Server/Bank/bank.cs index 5cea6394..0033bf70 100644 --- a/ReallifeGamemode.Server/Bank/bank.cs +++ b/ReallifeGamemode.Server/Bank/bank.cs @@ -1,4 +1,9 @@ -using GTANetworkAPI; +/** +* @overview Life of German Reallife - Managers Interaction (InteractionManager.cs) +* @author MichaPlays +* @copyright (c) 2008 - 2018 Life of German +*/ +using GTANetworkAPI; using Newtonsoft.Json; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Extensions; @@ -83,7 +88,7 @@ namespace ReallifeGamemode.Server.Bank } else { - player.SendNotification($"~w~Du hast $~g~{amount} ~w~eingezahlt."); + player.SendNotification($"~w~Du hast $~g~{amount} ~w~eingezahlt."); player.GetUser(dbContext).Handmoney -= amount; player.GetUser(dbContext).BankAccount.Balance += amount; dbContext.SaveChanges(); @@ -139,7 +144,7 @@ namespace ReallifeGamemode.Server.Bank } else { - player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~ Überwiesen."); + player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); player.GetUser(dbContext).BankAccount.Balance -= (int)(amount*1.05); target.GetUser(dbContext).otheramount = amount; dbContext.SaveChanges(); @@ -162,7 +167,7 @@ namespace ReallifeGamemode.Server.Bank } else { - player.SendNotification($"~w~Du hast $~g~{amount} ~w~ in die Fraktionskasse eingezahlt."); + player.SendNotification($"~w~Du hast $~g~{amount}~w~ in die Fraktionskasse eingezahlt."); player.GetUser(dbContext).Handmoney -= amount; player.GetUser(dbContext).Faction.BankAccount.Balance += amount; dbContext.SaveChanges(); @@ -191,7 +196,7 @@ namespace ReallifeGamemode.Server.Bank } else { - player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~ Überwiesen."); + player.SendNotification($"~w~Du hast {target.Name} $~g~{amount} ~w~Überwiesen."); player.GetUser(dbContext).Faction.BankAccount.Balance -= (int)(amount * 1.05); target.GetUser(dbContext).otheramount = amount; dbContext.SaveChanges(); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index fe289ffd..b943bff7 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -1854,7 +1854,7 @@ namespace ReallifeGamemode.Server.Commands var user = target.GetUser(context); user.Handmoney = amount; context.SaveChanges(); - target.TriggerEvent("SERVER:SET_HANDMONEY", amount); + //target.TriggerEvent("SERVER:SET_HANDMONEY", amount); } ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast das Handgeld von " + target.Name + " auf ~g~$" + amount + "~s~ gesetzt."); ChatService.SendMessage(target, "~b~[ADMIN]~s~ Dein Handgeld wurde von Admin " + admin.Name + " auf ~g~$" + amount + "~s~ gesetzt."); @@ -1880,7 +1880,7 @@ namespace ReallifeGamemode.Server.Commands var user = target.GetUser(context); user.Handmoney += amount; context.SaveChanges(); - target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + //target.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } ChatService.SendMessage(admin, "~b~[ADMIN]~s~ Du hast " + target.Name + " ~g~$" + amount + "~s~ auf die Hand gegeben."); ChatService.SendMessage(target, "~b~[ADMIN]~s~ Admin " + admin.Name + " hat dir ~g~$" + amount + "~s~ auf die Hand gegeben."); diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index c44e3aaf..6e33e78a 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User payer = client.GetUser(dbContext); payer.Handmoney -= 2500; - client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); + // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } @@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User payer = client.GetUser(dbContext); payer.Handmoney -= 3500; - client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); + // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs index 856107e3..dd6809ad 100644 --- a/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs @@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.DrivingSchool { User payer = client.GetUser(dbContext); payer.Handmoney -= 5000; - client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); + //client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); dbContext.SaveChanges(); } diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs index 431bf24b..6b089aa9 100644 --- a/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs +++ b/ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs @@ -280,7 +280,7 @@ namespace ReallifeGamemode.Server.Events } client.GetUser(dbContext).Handmoney -= data[6]; dbContext.SaveChanges(); - client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]); } diff --git a/ReallifeGamemode.Server/Managers/InventoryManager.cs b/ReallifeGamemode.Server/Managers/InventoryManager.cs index 42171966..fe88f4bb 100644 --- a/ReallifeGamemode.Server/Managers/InventoryManager.cs +++ b/ReallifeGamemode.Server/Managers/InventoryManager.cs @@ -609,7 +609,7 @@ namespace ReallifeGamemode.Server.Managers } user.Handmoney -= shopItem.Price; dbContext.SaveChanges(); - client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); + //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); } } }