Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/flokuep/develop' into develop

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-23 16:23:23 +01:00
2 parents 561185167f 3992f19118
commit ffd413165d
3 files changed
+37 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
+15 -14
View File
@@ -33,11 +33,11 @@
<!--<Skin>: Texture name-->
<Skin>PopupBG</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
<X>449</X>
<Y>261</Y>
<X>0</X>
<Y>0</Y>
<Z>-1,00</Z>
<W>382</W>
<H>198</H>
<W>1280</W>
<H>720</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -126,7 +126,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,8 +155,9 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
@@ -179,12 +180,12 @@
</TextPlayerName>
<TextNumPlayed>
<!--<X>, <Y>: Text position-->
<X>400</X>
<X>320</X>
<Y>100</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -208,12 +209,12 @@
</TextNumPlayed>
<TextWon>
<!--<X>, <Y>: Text position-->
<X>500</X>
<X>400</X>
<Y>100</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -237,12 +238,12 @@
</TextWon>
<TextSingPoints>
<!--<X>, <Y>: Text position-->
<X>750</X>
<X>550</X>
<Y>100</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -266,12 +267,12 @@
</TextSingPoints>
<TextGamePoints>
<!--<X>, <Y>: Text position-->
<X>850</X>
<X>650</X>
<Y>100</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>37</H>
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
Output/Themes/Ambient/Popup.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.5 KiB

PartyModeChallenge/PartyScreenChallengeMain.cs
+22 -8
View File
@@ -205,6 +205,8 @@ namespace Vocaluxe.PartyModes
Buttons[htButtons(ButtonExit)].Visible = true;
}
SetInteractionToButton(Buttons[htButtons(ButtonNextRound)]);
ShowPopup(false);
}
@@ -245,7 +247,8 @@ namespace Vocaluxe.PartyModes
Buttons[htButtons(ButtonPopupYes)].Visible = ExitPopupVisible;
Buttons[htButtons(ButtonPopupNo)].Visible = ExitPopupVisible;
SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]);
if (ExitPopupVisible)
SetInteractionToButton(Buttons[htButtons(ButtonPopupNo)]);
}
private void Back()
@@ -282,13 +285,24 @@ namespace Vocaluxe.PartyModes
private void UpdateNextPlayerContents()
{
SProfile[] profiles = _Base.Profiles.GetProfiles();
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
if (GameState.CurrentRoundNr <= GameState.Combs.Count)
{
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));
SProfile[] profiles = _Base.Profiles.GetProfiles();
for (int i = 0; i < GameState.NumPlayerAtOnce; i++)
{
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;
}
}
}
@@ -315,7 +329,7 @@ namespace Vocaluxe.PartyModes
row.SingPoints.Y += delta * (i + 1);
row.GamePoints.Y += delta * (i + 1);
row.Pos.Text = (i + 1).ToString() + ")";
row.Pos.Text = (i + 1).ToString() + ".";
row.Pos.Visible = false;
row.Name.Visible = false;