mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-10-19 15:51:48 +00:00
Fix skip button vote area order
This commit is contained in:
1 parent
6c7b362f95
commit
3e2c6df829
2 files changed
+8
-2
No files matched your search
@@ -102,8 +102,9 @@ public static class MeetingButtonManager
|
|||||||
{
|
{
|
||||||
var btn = ability.CreateButton(playerVoteArea);
|
var btn = ability.CreateButton(playerVoteArea);
|
||||||
btn.transform.SetParent(playerVoteArea.Buttons.transform);
|
btn.transform.SetParent(playerVoteArea.Buttons.transform);
|
||||||
playerVoteArea.CancelButton.transform.SetAsFirstSibling();
|
|
||||||
}
|
}
|
||||||
|
var btn2 = ability.CreateButton(meetingHud.SkipVoteButton);
|
||||||
|
btn2.transform.SetParent(meetingHud.SkipVoteButton.Buttons.transform);
|
||||||
|
|
||||||
if (ability.UsesMode == MeetingButtonUsesMode.PerMeeting) ability.UsesLeft = ability.MaxUses;
|
if (ability.UsesMode == MeetingButtonUsesMode.PerMeeting) ability.UsesLeft = ability.MaxUses;
|
||||||
if (ability is MultiTargetMeetingButton multiAbility) multiAbility.Targets = new();
|
if (ability is MultiTargetMeetingButton multiAbility) multiAbility.Targets = new();
|
||||||
@@ -113,5 +114,10 @@ public static class MeetingButtonManager
|
|||||||
Error($"Failed to create targeted meeting button {ability.Name}: {e.Message}");
|
Error($"Failed to create targeted meeting button {ability.Name}: {e.Message}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
foreach (var playerVoteArea in meetingHud.playerStates)
|
||||||
|
{
|
||||||
|
playerVoteArea.CancelButton.transform.SetAsFirstSibling();
|
||||||
|
}
|
||||||
|
meetingHud.SkipVoteButton.CancelButton.transform.SetAsFirstSibling();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -150,6 +150,6 @@ public abstract class TargetedMeetingButton
|
|||||||
/// <returns>Whether the target is valid or not.</returns>
|
/// <returns>Whether the target is valid or not.</returns>
|
||||||
public virtual bool IsTargetValid(PlayerVoteArea playerVoteArea)
|
public virtual bool IsTargetValid(PlayerVoteArea playerVoteArea)
|
||||||
{
|
{
|
||||||
return playerVoteArea != null && playerVoteArea.PlayerId.Value != PlayerControl.LocalPlayer.Data.PlayerId;
|
return playerVoteArea != null && playerVoteArea.PlayerId.Value != PlayerControl.LocalPlayer.Data.PlayerId && playerVoteArea.PlayerId.Value != PlayerVoteArea.SkippedVote;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user