Auto-focus to NextRound-Button in challenge-main & fix to avoid crash.
This commit is contained in:
1 parent
c5e15aa699
commit
3992f19118
1 file changed
+21
-7
@@ -205,6 +205,8 @@ namespace Vocaluxe.PartyModes
|
|||||||
Buttons[htButtons(ButtonExit)].Visible = true;
|
Buttons[htButtons(ButtonExit)].Visible = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]);
|
||||||
|
|
||||||
ShowPopup(false);
|
ShowPopup(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -245,7 +247,8 @@ namespace Vocaluxe.PartyModes
|
|||||||
Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible;
|
Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible;
|
||||||
Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible;
|
Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible;
|
||||||
|
|
||||||
SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]);
|
if (ExitPopupVisible)
|
||||||
|
SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Back()
|
private void Back()
|
||||||
@@ -282,13 +285,24 @@ namespace Vocaluxe.PartyModes
|
|||||||
|
|
||||||
private void UpdateNextPlayerContents()
|
private void UpdateNextPlayerContents()
|
||||||
{
|
{
|
||||||
SProfile[] profiles = _Base.Profiles.GetProfiles();
|
if (GameState.CurrentRoundNr <= GameState.Combs.Count)
|
||||||
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
|
|
||||||
{
|
{
|
||||||
int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i];
|
SProfile[] profiles = _Base.Profiles.GetProfiles();
|
||||||
NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture;
|
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
|
||||||
NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName;
|
{
|
||||||
NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i+1));
|
int pid = GameState.Combs[GameState.CurrentRoundNr - 1].Player[i];
|
||||||
|
NextPlayerStatics[i].Texture = profiles[GameState.ProfileIDs[pid]].Avatar.Texture;
|
||||||
|
NextPlayerTexts[i].Text = profiles[GameState.ProfileIDs[pid]].PlayerName;
|
||||||
|
NextPlayerTexts[i].Color = _Base.Theme.GetPlayerColor((i + 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
|
||||||
|
{
|
||||||
|
NextPlayerStatics[i].Visible = false;
|
||||||
|
NextPlayerTexts[i].Visible = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user