Added skip-function. Press CTRL + S or go to pause-menu.
This commit is contained in:
1 parent
435a205f57
commit
bc9d1882cf
6 files changed
+96
-7
No files matched your search
@@ -135,6 +135,7 @@
|
|||||||
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
|
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
|
||||||
<TR_SCREENSING_BUTTON_CANCEL>Lied beenden</TR_SCREENSING_BUTTON_CANCEL>
|
<TR_SCREENSING_BUTTON_CANCEL>Lied beenden</TR_SCREENSING_BUTTON_CANCEL>
|
||||||
<TR_SCREENSING_BUTTON_CONTINUE>Fortfahren</TR_SCREENSING_BUTTON_CONTINUE>
|
<TR_SCREENSING_BUTTON_CONTINUE>Fortfahren</TR_SCREENSING_BUTTON_CONTINUE>
|
||||||
|
<TR_SCREENSING_BUTTON_SKIP>Lied überspringen</TR_SCREENSING_BUTTON_SKIP>
|
||||||
<!--ScreenScore-->
|
<!--ScreenScore-->
|
||||||
<TR_SCREENSCORE_SCORES>Auswertung</TR_SCREENSCORE_SCORES>
|
<TR_SCREENSCORE_SCORES>Auswertung</TR_SCREENSCORE_SCORES>
|
||||||
<TR_SCREENSCORE_RATING>Bewertung</TR_SCREENSCORE_RATING>
|
<TR_SCREENSCORE_RATING>Bewertung</TR_SCREENSCORE_RATING>
|
||||||
|
|||||||
@@ -135,6 +135,7 @@
|
|||||||
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
|
<TR_SCREENSING_PAUSE>Pause</TR_SCREENSING_PAUSE>
|
||||||
<TR_SCREENSING_BUTTON_CANCEL>Stop singing</TR_SCREENSING_BUTTON_CANCEL>
|
<TR_SCREENSING_BUTTON_CANCEL>Stop singing</TR_SCREENSING_BUTTON_CANCEL>
|
||||||
<TR_SCREENSING_BUTTON_CONTINUE>Continue</TR_SCREENSING_BUTTON_CONTINUE>
|
<TR_SCREENSING_BUTTON_CONTINUE>Continue</TR_SCREENSING_BUTTON_CONTINUE>
|
||||||
|
<TR_SCREENSING_BUTTON_SKIP>Skip this song</TR_SCREENSING_BUTTON_SKIP>
|
||||||
<!--ScreenScore-->
|
<!--ScreenScore-->
|
||||||
<TR_SCREENSCORE_SCORES>Scores</TR_SCREENSCORE_SCORES>
|
<TR_SCREENSCORE_SCORES>Scores</TR_SCREENSCORE_SCORES>
|
||||||
<TR_SCREENSCORE_RATING>Rating</TR_SCREENSCORE_RATING>
|
<TR_SCREENSCORE_RATING>Rating</TR_SCREENSCORE_RATING>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<root>
|
<root>
|
||||||
<ScreenSing>
|
<ScreenSing>
|
||||||
<ScreenVersion>4</ScreenVersion>
|
<ScreenVersion>5</ScreenVersion>
|
||||||
<Background1>
|
<Background1>
|
||||||
<!--<Type>: Background type: None, Color, Texture, Video-->
|
<!--<Type>: Background type: None, Color, Texture, Video-->
|
||||||
<Type>None</Type>
|
<Type>None</Type>
|
||||||
@@ -2333,7 +2333,7 @@
|
|||||||
<!--<SkinSelected>: Texture name for selected button-->
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
<SkinSelected>Button</SkinSelected>
|
<SkinSelected>Button</SkinSelected>
|
||||||
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
<X>670</X>
|
<X>775</X>
|
||||||
<Y>300</Y>
|
<Y>300</Y>
|
||||||
<Z>-2,11</Z>
|
<Z>-2,11</Z>
|
||||||
<W>150</W>
|
<W>150</W>
|
||||||
@@ -2390,7 +2390,7 @@
|
|||||||
<!--<SkinSelected>: Texture name for selected button-->
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
<SkinSelected>Button</SkinSelected>
|
<SkinSelected>Button</SkinSelected>
|
||||||
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
<X>460</X>
|
<X>355</X>
|
||||||
<Y>300</Y>
|
<Y>300</Y>
|
||||||
<Z>-2,11</Z>
|
<Z>-2,11</Z>
|
||||||
<W>150</W>
|
<W>150</W>
|
||||||
@@ -2441,6 +2441,63 @@
|
|||||||
<Height>26</Height>
|
<Height>26</Height>
|
||||||
</SReflection>
|
</SReflection>
|
||||||
</ButtonContinue>
|
</ButtonContinue>
|
||||||
|
<ButtonSkip>
|
||||||
|
<!--<Skin>: Texture name-->
|
||||||
|
<Skin>Button</Skin>
|
||||||
|
<!--<SkinSelected>: Texture name for selected button-->
|
||||||
|
<SkinSelected>Button</SkinSelected>
|
||||||
|
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
|
||||||
|
<X>565</X>
|
||||||
|
<Y>300</Y>
|
||||||
|
<Z>-2,11</Z>
|
||||||
|
<W>150</W>
|
||||||
|
<H>50</H>
|
||||||
|
<!--<Color>: Button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonColor</Color>
|
||||||
|
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonSColor</SColor>
|
||||||
|
<Text>
|
||||||
|
<!--<X>, <Y>: Text position-->
|
||||||
|
<X>75</X>
|
||||||
|
<Y>10</Y>
|
||||||
|
<!--<H>: Text height-->
|
||||||
|
<H>32</H>
|
||||||
|
<!--<MaxW>: Maximum text width (if exists)-->
|
||||||
|
<MaxW>142</MaxW>
|
||||||
|
<!--<Color>: Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <R>, <G>, <B>, <A> (lower priority)-->
|
||||||
|
<Color>ButtonTextColor</Color>
|
||||||
|
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
|
||||||
|
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
|
||||||
|
<SColor>ButtonTextSColor</SColor>
|
||||||
|
<!--<Align>: Text align horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Text or translation tag-->
|
||||||
|
<Text>TR_SCREENSING_BUTTON_SKIP</Text>
|
||||||
|
</Text>
|
||||||
|
<!--<Reflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space-->
|
||||||
|
<!-- <Height>: Reflection Height-->
|
||||||
|
<Reflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</Reflection>
|
||||||
|
<!--<SReflection> If exists:-->
|
||||||
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
|
<SReflection>
|
||||||
|
<Space>10</Space>
|
||||||
|
<Height>26</Height>
|
||||||
|
</SReflection>
|
||||||
|
</ButtonSkip>
|
||||||
<LyricMain>
|
<LyricMain>
|
||||||
<!--<X>, <Y>, <Z>, <W>, <H>: Lyric position, width and height-->
|
<!--<X>, <Y>, <Z>, <W>, <H>: Lyric position, width and height-->
|
||||||
<X>637</X>
|
<X>637</X>
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
ScreenSing
|
ScreenSing
|
||||||
|
|
||||||
|
++++++++++
|
||||||
|
Version 5:
|
||||||
|
|
||||||
|
Add:
|
||||||
|
<ButtonSkip>
|
||||||
|
|
||||||
++++++++++
|
++++++++++
|
||||||
Version 4:
|
Version 4:
|
||||||
Added Elements for 6-player-singing!
|
Added Elements for 6-player-singing!
|
||||||
|
|||||||
@@ -190,6 +190,11 @@ namespace Vocaluxe.Base
|
|||||||
return _GameMode.GetPoints();
|
return _GameMode.GetPoints();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static int NumRounds
|
||||||
|
{
|
||||||
|
get { return _GameMode.GetNumSongs(); }
|
||||||
|
}
|
||||||
|
|
||||||
public static int NumPlayer
|
public static int NumPlayer
|
||||||
{
|
{
|
||||||
get { return _NumPlayer; }
|
get { return _NumPlayer; }
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
|
|||||||
class CScreenSing : CMenu
|
class CScreenSing : CMenu
|
||||||
{
|
{
|
||||||
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
const int ScreenVersion = 4;
|
const int ScreenVersion = 5;
|
||||||
|
|
||||||
struct TimeRect
|
struct TimeRect
|
||||||
{
|
{
|
||||||
@@ -51,6 +51,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
private const string ButtonCancel = "ButtonCancel";
|
private const string ButtonCancel = "ButtonCancel";
|
||||||
private const string ButtonContinue = "ButtonContinue";
|
private const string ButtonContinue = "ButtonContinue";
|
||||||
|
private const string ButtonSkip = "ButtonSkip";
|
||||||
|
|
||||||
private const string LyricMain = "LyricMain";
|
private const string LyricMain = "LyricMain";
|
||||||
private const string LyricSub = "LyricSub";
|
private const string LyricSub = "LyricSub";
|
||||||
@@ -127,6 +128,7 @@ namespace Vocaluxe.Screens
|
|||||||
List<string> buttons = new List<string>();
|
List<string> buttons = new List<string>();
|
||||||
buttons.Add(ButtonCancel);
|
buttons.Add(ButtonCancel);
|
||||||
buttons.Add(ButtonContinue);
|
buttons.Add(ButtonContinue);
|
||||||
|
buttons.Add(ButtonSkip);
|
||||||
_ThemeButtons = buttons.ToArray();
|
_ThemeButtons = buttons.ToArray();
|
||||||
|
|
||||||
_ThemeLyrics = new string[] { LyricMain, LyricSub, LyricMainDuet, LyricSubDuet, LyricMainTop, LyricSubTop };
|
_ThemeLyrics = new string[] { LyricMain, LyricSub, LyricMainDuet, LyricSubDuet, LyricMainTop, LyricSubTop };
|
||||||
@@ -200,12 +202,21 @@ namespace Vocaluxe.Screens
|
|||||||
SetVisuability();
|
SetVisuability();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case Keys.S:
|
||||||
|
if(CGame.NumRounds > CGame.RoundNr)
|
||||||
|
if(KeyEvent.ModCTRL)
|
||||||
|
LoadNextSong();
|
||||||
|
break;
|
||||||
|
|
||||||
case Keys.Enter:
|
case Keys.Enter:
|
||||||
if (Buttons[htButtons(ButtonContinue)].Selected && _Pause)
|
if (Buttons[htButtons(ButtonContinue)].Selected && _Pause)
|
||||||
TogglePause();
|
TogglePause();
|
||||||
|
|
||||||
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
|
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
|
||||||
Stop();
|
Stop();
|
||||||
|
if (Buttons[htButtons(ButtonSkip)].Selected && _Pause)
|
||||||
|
{
|
||||||
|
LoadNextSong();
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,6 +243,11 @@ namespace Vocaluxe.Screens
|
|||||||
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
|
if (Buttons[htButtons(ButtonCancel)].Selected && _Pause)
|
||||||
Stop();
|
Stop();
|
||||||
|
|
||||||
|
if (Buttons[htButtons(ButtonSkip)].Selected && _Pause)
|
||||||
|
{
|
||||||
|
LoadNextSong();
|
||||||
|
TogglePause();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -708,11 +724,14 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
Buttons[htButtons(ButtonCancel)].Visible = true;
|
Buttons[htButtons(ButtonCancel)].Visible = true;
|
||||||
Buttons[htButtons(ButtonContinue)].Visible = true;
|
Buttons[htButtons(ButtonContinue)].Visible = true;
|
||||||
|
if (CGame.NumRounds > CGame.RoundNr)
|
||||||
|
Buttons[htButtons(ButtonSkip)].Visible = true;
|
||||||
CSound.Pause(_CurrentStream);
|
CSound.Pause(_CurrentStream);
|
||||||
}else
|
}else
|
||||||
{
|
{
|
||||||
Buttons[htButtons(ButtonCancel)].Visible = false;
|
Buttons[htButtons(ButtonCancel)].Visible = false;
|
||||||
Buttons[htButtons(ButtonContinue)].Visible = false;
|
Buttons[htButtons(ButtonContinue)].Visible = false;
|
||||||
|
Buttons[htButtons(ButtonSkip)].Visible = false;
|
||||||
CSound.Play(_CurrentStream);
|
CSound.Play(_CurrentStream);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user