From fbe877960ab6d4a9a53c737e100c651960ff6cfc Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 16 Mar 2025 20:49:18 +0100 Subject: [PATCH] afegit intro04.png retocat el timing en la intro --- data/gfx/intro/intro4.png | Bin 1792 -> 7025 bytes source/director.cpp | 2 +- source/intro.cpp | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/gfx/intro/intro4.png b/data/gfx/intro/intro4.png index 4f8bd03835087953d709b98da1aaa63edda454e7..618788242597796260c06de7bbc68d454cf41d07 100644 GIT binary patch literal 7025 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 - 10, X_DEST, PathType::HORIZONTAL, Y_DEST, 100, easeInOutExpo, 0); sprites_.at(1)->addPath(param.game.width, X_DEST, PathType::HORIZONTAL, Y_DEST, 100, easeOutBounce, 0); sprites_.at(2)->addPath(-SPRITE_HEIGHT, Y_DEST, PathType::VERTICAL, X_DEST, 40, easeOutQuint, 0); - sprites_.at(3)->addPath(param.game.height, Y_DEST, PathType::VERTICAL, X_DEST, 600, easeOutQuint, 0); + sprites_.at(3)->addPath(param.game.height, Y_DEST, PathType::VERTICAL, X_DEST, 300, easeInOutExpo, 0); sprites_.at(4)->addPath(-SPRITE_HEIGHT, Y_DEST, PathType::VERTICAL, X_DEST, 70, easeOutElastic, 0); - sprites_.at(5)->addPath(param.game.width, X_DEST, PathType::HORIZONTAL, Y_DEST, 400, easeOutQuad, 300); + sprites_.at(5)->addPath(param.game.width, X_DEST, PathType::HORIZONTAL, Y_DEST, 250, easeOutQuad, 450); sprites_.at(5)->addPath(X_DEST, -SPRITE_WIDTH, PathType::HORIZONTAL, Y_DEST, 80, easeInElastic, 0); // Constantes @@ -377,9 +377,9 @@ void Intro::initSprites() shadow_sprites_.at(0)->addPath(param.game.height + 10, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 100, easeInOutExpo, 0); shadow_sprites_.at(1)->addPath(-SHADOW_SPRITE_HEIGHT, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 100, easeOutBounce, 0); shadow_sprites_.at(2)->addPath(-SHADOW_SPRITE_WIDTH, S_X_DEST, PathType::HORIZONTAL, S_Y_DEST, 40, easeOutQuint, 0); - shadow_sprites_.at(3)->addPath(param.game.width, S_X_DEST, PathType::HORIZONTAL, S_Y_DEST, 600, easeOutQuint, 0); + shadow_sprites_.at(3)->addPath(-SHADOW_SPRITE_HEIGHT, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 400, easeInOutExpo, 0); shadow_sprites_.at(4)->addPath(param.game.height, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 70, easeOutElastic, 0); - shadow_sprites_.at(5)->addPath(-SHADOW_SPRITE_HEIGHT, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 400, easeOutQuad, 300); + shadow_sprites_.at(5)->addPath(-SHADOW_SPRITE_HEIGHT, S_Y_DEST, PathType::VERTICAL, S_X_DEST, 250, easeOutQuad, 450); shadow_sprites_.at(5)->addPath(S_X_DEST, param.game.width, PathType::HORIZONTAL, S_Y_DEST, 80, easeInElastic, 0); } @@ -432,7 +432,7 @@ void Intro::initTexts() // Blop... blop... blop... texts_.at(8)->setCaption(lang::getText(35)); - texts_.at(8)->setSpeed(16); + texts_.at(8)->setSpeed(20); for (auto &text : texts_) { @@ -513,8 +513,8 @@ void Intro::updatePostState() break; case IntroPostState::END: - // Finaliza la intro después de 2 segundos - if (ELAPSED_TIME >= 2000) + // Finaliza la intro después de 1 segundo + if (ELAPSED_TIME >= 1000) { JA_StopMusic(); section::name = section::Name::TITLE;