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

Show particle-effect instead of italic-text on new entry. Fixed new entry for more than one player.

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-21 18:01:07 +01:00
1 parent ea5774eff3
commit f888c3ae53
5 files changed
+212 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenHighscore.xml
+191 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ScreenHighscore>
<ScreenVersion>1</ScreenVersion>
<ScreenVersion>2</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
<Type>Video</Type>
@@ -1292,5 +1292,195 @@
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextDate10>
<ParticleEffectNew1>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>100</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew1>
<ParticleEffectNew2>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>160</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew2>
<ParticleEffectNew3>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>220</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew3>
<ParticleEffectNew4>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>280</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew4>
<ParticleEffectNew5>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>340</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew5>
<ParticleEffectNew6>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>400</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew6>
<ParticleEffectNew7>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>460</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew7>
<ParticleEffectNew8>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>520</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew8>
<ParticleEffectNew9>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>580</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew9>
<ParticleEffectNew10>
<!--<Skin>: Texture name-->
<Skin>Star</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: ParticleEffect position, width and height-->
<X>80</X>
<Y>640</Y>
<Z>1,00</Z>
<W>1080</W>
<H>42</H>
<!--<Color>: ParticleEffect color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Type>: Type of ParticleEffect: TBackground, TButton, TSelectSlide, TText, TStatic, TSongMenu, TLyric, TSingNote, TNameSelection, TEqualizer, TPlaylist, TParticleEffect-->
<Type>TButton</Type>
<!--<Size>: Size of particle-->
<Size>25,00</Size>
<!--<MaxNumber>: Max number of drawn particles-->
<MaxNumber>250</MaxNumber>
</ParticleEffectNew10>
</ScreenHighscore>
</root>
Output/Themes/Changelog/Changelog_ScreenHighscore.txt
+7
View File
@@ -0,0 +1,7 @@
ScreenHighscore
++++++++++
Version 2:
Add: ParticleEffectsNew[1..6] (one for each player!)
++++++++++
Vocaluxe/Base/CDataBase.cs
+1 -1
View File
@@ -185,7 +185,7 @@ namespace Vocaluxe.Base
command.ExecuteNonQuery();
//Read last insert line
command.CommandText = "SELECT id FROM Scores ORDER BY Date DESC LIMIT 0, 1";
command.CommandText = "SELECT id FROM Scores ORDER BY id DESC LIMIT 0, 1";
reader = null;
try
Vocaluxe/Screens/CScreenHighscore.cs
+12 -9
View File
@@ -13,7 +13,7 @@ namespace Vocaluxe.Screens
class CScreenHighscore : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 1;
const int ScreenVersion = 2;
private const int NumEntrys = 10;
private const string TextSongName = "TextSongName";
@@ -22,6 +22,7 @@ namespace Vocaluxe.Screens
private string[] TextName;
private string[] TextScore;
private string[] TextDate;
private string[] ParticleEffectNew;
private List<SScores>[] _Scores;
private List<int> _NewEntryIDs;
@@ -72,7 +73,14 @@ namespace Vocaluxe.Screens
texts.Add(TextDate[i]);
}
ParticleEffectNew = new string[NumEntrys];
for (int i = 0; i < NumEntrys; i++)
{
ParticleEffectNew[i] = "ParticleEffectNew" + (i + 1).ToString();
}
_ThemeTexts = texts.ToArray();
_ThemeParticleEffects = ParticleEffectNew;
_NewEntryIDs = new List<int>();
}
@@ -170,17 +178,11 @@ namespace Vocaluxe.Screens
if (isNewEntry(_Scores[_Round][_Pos + p].ID) == true)
{
Texts[htTexts(TextNumber[p])].Style = EStyle.BoldItalic;
Texts[htTexts(TextName[p])].Style = EStyle.BoldItalic;
Texts[htTexts(TextScore[p])].Style = EStyle.BoldItalic;
Texts[htTexts(TextDate[p])].Style = EStyle.BoldItalic;
ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = true;
}
else
{
Texts[htTexts(TextNumber[p])].Style = EStyle.Bold;
Texts[htTexts(TextName[p])].Style = EStyle.Bold;
Texts[htTexts(TextScore[p])].Style = EStyle.Bold;
Texts[htTexts(TextDate[p])].Style = EStyle.Bold;
ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = false;
}
}
else
@@ -189,6 +191,7 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextName[p])].Visible = false;
Texts[htTexts(TextScore[p])].Visible = false;
Texts[htTexts(TextDate[p])].Visible = false;
ParticleEffects[htParticleEffects(ParticleEffectNew[p])].Visible = false;
}
}
return true;
VocaluxeLib/Menu/CParticle.cs
+1 -1
View File
@@ -449,7 +449,7 @@ namespace Vocaluxe.Menu
}
writer.WriteComment("<Type>: Type of ParticleEffect: " + CHelper.ListStrings(Enum.GetNames(typeof(EType))));
writer.WriteElementString("Type", Enum.GetName(typeof(EType), _Type);
writer.WriteElementString("Type", Enum.GetName(typeof(EType), _Type));
writer.WriteComment("<Size>: Size of particle");
writer.WriteElementString("Size", _Size.ToString("#0.00"));
writer.WriteComment("<MaxNumber>: Max number of drawn particles");