Fix JobMenu

This commit is contained in:
2021-04-11 04:03:54 +02:00
parent 6d08a65a74
commit a0bc6bbd90

View File

@@ -45,7 +45,7 @@ export default function (globalData: IGlobalData) {
mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, members: string, jobDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => { mp.events.add("SERVER:InteractionMenu_OpenMenu", (accountDataJson: string, factionleader: string, members: string, jobDataJson: string, faction: string, group: string, factionInvite: boolean, groupInvite: boolean, ticket_boolean: boolean, ticket_amount, house: boolean) => {
var accountData: AccountData = JSON.parse(accountDataJson); var accountData: AccountData = JSON.parse(accountDataJson);
var jobData: JobData = JSON.parse(jobDataJson); var jobData: JobData = JSON.parse(jobDataJson);
var memberList: FactionMember[] = JSON.parse(members) var memberList: FactionMember[] = JSON.parse(members)
//var ticket_amount = JSON.parse(ticket_amountJson); //var ticket_amount = JSON.parse(ticket_amountJson);
var menu = getInteractionMenu(); var menu = getInteractionMenu();
@@ -318,13 +318,12 @@ export default function (globalData: IGlobalData) {
var memberListItem = new UIMenuItem("Mitgliederliste", "Mitgliederliste"); var memberListItem = new UIMenuItem("Mitgliederliste", "Mitgliederliste");
factionMenu.AddItem(memberListItem); factionMenu.AddItem(memberListItem);
factionMenu.BindMenuToItem(getMembersMenuFaction(faction, memberList, false, parentMenu),memberListItem); factionMenu.BindMenuToItem(getMembersMenuFaction(faction, memberList, false, parentMenu), memberListItem);
return factionMenu; return factionMenu;
} }
function getMembersMenuFaction(faction: string, memberList: FactionMember[], leader: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu { function getMembersMenuFaction(faction: string, memberList: FactionMember[], leader: boolean, parentMenu: NativeUI.Menu): NativeUI.Menu {
var memberListMenu = new NativeUI.Menu(faction, "Mitglieder", new Point(0, screenRes.y / 3), null, null); var memberListMenu = new NativeUI.Menu(faction, "Mitglieder", new Point(0, screenRes.y / 3), null, null);
memberListMenu.Visible = false; memberListMenu.Visible = false;
memberList.forEach(member => { memberList.forEach(member => {
@@ -332,7 +331,7 @@ export default function (globalData: IGlobalData) {
if (member.isOnline) { if (member.isOnline) {
memberItem = new UIMenuItem("~g~ " + member.username, ""); memberItem = new UIMenuItem("~g~ " + member.username, "");
} else { } else {
if(leader) memberItem = new UIMenuItem("~r~ " + member.username, ""); if (leader) memberItem = new UIMenuItem("~r~ " + member.username, "");
} }
if (memberItem) { if (memberItem) {
if (member.isLeader) memberItem.SetLeftBadge(BadgeStyle.Star); if (member.isLeader) memberItem.SetLeftBadge(BadgeStyle.Star);
@@ -346,7 +345,6 @@ export default function (globalData: IGlobalData) {
} }
function manageFactionMember(username: string, factionrank: string, parentMenu: NativeUI.Menu): NativeUI.Menu { function manageFactionMember(username: string, factionrank: string, parentMenu: NativeUI.Menu): NativeUI.Menu {
var manageFactionMemberMenu = new NativeUI.Menu(username, factionrank + " " + username, new Point(0, screenRes.y / 3), null, null); var manageFactionMemberMenu = new NativeUI.Menu(username, factionrank + " " + username, new Point(0, screenRes.y / 3), null, null);
manageFactionMemberMenu.Visible = false; manageFactionMemberMenu.Visible = false;
@@ -436,10 +434,10 @@ export default function (globalData: IGlobalData) {
var pilotSkillItem = new UIMenuItem("Pilot Skill (" + pilotLevel + ")"); var pilotSkillItem = new UIMenuItem("Pilot Skill (" + pilotLevel + ")");
switch (pilotLevel) { switch (pilotLevel) {
case 1: case "Anfänger":
pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300") pilotSkillItem.SetRightLabel(jobdata.pilotskill + "/300")
break; break;
case 2: case "Fortgeschrittener":
pilotSkillItem.SetRightLabel("MAX") pilotSkillItem.SetRightLabel("MAX")
break; break;
} }
@@ -447,13 +445,13 @@ export default function (globalData: IGlobalData) {
var busSkillItem = new UIMenuItem("Bus Skill (" + busLevel + ")"); var busSkillItem = new UIMenuItem("Bus Skill (" + busLevel + ")");
switch (busLevel) { switch (busLevel) {
case 1: case "Anfänger":
busSkillItem.SetRightLabel(jobdata.busskill + "/300") busSkillItem.SetRightLabel(jobdata.busskill + "/300")
break; break;
case 2: case "Fortgeschrittener":
busSkillItem.SetRightLabel(jobdata.busskill + "/800") busSkillItem.SetRightLabel(jobdata.busskill + "/800")
break; break;
case 3: case "Profi":
busSkillItem.SetRightLabel("MAX") busSkillItem.SetRightLabel("MAX")
break; break;
} }