Re-add staticScore
This commit is contained in:
Flamefire committed
1 parent
63fc406735
commit
9479f3b3ff
2 files changed
+259
-10
No files matched your search
@@ -180,6 +180,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N1">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>350</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N1">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -197,6 +209,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N2">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>150</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N2">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -214,6 +238,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP2N2">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>350</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP2N2">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -231,6 +267,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N3">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>10</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N3">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -248,6 +296,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP2N3">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>210</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP2N3">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -265,6 +325,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP3N3">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>410</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP3N3">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -282,6 +354,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N4">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>150</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N4">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -299,6 +383,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP2N4">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>350</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP2N4">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -316,6 +412,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP3N4">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>150</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP3N4">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -333,6 +441,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP4N4">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>350</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP4N4">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -350,6 +470,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N5">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>10</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N5">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -367,6 +499,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP2N5">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>210</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP2N5">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -384,6 +528,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP3N5">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>410</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP3N5">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -401,6 +557,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP4N5">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>150</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP4N5">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -418,6 +586,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP5N5">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>350</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP5N5">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -435,6 +615,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP1N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>10</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP1N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -452,6 +644,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP2N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>210</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP2N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -469,6 +673,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP3N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>528</X>
|
||||
<Y>410</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP3N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -486,6 +702,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP4N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>10</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP4N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -503,6 +731,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP5N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>210</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP5N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -520,6 +760,18 @@
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticScoreP6N6">
|
||||
<Skin/>
|
||||
<Color Name="Invisible" />
|
||||
<Rect>
|
||||
<X>1150</X>
|
||||
<Y>410</Y>
|
||||
<W>100</W>
|
||||
<H>50</H>
|
||||
<Z>-0.75</Z>
|
||||
</Rect>
|
||||
<Reflection Enabled="false" />
|
||||
</Static>
|
||||
<Static Name="StaticAvatarP6N6">
|
||||
<Skin/>
|
||||
<Color>
|
||||
@@ -542,7 +794,7 @@
|
||||
<Text Name="TextSongName">
|
||||
<X>640</X>
|
||||
<Y>20</Y>
|
||||
<Z>-1</Z>
|
||||
<Z>-2</Z>
|
||||
<H>27</H>
|
||||
<MaxW>880</MaxW>
|
||||
<Color Name="Black" />
|
||||
|
||||
@@ -70,6 +70,7 @@ namespace Vocaluxe.Screens
|
||||
private const string _StaticLyricHelperTop = "StaticLyricHelperTop";
|
||||
private const string _StaticPauseBG = "StaticPauseBG";
|
||||
|
||||
private string[,] _StaticScores;
|
||||
private string[,] _StaticAvatars;
|
||||
|
||||
private const string _ButtonCancel = "ButtonCancel";
|
||||
@@ -371,6 +372,7 @@ namespace Vocaluxe.Screens
|
||||
}
|
||||
if (CConfig.FadePlayerInfo == EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_ALL)
|
||||
{
|
||||
_Statics[_StaticScores[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
|
||||
_Statics[_StaticAvatars[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
|
||||
_Texts[_TextNames[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
|
||||
_Texts[_TextScores[p, CGame.NumPlayer - 1]].Alpha = alpha[CGame.Players[p].VoiceNr * 2];
|
||||
@@ -500,15 +502,6 @@ namespace Vocaluxe.Screens
|
||||
|
||||
_DrawLyricHelper();
|
||||
|
||||
if (_Pause)
|
||||
{
|
||||
foreach (CButton button in _Buttons)
|
||||
button.Draw();
|
||||
|
||||
foreach (CSelectSlide slide in _SelectSlides)
|
||||
slide.Draw();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -883,6 +876,7 @@ namespace Vocaluxe.Screens
|
||||
|
||||
private void _BuildStaticStrings(ref List<string> statics)
|
||||
{
|
||||
_StaticScores = new string[CSettings.MaxNumPlayer,CSettings.MaxNumPlayer];
|
||||
_StaticAvatars = new string[CSettings.MaxNumPlayer,CSettings.MaxNumPlayer];
|
||||
|
||||
for (int numplayer = 0; numplayer < CSettings.MaxNumPlayer; numplayer++)
|
||||
@@ -892,8 +886,10 @@ namespace Vocaluxe.Screens
|
||||
if (player <= numplayer)
|
||||
{
|
||||
string target = "P" + (player + 1) + "N" + (numplayer + 1);
|
||||
_StaticScores[player, numplayer] = "StaticScore" + target;
|
||||
_StaticAvatars[player, numplayer] = "StaticAvatar" + target;
|
||||
|
||||
statics.Add(_StaticScores[player, numplayer]);
|
||||
statics.Add(_StaticAvatars[player, numplayer]);
|
||||
}
|
||||
}
|
||||
@@ -923,6 +919,7 @@ namespace Vocaluxe.Screens
|
||||
_Texts[_TextNames[player, numplayer]].Visible = isIvisible &&
|
||||
(CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
|
||||
CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_NAME);
|
||||
_Statics[_StaticScores[player, numplayer]].Visible = isIvisible;
|
||||
_Statics[_StaticAvatars[player, numplayer]].Visible = isIvisible &&
|
||||
(CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH ||
|
||||
CConfig.PlayerInfo == EPlayerInfo.TR_CONFIG_PLAYERINFO_AVATAR);
|
||||
|
||||
Reference in new issue
Block a user