push per a enviar a revisió per Doc
This commit is contained in:
BIN
data/sound - copia/balloon.wav
Normal file
BIN
data/sound - copia/balloon.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/bubble1.wav
Normal file
BIN
data/sound - copia/bubble1.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/bubble2.wav
Normal file
BIN
data/sound - copia/bubble2.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/bubble3.wav
Normal file
BIN
data/sound - copia/bubble3.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/bubble4.wav
Normal file
BIN
data/sound - copia/bubble4.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/bullet.wav
Normal file
BIN
data/sound - copia/bullet.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/clock.wav
Normal file
BIN
data/sound - copia/clock.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/coffee_out.wav
Normal file
BIN
data/sound - copia/coffee_out.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/continue_clock.wav
Normal file
BIN
data/sound - copia/continue_clock.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/debian_drop.wav
Normal file
BIN
data/sound - copia/debian_drop.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/debian_pickup.wav
Normal file
BIN
data/sound - copia/debian_pickup.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/game_start.wav
Normal file
BIN
data/sound - copia/game_start.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/hi_score_achieved.wav
Normal file
BIN
data/sound - copia/hi_score_achieved.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/item_drop.wav
Normal file
BIN
data/sound - copia/item_drop.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/item_pickup.wav
Normal file
BIN
data/sound - copia/item_pickup.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/jump.wav
Normal file
BIN
data/sound - copia/jump.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/logo.wav
Normal file
BIN
data/sound - copia/logo.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/notify.wav
Normal file
BIN
data/sound - copia/notify.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/player_collision.wav
Normal file
BIN
data/sound - copia/player_collision.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/power_ball_explosion.wav
Normal file
BIN
data/sound - copia/power_ball_explosion.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/service_menu_adjust.wav
Normal file
BIN
data/sound - copia/service_menu_adjust.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/service_menu_move.wav
Normal file
BIN
data/sound - copia/service_menu_move.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/service_menu_select.wav
Normal file
BIN
data/sound - copia/service_menu_select.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/stage_change.wav
Normal file
BIN
data/sound - copia/stage_change.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/tabe.wav
Normal file
BIN
data/sound - copia/tabe.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/tabe_hit.wav
Normal file
BIN
data/sound - copia/tabe_hit.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/title.wav
Normal file
BIN
data/sound - copia/title.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_aw_aw_aw.wav
Normal file
BIN
data/sound - copia/voice_aw_aw_aw.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_coffee.wav
Normal file
BIN
data/sound - copia/voice_coffee.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_get_ready.wav
Normal file
BIN
data/sound - copia/voice_get_ready.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_no.wav
Normal file
BIN
data/sound - copia/voice_no.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_power_up.wav
Normal file
BIN
data/sound - copia/voice_power_up.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/voice_thankyou.wav
Normal file
BIN
data/sound - copia/voice_thankyou.wav
Normal file
Binary file not shown.
BIN
data/sound - copia/walk.wav
Normal file
BIN
data/sound - copia/walk.wav
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
data/sound/jump.wav
Normal file
BIN
data/sound/jump.wav
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
data/sound/service_menu_adjust.wav
Normal file
BIN
data/sound/service_menu_adjust.wav
Normal file
Binary file not shown.
BIN
data/sound/service_menu_move.wav
Normal file
BIN
data/sound/service_menu_move.wav
Normal file
Binary file not shown.
BIN
data/sound/service_menu_select.wav
Normal file
BIN
data/sound/service_menu_select.wav
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
data/sound/voice_thankyou.wav
Normal file
BIN
data/sound/voice_thankyou.wav
Normal file
Binary file not shown.
Binary file not shown.
@@ -312,10 +312,15 @@ void Director::setFileList()
|
|||||||
Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
|
||||||
|
Asset::get()->add(prefix + "/data/sound/voice_thankyou.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/walk.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/walk.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/debian_drop.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/debian_drop.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/debian_pickup.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/debian_pickup.wav", AssetType::SOUND);
|
||||||
Asset::get()->add(prefix + "/data/sound/tabe_hit.wav", AssetType::SOUND);
|
Asset::get()->add(prefix + "/data/sound/tabe_hit.wav", AssetType::SOUND);
|
||||||
|
Asset::get()->add(prefix + "/data/sound/jump.wav", AssetType::SOUND);
|
||||||
|
Asset::get()->add(prefix + "/data/sound/service_menu_move.wav", AssetType::SOUND);
|
||||||
|
Asset::get()->add(prefix + "/data/sound/service_menu_adjust.wav", AssetType::SOUND);
|
||||||
|
Asset::get()->add(prefix + "/data/sound/service_menu_select.wav", AssetType::SOUND);
|
||||||
|
|
||||||
// Shaders
|
// Shaders
|
||||||
Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA);
|
Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA);
|
||||||
|
|||||||
@@ -528,6 +528,7 @@ void Player::setPlayingState(PlayerState state)
|
|||||||
continue_ticks_ = SDL_GetTicks();
|
continue_ticks_ = SDL_GetTicks();
|
||||||
continue_counter_ = 9;
|
continue_counter_ = 9;
|
||||||
setScoreboardMode(ScoreboardMode::CONTINUE);
|
setScoreboardMode(ScoreboardMode::CONTINUE);
|
||||||
|
Audio::get()->playSound("continue_clock.wav");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PlayerState::WAITING:
|
case PlayerState::WAITING:
|
||||||
@@ -565,6 +566,7 @@ void Player::setPlayingState(PlayerState state)
|
|||||||
player_sprite_->setAnimationSpeed(5);
|
player_sprite_->setAnimationSpeed(5);
|
||||||
setScoreboardMode(ScoreboardMode::GAME_OVER);
|
setScoreboardMode(ScoreboardMode::GAME_OVER);
|
||||||
Audio::get()->playSound("voice_aw_aw_aw.wav");
|
Audio::get()->playSound("voice_aw_aw_aw.wav");
|
||||||
|
Audio::get()->playSound("jump.wav");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PlayerState::GAME_OVER:
|
case PlayerState::GAME_OVER:
|
||||||
@@ -809,6 +811,7 @@ void Player::shiftSprite()
|
|||||||
// Hace sonar un ruido al azar
|
// Hace sonar un ruido al azar
|
||||||
void Player::playRandomBubbleSound()
|
void Player::playRandomBubbleSound()
|
||||||
{
|
{
|
||||||
const std::vector<std::string> sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"};
|
// const std::vector<std::string> sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"};
|
||||||
Audio::get()->playSound(sounds.at(rand() % sounds.size()));
|
// Audio::get()->playSound(sounds.at(rand() % sounds.size()));
|
||||||
|
Audio::get()->playSound("jump.wav");
|
||||||
}
|
}
|
||||||
@@ -1533,6 +1533,7 @@ void Game::handlePlayerContinue(const std::shared_ptr<Player> &player)
|
|||||||
{
|
{
|
||||||
player->setPlayingState(PlayerState::PLAYING);
|
player->setPlayingState(PlayerState::PLAYING);
|
||||||
player->addCredit();
|
player->addCredit();
|
||||||
|
Audio::get()->playSound("voice_thankyou.wav");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disminuye el contador de continuación si se presiona cualquier botón de disparo.
|
// Disminuye el contador de continuación si se presiona cualquier botón de disparo.
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ void ServiceMenu::setSelectorUp()
|
|||||||
if (display_options_.empty())
|
if (display_options_.empty())
|
||||||
return;
|
return;
|
||||||
selected_ = (selected_ > 0) ? selected_ - 1 : display_options_.size() - 1;
|
selected_ = (selected_ > 0) ? selected_ - 1 : display_options_.size() - 1;
|
||||||
playMenuSound();
|
playMoveSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServiceMenu::setSelectorDown()
|
void ServiceMenu::setSelectorDown()
|
||||||
@@ -91,7 +91,7 @@ void ServiceMenu::setSelectorDown()
|
|||||||
if (display_options_.empty())
|
if (display_options_.empty())
|
||||||
return;
|
return;
|
||||||
selected_ = (selected_ + 1) % display_options_.size();
|
selected_ = (selected_ + 1) % display_options_.size();
|
||||||
playMenuSound();
|
playMoveSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServiceMenu::adjustOption(bool adjust_up)
|
void ServiceMenu::adjustOption(bool adjust_up)
|
||||||
@@ -103,7 +103,7 @@ void ServiceMenu::adjustOption(bool adjust_up)
|
|||||||
{
|
{
|
||||||
selected_option->adjustValue(adjust_up);
|
selected_option->adjustValue(adjust_up);
|
||||||
applySettings();
|
applySettings();
|
||||||
playMenuSound();
|
playAdjustSound();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ void ServiceMenu::selectOption()
|
|||||||
{
|
{
|
||||||
selected_option->executeAction();
|
selected_option->executeAction();
|
||||||
}
|
}
|
||||||
playMenuSound();
|
playSelectSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServiceMenu::moveBack()
|
void ServiceMenu::moveBack()
|
||||||
@@ -138,7 +138,7 @@ void ServiceMenu::moveBack()
|
|||||||
current_settings_group_ = previous_settings_group_;
|
current_settings_group_ = previous_settings_group_;
|
||||||
selected_ = (current_settings_group_ == SettingsGroup::MAIN) ? main_menu_selected_ : 0;
|
selected_ = (current_settings_group_ == SettingsGroup::MAIN) ? main_menu_selected_ : 0;
|
||||||
updateMenu();
|
updateMenu();
|
||||||
playMenuSound();
|
playBackSound();
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Lógica Interna ---
|
// --- Lógica Interna ---
|
||||||
@@ -304,7 +304,10 @@ void ServiceMenu::AdjustListValues()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reproduce el sonido de navegación del menú
|
// Reproduce el sonido de navegación del menú
|
||||||
void ServiceMenu::playMenuSound() { Audio::get()->playSound("clock.wav"); }
|
void ServiceMenu::playAdjustSound() { Audio::get()->playSound("service_menu_adjust.wav"); }
|
||||||
|
void ServiceMenu::playMoveSound() { Audio::get()->playSound("service_menu_move.wav"); }
|
||||||
|
void ServiceMenu::playSelectSound() { Audio::get()->playSound("service_menu_select.wav"); }
|
||||||
|
void ServiceMenu::playBackSound() { Audio::get()->playSound("service_menu_select.wav"); }
|
||||||
|
|
||||||
// Devuelve el nombre del grupo como string para el título
|
// Devuelve el nombre del grupo como string para el título
|
||||||
std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const
|
std::string ServiceMenu::settingsGroupToString(SettingsGroup group) const
|
||||||
|
|||||||
@@ -93,7 +93,10 @@ private:
|
|||||||
void applySettingsSettings();
|
void applySettingsSettings();
|
||||||
MenuOption *getOptionByCaption(const std::string &caption) const;
|
MenuOption *getOptionByCaption(const std::string &caption) const;
|
||||||
void AdjustListValues();
|
void AdjustListValues();
|
||||||
void playMenuSound();
|
void playMoveSound();
|
||||||
|
void playAdjustSound();
|
||||||
|
void playSelectSound();
|
||||||
|
void playBackSound();
|
||||||
std::string settingsGroupToString(SettingsGroup group) const;
|
std::string settingsGroupToString(SettingsGroup group) const;
|
||||||
void setHiddenOptions();
|
void setHiddenOptions();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user