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

Merge branch 'develop' into 'master'

Browse Source 
[HOTFIX] GlobalData Menu Bug

See merge request log-gtav/reallife-gamemode!26
This commit is contained in:
MichaPlays
2021-04-03 17:26:50 +00:00
parent 4cbe31cddb eb03e2a60a
commit 7d96cc73c6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReallifeGamemode.Client/CharCreator/main.ts
View File

@@ -316,10 +316,14 @@ export default function charCreator(globalData: IGlobalData) {
localPlayer.setComponentVariation(2, Data.hairList[currentGender][hairItem.Index].ID, 0, 2);
mp.game.cam.renderScriptCams(false, false, 0, true, false);
mp.events.callRemote("creatorSave", currentGender, JSON.stringify(parentData), JSON.stringify(featureData), JSON.stringify(appearanceData), JSON.stringify(hairAndColors));
globalData.InMenu = false;
globalData.InInput = false;
break;
case 7:
mp.events.callRemote("creator_Leave");
globalData.InMenu = false;
globalData.InInput = false;
break;
}
});
@@ -327,6 +331,7 @@ export default function charCreator(globalData: IGlobalData) {
creatorMainMenu.MenuClose.on(() => {
mp.events.callRemote("creator_Leave");
globalData.InMenu = false;
globalData.InInput = false;
});
creatorMainMenu.Visible = false;
@@ -555,6 +560,7 @@ export default function charCreator(globalData: IGlobalData) {
creatorCamera.setActive(true);
globalData.InMenu = true;
globalData.InInput = true;
creatorMainMenu.Visible = true;
mp.gui.chat.show(false);

6
ReallifeGamemode.Client/Login/main.ts
View File

@@ -18,6 +18,9 @@ export default function (globalData: IGlobalData): void {
mp.game.ui.displayHud(false);
mp.game.ui.displayRadar(false);
globalData.InInput = true;
globalData.InMenu = true;
disableLightMode = disableLight;
var url = registered ? "package://assets/html/login/login.html" : "package://assets/html/login/register.html";
@@ -62,7 +65,8 @@ export default function (globalData: IGlobalData): void {
mp.game.ui.displayRadar(true);
globalData.LoggedIn = true;
globalData.InInput = false;
globalData.InMenu = false;
loginCam.setActive(false);
mp.game.cam.renderScriptCams(false, false, 0, true, false);
});