[MusicWheel] add OverPart
This commit is contained in:
@@ -13,6 +13,10 @@ _____________________________________________________________________________
|
|||||||
sm-ssc v1.2 | 201012xx
|
sm-ssc v1.2 | 201012xx
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
20101218
|
||||||
|
--------
|
||||||
|
* [MusicWheelItem] Add OverPart. [freem]
|
||||||
|
|
||||||
20101217
|
20101217
|
||||||
--------
|
--------
|
||||||
* [Sprite] Added SetAllStateDelays(fDelay) Lua binding. [freem]
|
* [Sprite] Added SetAllStateDelays(fDelay) Lua binding. [freem]
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
MusicWheelItem Roulette NormalPart
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
MusicWheelItem Roulette NormalPart
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_blank
|
||||||
@@ -66,6 +66,14 @@ MusicWheelItem::MusicWheelItem( RString sType ):
|
|||||||
m_TextBanner.PlayCommand( "On" );
|
m_TextBanner.PlayCommand( "On" );
|
||||||
this->AddChild( &m_TextBanner );
|
this->AddChild( &m_TextBanner );
|
||||||
|
|
||||||
|
FOREACH_ENUM( MusicWheelItemType, i )
|
||||||
|
{
|
||||||
|
m_sprOverPart[i].Load( THEME->GetPathG(sType,MusicWheelItemTypeToString(i)+" OverPart") );
|
||||||
|
m_sprOverPart[i]->SetName( MusicWheelItemTypeToString(i)+"OverPart" );
|
||||||
|
ActorUtil::LoadAllCommands(m_sprOverPart[i],"MusicWheelItem");
|
||||||
|
this->AddChild( m_sprOverPart[i] );
|
||||||
|
}
|
||||||
|
|
||||||
FOREACH_ENUM( MusicWheelItemType, i )
|
FOREACH_ENUM( MusicWheelItemType, i )
|
||||||
{
|
{
|
||||||
m_pText[i] = NULL;
|
m_pText[i] = NULL;
|
||||||
@@ -130,6 +138,12 @@ MusicWheelItem::MusicWheelItem( const MusicWheelItem &cpy ):
|
|||||||
|
|
||||||
this->AddChild( &m_TextBanner );
|
this->AddChild( &m_TextBanner );
|
||||||
|
|
||||||
|
FOREACH_ENUM( MusicWheelItemType, i )
|
||||||
|
{
|
||||||
|
m_sprOverPart[i] = cpy.m_sprOverPart[i];
|
||||||
|
this->AddChild( m_sprOverPart[i] );
|
||||||
|
}
|
||||||
|
|
||||||
FOREACH_ENUM( MusicWheelItemType, i )
|
FOREACH_ENUM( MusicWheelItemType, i )
|
||||||
{
|
{
|
||||||
if( cpy.m_pText[i] == NULL )
|
if( cpy.m_pText[i] == NULL )
|
||||||
@@ -170,6 +184,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int
|
|||||||
{
|
{
|
||||||
m_sprColorPart[i]->SetVisible( false );
|
m_sprColorPart[i]->SetVisible( false );
|
||||||
m_sprNormalPart[i]->SetVisible( false );
|
m_sprNormalPart[i]->SetVisible( false );
|
||||||
|
m_sprOverPart[i]->SetVisible( false );
|
||||||
}
|
}
|
||||||
m_TextBanner.SetVisible( false );
|
m_TextBanner.SetVisible( false );
|
||||||
FOREACH_ENUM( MusicWheelItemType, i )
|
FOREACH_ENUM( MusicWheelItemType, i )
|
||||||
@@ -246,6 +261,7 @@ void MusicWheelItem::LoadFromWheelItemData( const WheelItemBaseData *pData, int
|
|||||||
m_sprColorPart[type]->SetVisible( true );
|
m_sprColorPart[type]->SetVisible( true );
|
||||||
m_sprColorPart[type]->SetDiffuse( pWID->m_color );
|
m_sprColorPart[type]->SetDiffuse( pWID->m_color );
|
||||||
m_sprNormalPart[type]->SetVisible( true );
|
m_sprNormalPart[type]->SetVisible( true );
|
||||||
|
m_sprOverPart[type]->SetVisible( true );
|
||||||
BitmapText *bt = m_pText[type];
|
BitmapText *bt = m_pText[type];
|
||||||
if( bt )
|
if( bt )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ private:
|
|||||||
|
|
||||||
AutoActor m_sprColorPart[NUM_MusicWheelItemType];
|
AutoActor m_sprColorPart[NUM_MusicWheelItemType];
|
||||||
AutoActor m_sprNormalPart[NUM_MusicWheelItemType];
|
AutoActor m_sprNormalPart[NUM_MusicWheelItemType];
|
||||||
|
AutoActor m_sprOverPart[NUM_MusicWheelItemType];
|
||||||
|
|
||||||
TextBanner m_TextBanner; // used by Type_Song instead of m_pText
|
TextBanner m_TextBanner; // used by Type_Song instead of m_pText
|
||||||
BitmapText *m_pText[NUM_MusicWheelItemType];
|
BitmapText *m_pText[NUM_MusicWheelItemType];
|
||||||
|
|||||||
Reference in New Issue
Block a user