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

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

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-07 21:07:36 +02:00
parent 347f3823a7 19357a512b
commit 0566531268
4 changed files with 1220 additions and 1123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1182
ReallifeGamemode.Client/Gui/Inventory/inventory.ts
View File

File diff suppressed because it is too large Load Diff

1144
ReallifeGamemode.Client/Gui/Inventory/inventory_old.ts Normal file
View File

File diff suppressed because it is too large Load Diff

6
ReallifeGamemode.Client/Gui/infobox.ts
View File

@@ -202,7 +202,7 @@ export default function (globalData: IGlobalData): void {
centre: false centre: false
}) })
mp.game.graphics.drawText(dateString + "\n" + timeString, [0.938, 0.381], mp.game.graphics.drawText(timeString + "\n" + dateString, [0.938, 0.381],
{ {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],
@@ -219,7 +219,7 @@ export default function (globalData: IGlobalData): void {
outline: true, outline: true,
centre: false centre: false
}) })
mp.game.graphics.drawText("~r~Datum: ", [0.89, 0.381], mp.game.graphics.drawText("~r~Datum: ", [0.891, 0.411],
{ {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],
@@ -227,7 +227,7 @@ export default function (globalData: IGlobalData): void {
outline: true, outline: true,
centre: false centre: false
}) })
mp.game.graphics.drawText("~r~Uhrzeit: ", [0.891, 0.411], mp.game.graphics.drawText("~r~Uhrzeit: ", [0.89, 0.381],
{ {
font: 4, font: 4,
color: [255, 255, 255, 255], color: [255, 255, 255, 255],

11
ReallifeGamemode.Server/Gangwar/Turf.cs
View File

@@ -114,16 +114,13 @@ namespace ReallifeGamemode.Server.Gangwar
this.timerCount = 0; this.timerCount = 0;
} }
private void reloadGangTurfs() private void ReloadGangTurfs()
{ {
var t = Task.Factory.StartNew(() => NAPI.Task.Run(() =>
{ {
Task.Delay(10000).Wait();
Gangwar.loadTurfs(); Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers(); Gangwar.loadTurfs_ToAllPlayers();
}); }, delayTime: 2000);
t.Wait();
} }
private void Tick(object sender, System.Timers.ElapsedEventArgs e) private void Tick(object sender, System.Timers.ElapsedEventArgs e)
@@ -303,7 +300,7 @@ namespace ReallifeGamemode.Server.Gangwar
NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:Turf_Conquered", JsonConvert.SerializeObject(this.TurfID), JsonConvert.SerializeObject(this.status), JsonConvert.SerializeObject(this.Owner)); NAPI.ClientEvent.TriggerClientEventForAll("CLIENT:Turf_Conquered", JsonConvert.SerializeObject(this.TurfID), JsonConvert.SerializeObject(this.status), JsonConvert.SerializeObject(this.Owner));
Gangwar.loadTurfs(); Gangwar.loadTurfs();
Gangwar.loadTurfs_ToAllPlayers(); Gangwar.loadTurfs_ToAllPlayers();
reloadGangTurfs(); ReloadGangTurfs();
} }
public void attack(string attacker) public void attack(string attacker)