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

fix handmoney (SET:HANDMONEY auskommentiert)

Browse Source
This commit is contained in:
Michael
2020-07-05 16:46:59 +02:00
parent cffcc5659a
commit dd5292e3db
8 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReallifeGamemode.Client/Gui/handmoney.ts
View File

@@ -39,7 +39,7 @@ export default function handMoney(globalData: IGlobalData) {
} }
if (showMoneyChange > 0) { if (showMoneyChange > 0) {
showMoneyChange--; showMoneyChange--;
if (difference < 0) { if (difference > 0) {
var alpha = 255; var alpha = 255;
if (showMoneyChange <= 70) { if (showMoneyChange <= 70) {

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

@@ -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'; import InputHelper from '../inputhelper';
const Menu = NativeUI.Menu; const Menu = NativeUI.Menu;
@@ -233,7 +239,7 @@ export default function bankMenuHandle(globalData: IGlobalData) {
mp.events.add("CLIENT:bank_factionname", (name) => { mp.events.add("CLIENT:bank_factionname", (name) => {
paymentname = name; paymentname = name;
globalData.InInput = true; 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); mp.gui.cursor.show(true, true);
input.show(); input.show();
input.getValue(amount => { input.getValue(amount => {

7
ReallifeGamemode.Server/Bank/bank.cs
View File

@@ -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 Newtonsoft.Json;
using ReallifeGamemode.Database.Models; using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Extensions; using ReallifeGamemode.Server.Extensions;

4
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1854,7 +1854,7 @@ namespace ReallifeGamemode.Server.Commands
var user = target.GetUser(context); var user = target.GetUser(context);
user.Handmoney = amount; user.Handmoney = amount;
context.SaveChanges(); 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(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."); 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); var user = target.GetUser(context);
user.Handmoney += amount; user.Handmoney += amount;
context.SaveChanges(); 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(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."); ChatService.SendMessage(target, "~b~[ADMIN]~s~ Admin " + admin.Name + " hat dir ~g~$" + amount + "~s~ auf die Hand gegeben.");

4
ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs
View File

@@ -125,7 +125,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User payer = client.GetUser(dbContext); User payer = client.GetUser(dbContext);
payer.Handmoney -= 2500; payer.Handmoney -= 2500;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }
@@ -221,7 +221,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User payer = client.GetUser(dbContext); User payer = client.GetUser(dbContext);
payer.Handmoney -= 3500; payer.Handmoney -= 3500;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); // client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }

2
ReallifeGamemode.Server/DrivingSchool/PlaneSchool.cs
View File

@@ -81,7 +81,7 @@ namespace ReallifeGamemode.Server.DrivingSchool
{ {
User payer = client.GetUser(dbContext); User payer = client.GetUser(dbContext);
payer.Handmoney -= 5000; payer.Handmoney -= 5000;
client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney); //client.TriggerEvent("SERVER:SET_HANDMONEY", payer.Handmoney);
dbContext.SaveChanges(); dbContext.SaveChanges();
} }

2
ReallifeGamemode.Server/Events/UpdateCharacterCloth.cs
View File

@@ -280,7 +280,7 @@ namespace ReallifeGamemode.Server.Events
} }
client.GetUser(dbContext).Handmoney -= data[6]; client.GetUser(dbContext).Handmoney -= data[6];
dbContext.SaveChanges(); 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]); client.TriggerEvent("clothesMenu:updateLast", data[2], data[1], data[4], data[5], data[3]);
} }

2
ReallifeGamemode.Server/Managers/InventoryManager.cs
View File

@@ -609,7 +609,7 @@ namespace ReallifeGamemode.Server.Managers
} }
user.Handmoney -= shopItem.Price; user.Handmoney -= shopItem.Price;
dbContext.SaveChanges(); dbContext.SaveChanges();
client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); //client.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney);
} }
} }
} }