diff --git a/projeto/dialogic/themes/theme-1723052560.cfg b/projeto/dialogic/themes/theme-1723052560.cfg index 45ebd55..bb83fc4 100644 --- a/projeto/dialogic/themes/theme-1723052560.cfg +++ b/projeto/dialogic/themes/theme-1723052560.cfg @@ -9,13 +9,14 @@ use_image=true full_width=true use_color=false color="#00000000" -image="res://elementos/imagem/enchente/cutscene/caixa_dialogo.png" +image="res://elementos/imagem/enchente/cutscene/no.png" [text] color="#ff000000" text_margin_left=20.0 text_margin_right=20.0 +text_margin_top=28.0 [name] @@ -23,9 +24,10 @@ is_hidden=true [next_indicator] -image="res://elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Normal.png" -scale=0.5 +image="res://elementos/imagem/enchente/cutscene/seta_def.png" +scale=1.0 offset=Vector2( 10, 10 ) +animation="Up and down" [offset] @@ -38,7 +40,7 @@ box_margin_left=40.0 box_margin_right=-40.0 box_margin_top=40.0 box_margin_bottom=-100.0 -size=Vector2( 600, 167 ) +size=Vector2( 600, 180 ) anchor=8 [animation] @@ -50,6 +52,8 @@ dim_time=0.0 [ninepatch] ninepatch_margin_bottom=0.0 +ninepatch_margin_left=0.0 +ninepatch_margin_top=0.0 [buttons] diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0000.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0000.png new file mode 100644 index 0000000..e7f3910 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0000.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0001.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0001.png new file mode 100644 index 0000000..5cdd3b0 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0001.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0002.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0002.png new file mode 100644 index 0000000..efc5bd2 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0002.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0003.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0003.png new file mode 100644 index 0000000..9643264 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0003.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0004.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0004.png new file mode 100644 index 0000000..d44f0a6 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0004.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0005.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0005.png new file mode 100644 index 0000000..feb8c35 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0005.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0006.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0006.png new file mode 100644 index 0000000..9c27f37 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0006.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0007.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0007.png new file mode 100644 index 0000000..0ee2dfa Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0007.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0008.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0008.png new file mode 100644 index 0000000..c22c1f1 Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0008.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0009.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0009.png new file mode 100644 index 0000000..b48abae Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0009.png differ diff --git a/projeto/elementos/UI/bandeirinha/Timeline 1_0010.png b/projeto/elementos/UI/bandeirinha/Timeline 1_0010.png new file mode 100644 index 0000000..f58bffd Binary files /dev/null and b/projeto/elementos/UI/bandeirinha/Timeline 1_0010.png differ diff --git a/projeto/elementos/UI/logo.png b/projeto/elementos/UI/logo.png new file mode 100644 index 0000000..9f4ba7c Binary files /dev/null and b/projeto/elementos/UI/logo.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Retratos/maria.png b/projeto/elementos/UI/minigame_senhorinha/Retratos/maria.png new file mode 100644 index 0000000..7c45b19 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Retratos/maria.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Retratos/nunes.png b/projeto/elementos/UI/minigame_senhorinha/Retratos/nunes.png new file mode 100644 index 0000000..55b1dad Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Retratos/nunes.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Retratos/rogerio.png b/projeto/elementos/UI/minigame_senhorinha/Retratos/rogerio.png new file mode 100644 index 0000000..194c0df Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Retratos/rogerio.png differ diff --git a/projeto/elementos/fontes/Courier_Prime/CourierPrime-Bold.ttf b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Bold.ttf new file mode 100644 index 0000000..7e6b222 Binary files /dev/null and b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Bold.ttf differ diff --git a/projeto/elementos/fontes/Courier_Prime/CourierPrime-BoldItalic.ttf b/projeto/elementos/fontes/Courier_Prime/CourierPrime-BoldItalic.ttf new file mode 100644 index 0000000..2e70ab7 Binary files /dev/null and b/projeto/elementos/fontes/Courier_Prime/CourierPrime-BoldItalic.ttf differ diff --git a/projeto/elementos/fontes/Courier_Prime/CourierPrime-Italic.ttf b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Italic.ttf new file mode 100644 index 0000000..15d9463 Binary files /dev/null and b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Italic.ttf differ diff --git a/projeto/elementos/fontes/Courier_Prime/CourierPrime-Regular.ttf b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Regular.ttf new file mode 100644 index 0000000..4af1ff5 Binary files /dev/null and b/projeto/elementos/fontes/Courier_Prime/CourierPrime-Regular.ttf differ diff --git a/projeto/elementos/fontes/Courier_Prime/OFL.txt b/projeto/elementos/fontes/Courier_Prime/OFL.txt new file mode 100644 index 0000000..28f87c1 --- /dev/null +++ b/projeto/elementos/fontes/Courier_Prime/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2015 The Courier Prime Project Authors (https://github.com/quoteunquoteapps/CourierPrime). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/projeto/elementos/fontes/LondrinaSolid-Black.ttf b/projeto/elementos/fontes/LondrinaSolid-Black.ttf new file mode 100644 index 0000000..3840ff3 Binary files /dev/null and b/projeto/elementos/fontes/LondrinaSolid-Black.ttf differ diff --git a/projeto/elementos/fontes/LondrinaSolid-Light.ttf b/projeto/elementos/fontes/LondrinaSolid-Light.ttf new file mode 100644 index 0000000..651cf53 Binary files /dev/null and b/projeto/elementos/fontes/LondrinaSolid-Light.ttf differ diff --git a/projeto/elementos/fontes/LondrinaSolid-Regular.ttf b/projeto/elementos/fontes/LondrinaSolid-Regular.ttf new file mode 100644 index 0000000..7bf4923 Binary files /dev/null and b/projeto/elementos/fontes/LondrinaSolid-Regular.ttf differ diff --git a/projeto/elementos/fontes/LondrinaSolid-Thin.ttf b/projeto/elementos/fontes/LondrinaSolid-Thin.ttf new file mode 100644 index 0000000..3b4f771 Binary files /dev/null and b/projeto/elementos/fontes/LondrinaSolid-Thin.ttf differ diff --git a/projeto/elementos/imagem/baloes/netinha.png b/projeto/elementos/imagem/baloes/netinha.png new file mode 100644 index 0000000..3aa72fa Binary files /dev/null and b/projeto/elementos/imagem/baloes/netinha.png differ diff --git a/projeto/elementos/imagem/baloes/ufa.png b/projeto/elementos/imagem/baloes/ufa.png new file mode 100644 index 0000000..8cdb4c8 Binary files /dev/null and b/projeto/elementos/imagem/baloes/ufa.png differ diff --git a/projeto/elementos/imagem/baloes/vuush.png b/projeto/elementos/imagem/baloes/vuush.png new file mode 100644 index 0000000..8e35465 Binary files /dev/null and b/projeto/elementos/imagem/baloes/vuush.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/balao_def.png b/projeto/elementos/imagem/enchente/cutscene/balao_def.png new file mode 100644 index 0000000..395eb01 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/balao_def.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/balao_fala_def.png b/projeto/elementos/imagem/enchente/cutscene/balao_fala_def.png new file mode 100644 index 0000000..2dfff7d Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/balao_fala_def.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/bg.png b/projeto/elementos/imagem/enchente/cutscene/bg.png new file mode 100644 index 0000000..26b6f0c Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/bg.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/cent.png b/projeto/elementos/imagem/enchente/cutscene/cent.png new file mode 100644 index 0000000..bbfb129 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/cent.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/dir.png b/projeto/elementos/imagem/enchente/cutscene/dir.png new file mode 100644 index 0000000..4a25e07 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/dir.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/enchente.png b/projeto/elementos/imagem/enchente/cutscene/enchente.png new file mode 100644 index 0000000..fa5dcd9 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/enchente.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/esq.png b/projeto/elementos/imagem/enchente/cutscene/esq.png new file mode 100644 index 0000000..550c927 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/esq.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/maria.png b/projeto/elementos/imagem/enchente/cutscene/maria.png new file mode 100644 index 0000000..595ac22 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/maria.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/no.png b/projeto/elementos/imagem/enchente/cutscene/no.png new file mode 100644 index 0000000..28f5092 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/no.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/nunezilla.png b/projeto/elementos/imagem/enchente/cutscene/nunezilla.png new file mode 100644 index 0000000..9ebeb61 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/nunezilla.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/pular.png b/projeto/elementos/imagem/enchente/cutscene/pular.png new file mode 100644 index 0000000..32033d3 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/pular.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/pular_pressed.png b/projeto/elementos/imagem/enchente/cutscene/pular_pressed.png new file mode 100644 index 0000000..98449cf Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/pular_pressed.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/rogerio.png b/projeto/elementos/imagem/enchente/cutscene/rogerio.png new file mode 100644 index 0000000..4028381 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/rogerio.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/saco.png b/projeto/elementos/imagem/enchente/cutscene/saco.png new file mode 100644 index 0000000..4a6c1f4 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/saco.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/saco_lixo.png b/projeto/elementos/imagem/enchente/cutscene/saco_lixo.png new file mode 100644 index 0000000..24eb040 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/saco_lixo.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/seta_def.png b/projeto/elementos/imagem/enchente/cutscene/seta_def.png new file mode 100644 index 0000000..4620898 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/seta_def.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/seta_pressed_def.png b/projeto/elementos/imagem/enchente/cutscene/seta_pressed_def.png new file mode 100644 index 0000000..32a65e8 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/seta_pressed_def.png differ diff --git a/projeto/elementos/imagem/enchente/cutscene/tela_saco_def.png b/projeto/elementos/imagem/enchente/cutscene/tela_saco_def.png new file mode 100644 index 0000000..4a6c1f4 Binary files /dev/null and b/projeto/elementos/imagem/enchente/cutscene/tela_saco_def.png differ diff --git "a/projeto/elementos/imagem/enchente/obstaculos/ sem\303\241foro.png" "b/projeto/elementos/imagem/enchente/obstaculos/ sem\303\241foro.png" new file mode 100644 index 0000000..c39bfe8 Binary files /dev/null and "b/projeto/elementos/imagem/enchente/obstaculos/ sem\303\241foro.png" differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/mina-mutant.png b/projeto/elementos/imagem/enchente/obstaculos/mina-mutant.png new file mode 100644 index 0000000..ae36f7d Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/mina-mutant.png differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/pombo1.png b/projeto/elementos/imagem/enchente/obstaculos/pombo1.png new file mode 100644 index 0000000..0fe54b7 Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/pombo1.png differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/pombo2.png b/projeto/elementos/imagem/enchente/obstaculos/pombo2.png new file mode 100644 index 0000000..ef7c7e9 Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/pombo2.png differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/poste- eletrico-2.png b/projeto/elementos/imagem/enchente/obstaculos/poste- eletrico-2.png new file mode 100644 index 0000000..29c5d5c Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/poste- eletrico-2.png differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/poste-eletrico.png b/projeto/elementos/imagem/enchente/obstaculos/poste-eletrico.png new file mode 100644 index 0000000..0dd6731 Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/poste-eletrico.png differ diff --git a/projeto/elementos/imagem/enchente/obstaculos/tronco.png b/projeto/elementos/imagem/enchente/obstaculos/tronco.png new file mode 100644 index 0000000..e47c0b8 Binary files /dev/null and b/projeto/elementos/imagem/enchente/obstaculos/tronco.png differ diff --git a/projeto/elementos/modelos/skybox/background_skybox_texture_v1.png b/projeto/elementos/modelos/skybox/background_skybox_texture_v1.png new file mode 100644 index 0000000..54e7c93 Binary files /dev/null and b/projeto/elementos/modelos/skybox/background_skybox_texture_v1.png differ diff --git a/projeto/elementos/modelos/skybox/background_skybox_texture_v2.png b/projeto/elementos/modelos/skybox/background_skybox_texture_v2.png new file mode 100644 index 0000000..653c2d1 Binary files /dev/null and b/projeto/elementos/modelos/skybox/background_skybox_texture_v2.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_1.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_1.png new file mode 100644 index 0000000..98945f4 Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_1.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_2.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_2.png new file mode 100644 index 0000000..14f4bce Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_2.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_3.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_3.png new file mode 100644 index 0000000..cf97598 Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_3.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_4.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_4.png new file mode 100644 index 0000000..83fdfba Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_4.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_5.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_5.png new file mode 100644 index 0000000..981e7e2 Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_5.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_6.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_6.png new file mode 100644 index 0000000..ba011e9 Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_6.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_7.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_7.png new file mode 100644 index 0000000..897ef54 Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_7.png differ diff --git a/projeto/elementos/modelos/skybox/nuvens/nuvem_8.png b/projeto/elementos/modelos/skybox/nuvens/nuvem_8.png new file mode 100644 index 0000000..fae9d5b Binary files /dev/null and b/projeto/elementos/modelos/skybox/nuvens/nuvem_8.png differ diff --git a/projeto/recursos/Menu_principal/Menu_Principal.tscn b/projeto/recursos/Menu_principal/Menu_Principal.tscn index 9904cf6..4e8fa34 100644 --- a/projeto/recursos/Menu_principal/Menu_Principal.tscn +++ b/projeto/recursos/Menu_principal/Menu_Principal.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=26 format=2] [ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/Clouds_BG.png" type="Texture" id=1] [ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/btn_jogar_normal.png" type="Texture" id=2] @@ -21,6 +21,7 @@ [ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0006.png" type="Texture" id=19] [ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0008.png" type="Texture" id=20] [ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/Sky_BG.png" type="Texture" id=21] +[ext_resource path="res://recursos/jogos/enchente/abertura/CutsceneBase.tscn" type="PackedScene" id=22] [sub_resource type="Shader" id=1] code = "shader_type canvas_item; @@ -58,7 +59,8 @@ rect_pivot_offset = Vector2( -1026, 372 ) size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource( 8 ) -proxima_cena = ExtResource( 9 ) +proxima_cena = ExtResource( 22 ) +cena_jogo = ExtResource( 9 ) [node name="AudioStreamBGM" type="AudioStreamPlayer" parent="."] stream = ExtResource( 5 ) diff --git a/projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd b/projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd index fcb05a2..c4cb4da 100644 --- a/projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd +++ b/projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd @@ -6,6 +6,8 @@ var ativarBotoes: bool #var ativarSpeedrun = false #var tempoRecord = [] var dificuldadeAtual = "facil" +var pularCutScene : bool = false +var pularTutorial : bool = false signal Atualizou @@ -18,6 +20,8 @@ func salvar_globais(): Salvamento.salvar("globais", "volumeSFX", volumeSFX) Salvamento.salvar("globais", "ativarBotoes", ativarBotoes) Salvamento.salvar("globais", "dificuldadeAtual", dificuldadeAtual) + Salvamento.salvar("globais", "pularCutScene", pularCutScene) + Salvamento.salvar("globais", "pularTutorial", pularTutorial) emit_signal("Atualizou") func carregar_globais(): @@ -26,5 +30,13 @@ func carregar_globais(): volumeSFX = int(Salvamento.carregar("globais", "volumeSFX")) ativarBotoes = bool(Salvamento.carregar("globais", "ativarBotoes")) dificuldadeAtual = str(Salvamento.carregar("globais", "dificuldadeAtual")) + if Salvamento.carregar("globais", "pularCutScene"): + pularCutScene = bool(Salvamento.carregar("globais", "pularCutScene")) + else: + pularCutScene = false + if Salvamento.carregar("globais", "pularTutorial"): + pularTutorial = bool(Salvamento.carregar("globais", "pularTutorial")) + else: + pularTutorial = false else: salvar_globais() diff --git a/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd b/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd index 312a2f9..e9f56c1 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd +++ b/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd @@ -6,6 +6,7 @@ onready var tween_jogar = $Buttons/Btn_Jogar/tween_jogar onready var tween_opcoes = $Buttons/Btn_Opcoes/tween_opcoes export(PackedScene) var proxima_cena: PackedScene +export(PackedScene) var cena_jogo: PackedScene var _volume_atual: float = 999 var opcoes_apertado: bool = false @@ -15,6 +16,9 @@ func _ready(): SingletonOpcoesGlobais.connect("Atualizou", self, "_atualizar_volume") _atualizar_volume() +func _process(delta: float) -> void: + $Background/Bandeira.position.x = get_global_rect().get_center().x + func _atualizar_volume(): if SingletonOpcoesGlobais.volumeSom != _volume_atual: _volume_atual = SingletonOpcoesGlobais.volumeSom @@ -45,6 +49,9 @@ func _on_Jogar_button_up(): $Buttons/Btn_Jogar.disabled = true yield(tween_jogar, "tween_completed") if jogar_apertado and opcoes_apertado == false: - TrocadorDeCenas.trocar_cena(proxima_cena.resource_path) + if not SingletonOpcoesGlobais.pularCutScene: + TrocadorDeCenas.trocar_cena(proxima_cena.resource_path) + else: + TrocadorDeCenas.trocar_cena(cena_jogo.resource_path) $Buttons/Btn_Jogar.disabled = false jogar_apertado = false diff --git a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn index 30e3aba..3e08cd2 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn @@ -70,16 +70,17 @@ __meta__ = { [node name="VoltarMenu" type="TextureButton" parent="MenuDeOpcoes/Menu"] anchor_left = 0.303846 anchor_top = 0.818386 -anchor_right = 0.694231 +anchor_right = 0.786538 anchor_bottom = 0.93722 +margin_left = -16.0 +margin_top = 1.0 +margin_right = -16.0 +margin_bottom = 1.0 toggle_mode = true texture_normal = ExtResource( 1 ) texture_pressed = ExtResource( 2 ) texture_hover = ExtResource( 3 ) expand = true -__meta__ = { -"_edit_use_anchors_": true -} [node name="Label" type="Label" parent="MenuDeOpcoes/Menu/VoltarMenu"] anchor_left = 0.5 @@ -99,8 +100,12 @@ valign = 1 [node name="VoltarJogo" type="TextureButton" parent="MenuDeOpcoes/Menu"] anchor_left = 0.303846 anchor_top = 0.70852 -anchor_right = 0.694231 +anchor_right = 0.784615 anchor_bottom = 0.827354 +margin_left = -16.0 +margin_top = 1.0 +margin_right = -16.0 +margin_bottom = 1.0 toggle_mode = true texture_normal = ExtResource( 1 ) texture_pressed = ExtResource( 2 ) @@ -125,6 +130,36 @@ text = "voltar ao jogo" align = 1 valign = 1 +[node name="ReiniciarCutscene" type="TextureButton" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.303846 +anchor_top = 0.598655 +anchor_right = 0.786538 +anchor_bottom = 0.717489 +margin_left = -16.0 +margin_top = 0.999969 +margin_right = -16.0 +margin_bottom = 0.999969 +toggle_mode = true +texture_normal = ExtResource( 1 ) +texture_pressed = ExtResource( 2 ) +texture_hover = ExtResource( 3 ) +expand = true + +[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/ReiniciarCutscene"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -96.5001 +margin_top = -19.5001 +margin_right = 93.4999 +margin_bottom = 14.4999 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 2 ) +text = "Reiniciar abertura" +align = 1 +valign = 1 + [node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu"] anchor_left = 0.0442308 anchor_top = 0.154709 @@ -181,3 +216,4 @@ __meta__ = { [connection signal="button_up" from="MenuDeOpcoes/Menu/VoltarMenu" to="." method="_on_VoltarMenu_button_up"] [connection signal="button_up" from="MenuDeOpcoes/Menu/VoltarJogo" to="." method="_on_VoltarJogo_button_up"] +[connection signal="button_up" from="MenuDeOpcoes/Menu/ReiniciarCutscene" to="." method="_on_ReiniciarCutscene_button_up"] diff --git a/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd index b67f3fa..ab2a876 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd @@ -10,6 +10,7 @@ onready var voltarmenu: TextureButton = $MenuDeOpcoes/Menu/VoltarMenu onready var voltarjogo: TextureButton = $MenuDeOpcoes/Menu/VoltarJogo export var menupath: String = 'res://recursos/Menu_principal/Menu_Principal.tscn' +onready var reiniciar_cutscene = $MenuDeOpcoes/Menu/ReiniciarCutscene func _ready(): print(SingletonGlobal.ativarBotoes) @@ -22,10 +23,11 @@ func _ready(): porcentagemEfeitosWheel.text = str(efeitosWheel.value) + '%' if get_tree().get_current_scene().get_name() == "Enchente": + reiniciar_cutscene.visible = false #print(get_tree().get_current_scene().get_name()) - pass else: voltarmenu.visible = false + reiniciar_cutscene.visible = SingletonOpcoesGlobais.pularCutScene or SingletonOpcoesGlobais.pularTutorial $MenuDeOpcoes/Menu/VoltarJogo/Label.text = "voltar ao menu" #print(get_tree().get_current_scene().get_name()) @@ -50,3 +52,9 @@ func _on_VoltarMenu_button_up(): func _process(delta): porcentagemMusicaWheel.text = str(musicaWheel.value) + '%' porcentagemEfeitosWheel.text = str(efeitosWheel.value) + '%' + + +func _on_ReiniciarCutscene_button_up(): + SingletonOpcoesGlobais.pularCutScene = false + SingletonOpcoesGlobais.pularTutorial = false + SingletonOpcoesGlobais.salvar_globais() diff --git a/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres index f73ec03..96a18a4 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres +++ b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres @@ -25,7 +25,7 @@ size = Vector2( 128, 256 ) [sub_resource type="BitmapFont" id=12] textures = [ SubResource( 11 ) ] -chars = PoolIntArray( 64, 0, 72, 34, 10, 11, 1, 1, 12, 224, 0, 85, 180, 5, 11, 1, 0, 7, 192, 0, 32, 16, 11, 13, -1, -2, 9, 96, 0, 2, 216, 3, 2, 3, 0, 8, 160, 0, 1734439808, 0, 0, 0, 0, 11, 4, 32, 0, 0, 0, 0, 0, 0, 11, 4, 33, 0, 65, 234, 2, 10, 1, 1, 4, 225, 0, 112, 169, 5, 11, 1, 0, 7, 193, 0, 17, 16, 11, 13, -1, -2, 9, 161, 0, 2, 222, 2, 11, 1, 3, 4, 65, 0, 2, 16, 11, 10, -1, 1, 9, 97, 0, 76, 188, 5, 8, 1, 3, 7, 98, 0, 102, 165, 6, 11, 1, 0, 8, 226, 0, 72, 143, 6, 11, 1, 0, 7, 194, 0, 113, 2, 11, 13, -1, -2, 9, 66, 0, 46, 109, 7, 10, 1, 1, 9, 162, 0, 12, 136, 6, 10, 1, 1, 8, 34, 0, 49, 187, 5, 4, 1, 1, 6, 35, 0, 78, 66, 8, 10, 0, 1, 9, 163, 0, 22, 167, 6, 10, 1, 1, 8, 195, 0, 53, 2, 11, 14, -1, -3, 9, 227, 0, 2, 155, 6, 12, 1, -1, 7, 67, 0, 68, 115, 7, 10, 1, 1, 8, 99, 0, 40, 179, 5, 8, 1, 3, 7, 228, 0, 121, 169, 5, 11, 1, 0, 7, 196, 0, 98, 2, 11, 13, -1, -2, 9, 36, 0, 102, 137, 6, 12, 1, 0, 8, 100, 0, 82, 150, 6, 11, 1, 0, 8, 68, 0, 90, 66, 8, 10, 1, 1, 10, 164, 0, 14, 79, 8, 7, 0, 3, 8, 37, 0, 2, 30, 10, 10, 1, 1, 12, 69, 0, 29, 191, 5, 10, 1, 1, 7, 165, 0, 79, 98, 7, 10, 0, 1, 8, 229, 0, 20, 196, 5, 12, 1, -1, 7, 197, 0, 83, 2, 11, 12, -1, -1, 9, 101, 0, 32, 124, 6, 8, 1, 3, 8, 38, 0, 67, 49, 9, 10, 1, 1, 10, 70, 0, 101, 105, 6, 10, 1, 1, 7, 198, 0, 21, 2, 12, 10, -1, 1, 12, 166, 0, 95, 228, 2, 14, 3, 0, 7, 102, 0, 2, 201, 5, 11, 0, 0, 4, 230, 0, 58, 34, 10, 8, 1, 3, 12, 71, 0, 66, 65, 8, 10, 1, 1, 10, 231, 0, 2, 186, 5, 11, 1, 3, 7, 199, 0, 57, 97, 7, 13, 1, 1, 8, 103, 0, 13, 107, 7, 11, 1, 3, 7, 167, 0, 112, 131, 6, 11, 0, 0, 7, 39, 0, 119, 219, 2, 4, 1, 1, 3, 72, 0, 54, 65, 8, 10, 1, 1, 10, 232, 0, 62, 143, 6, 11, 1, 0, 8, 200, 0, 47, 195, 5, 13, 1, -2, 7, 40, 0, 93, 212, 4, 12, 1, 1, 4, 104, 0, 72, 158, 6, 11, 1, 0, 8, 168, 0, 77, 217, 4, 2, 2, 0, 8, 73, 0, 38, 191, 5, 10, 0, 1, 5, 169, 0, 44, 34, 10, 10, 1, 1, 12, 233, 0, 52, 142, 6, 11, 1, 0, 8, 201, 0, 56, 197, 5, 13, 1, -2, 7, 41, 0, 51, 226, 3, 12, 0, 1, 4, 105, 0, 109, 213, 3, 11, 0, 0, 4, 106, 0, 101, 213, 4, 14, -1, 0, 4, 74, 0, 92, 195, 5, 13, -2, 1, 3, 202, 0, 65, 202, 5, 13, 1, -2, 7, 42, 0, 108, 80, 7, 6, 0, 0, 8, 170, 0, 29, 205, 4, 5, 0, 1, 5, 234, 0, 12, 181, 6, 11, 1, 0, 8, 171, 0, 22, 181, 5, 6, 1, 4, 7, 43, 0, 101, 94, 7, 7, 0, 3, 8, 107, 0, 112, 92, 7, 11, 1, 0, 7, 203, 0, 83, 200, 5, 13, 1, -2, 7, 235, 0, 2, 171, 6, 11, 1, 0, 8, 75, 0, 102, 66, 8, 10, 1, 1, 8, 44, 0, 107, 231, 2, 3, 1, 9, 4, 172, 0, 2, 104, 7, 4, 0, 6, 8, 108, 0, 113, 228, 2, 11, 1, 0, 4, 204, 0, 101, 196, 5, 13, 0, -2, 5, 236, 0, 30, 214, 3, 11, 0, 0, 4, 76, 0, 22, 124, 6, 10, 1, 1, 7, 173, 0, 16, 229, 3, 2, 1, 7, 5, 45, 0, 123, 201, 3, 2, 1, 7, 5, 109, 0, 68, 2, 11, 8, 1, 3, 13, 205, 0, 11, 211, 5, 13, 0, -2, 5, 237, 0, 37, 214, 3, 11, 1, 0, 4, 77, 0, 62, 20, 10, 10, 1, 1, 12, 46, 0, 101, 231, 2, 2, 1, 9, 4, 110, 0, 111, 107, 6, 8, 1, 3, 8, 206, 0, 20, 212, 5, 13, 0, -2, 5, 238, 0, 11, 196, 5, 11, -1, 0, 4, 174, 0, 30, 33, 10, 10, 1, 1, 12, 78, 0, 2, 79, 8, 10, 1, 1, 10, 175, 0, 35, 111, 7, 1, 0, -1, 7, 111, 0, 102, 153, 6, 8, 1, 3, 8, 207, 0, 119, 184, 5, 13, 0, -2, 5, 239, 0, 69, 219, 4, 11, 0, 0, 4, 79, 0, 41, 66, 9, 10, 1, 1, 11, 47, 0, 90, 105, 7, 10, -1, 1, 5, 176, 0, 61, 219, 4, 4, 1, 1, 6, 112, 0, 32, 150, 6, 11, 1, 3, 8, 240, 0, 82, 165, 6, 11, 1, 0, 8, 208, 0, 86, 33, 9, 10, 0, 1, 10, 80, 0, 52, 128, 6, 10, 1, 1, 8, 48, 0, 42, 135, 6, 10, 1, 1, 8, 177, 0, 46, 97, 7, 8, 0, 3, 8, 113, 0, 22, 152, 6, 11, 1, 3, 8, 241, 0, 2, 112, 6, 12, 1, -1, 8, 81, 0, 15, 59, 9, 13, 1, 1, 11, 209, 0, 74, 80, 8, 14, 1, -3, 10, 49, 0, 45, 212, 4, 10, 2, 1, 8, 178, 0, 58, 187, 5, 6, 0, 1, 5, 114, 0, 85, 217, 4, 8, 1, 3, 5, 210, 0, 2, 62, 9, 13, 1, -2, 11, 242, 0, 62, 165, 6, 11, 1, 0, 8, 82, 0, 35, 97, 7, 10, 1, 1, 8, 50, 0, 57, 114, 7, 10, 1, 1, 8, 179, 0, 53, 214, 4, 6, 0, 1, 5, 115, 0, 112, 146, 6, 8, 0, 3, 7, 211, 0, 106, 49, 9, 13, 1, -2, 11, 243, 0, 52, 172, 6, 11, 1, 0, 8, 83, 0, 24, 96, 7, 10, 0, 1, 7, 51, 0, 22, 138, 6, 10, 1, 1, 8, 180, 0, 9, 228, 3, 2, 3, 0, 8, 116, 0, 67, 188, 5, 10, 0, 1, 5, 212, 0, 93, 49, 9, 13, 1, -2, 11, 244, 0, 42, 164, 6, 11, 1, 0, 8, 84, 0, 13, 93, 7, 10, 0, 1, 7, 52, 0, 24, 110, 7, 10, 1, 1, 8, 213, 0, 2, 44, 9, 14, 1, -3, 11, 85, 0, 114, 66, 8, 10, 1, 1, 10, 53, 0, 92, 119, 6, 10, 1, 1, 8, 245, 0, 12, 165, 6, 12, 1, -1, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 117, 0, 42, 123, 6, 8, 1, 3, 8, 54, 0, 82, 121, 6, 10, 1, 1, 8, 86, 0, 76, 18, 10, 10, -1, 1, 8, 246, 0, 72, 173, 6, 11, 1, 0, 8, 214, 0, 80, 49, 9, 13, 1, -2, 11, 182, 0, 68, 98, 7, 13, 1, 0, 9, 118, 0, 15, 47, 9, 8, -1, 3, 7, 55, 0, 72, 129, 6, 10, 1, 1, 8, 87, 0, 2, 2, 15, 10, -1, 1, 13, 119, 0, 37, 2, 12, 8, -1, 3, 10, 247, 0, 90, 94, 7, 7, 0, 3, 8, 215, 0, 2, 93, 7, 7, 0, 3, 8, 183, 0, 77, 223, 2, 2, 1, 5, 4, 56, 0, 62, 129, 6, 10, 1, 1, 8, 88, 0, 90, 19, 10, 10, -1, 1, 8, 216, 0, 99, 33, 9, 12, 1, 0, 11, 248, 0, 2, 128, 6, 8, 1, 3, 8, 120, 0, 119, 80, 7, 8, 0, 3, 7, 184, 0, 116, 212, 3, 3, 0, 11, 3, 89, 0, 28, 65, 9, 10, -1, 1, 7, 217, 0, 38, 80, 8, 13, 1, -2, 10, 249, 0, 52, 157, 6, 11, 1, 0, 8, 121, 0, 112, 33, 9, 11, -1, 3, 7, 57, 0, 12, 122, 6, 10, 1, 1, 8, 185, 0, 23, 229, 3, 6, 0, 1, 5, 218, 0, 26, 79, 8, 13, 1, -2, 10, 250, 0, 42, 149, 6, 11, 1, 0, 8, 90, 0, 32, 136, 6, 10, 1, 1, 8, 122, 0, 112, 119, 6, 8, 1, 3, 7, 58, 0, 89, 229, 2, 8, 1, 3, 4, 186, 0, 37, 205, 4, 5, 0, 1, 5, 219, 0, 50, 80, 8, 13, 1, -2, 10, 91, 0, 58, 227, 3, 12, 1, 1, 4, 123, 0, 103, 180, 5, 12, 0, 1, 5, 251, 0, 12, 150, 6, 11, 1, 0, 8, 59, 0, 71, 234, 2, 9, 1, 3, 4, 187, 0, 31, 181, 5, 6, 1, 4, 7, 188, 0, 16, 33, 10, 10, 0, 1, 10, 124, 0, 83, 229, 2, 14, 3, 0, 7, 220, 0, 62, 79, 8, 13, 1, -2, 10, 252, 0, 92, 133, 6, 11, 1, 0, 8, 92, 0, 97, 80, 7, 10, -1, 1, 5, 60, 0, 92, 153, 6, 7, 1, 3, 8, 189, 0, 47, 20, 11, 10, 0, 1, 10, 253, 0, 28, 47, 9, 14, -1, 0, 7, 221, 0, 54, 48, 9, 13, -1, -2, 7, 93, 0, 44, 226, 3, 12, 0, 1, 4, 125, 0, 110, 196, 5, 12, 0, 1, 5, 61, 0, 79, 112, 7, 5, 0, 4, 8, 190, 0, 104, 19, 10, 10, 0, 1, 10, 222, 0, 32, 165, 6, 10, 1, 1, 8, 254, 0, 102, 119, 6, 14, 1, 0, 8, 62, 0, 112, 158, 6, 7, 1, 3, 8, 94, 0, 86, 80, 7, 6, 0, 1, 7, 126, 0, 62, 158, 6, 3, 1, 5, 8, 223, 0, 82, 135, 6, 11, 1, 0, 8, 255, 0, 41, 48, 9, 14, -1, 0, 7, 191, 0, 94, 180, 5, 11, 0, 3, 6, 63, 0, 74, 202, 5, 10, 0, 1, 6, 95, 0, 92, 148, 6, 1, 0, 12, 6 ) +chars = PoolIntArray( 64, 0, 72, 34, 10, 11, 1, 1, 12, 224, 0, 85, 180, 5, 11, 1, 0, 7, 192, 0, 32, 16, 11, 13, -1, -2, 9, 96, 0, 2, 216, 3, 2, 3, 0, 8, 160, 0, 1734439808, 0, 0, 0, 0, 11, 4, 32, 0, 0, 0, 0, 0, 0, 11, 4, 33, 0, 65, 234, 2, 10, 1, 1, 4, 225, 0, 112, 169, 5, 11, 1, 0, 7, 193, 0, 17, 16, 11, 13, -1, -2, 9, 161, 0, 2, 222, 2, 11, 1, 3, 4, 65, 0, 2, 16, 11, 10, -1, 1, 9, 97, 0, 76, 188, 5, 8, 1, 3, 7, 98, 0, 102, 165, 6, 11, 1, 0, 8, 226, 0, 72, 143, 6, 11, 1, 0, 7, 194, 0, 113, 2, 11, 13, -1, -2, 9, 66, 0, 46, 109, 7, 10, 1, 1, 9, 162, 0, 12, 136, 6, 10, 1, 1, 8, 34, 0, 49, 187, 5, 4, 1, 1, 6, 35, 0, 78, 66, 8, 10, 0, 1, 9, 163, 0, 22, 167, 6, 10, 1, 1, 8, 195, 0, 53, 2, 11, 14, -1, -3, 9, 227, 0, 2, 155, 6, 12, 1, -1, 7, 67, 0, 68, 115, 7, 10, 1, 1, 8, 99, 0, 40, 179, 5, 8, 1, 3, 7, 228, 0, 121, 169, 5, 11, 1, 0, 7, 196, 0, 98, 2, 11, 13, -1, -2, 9, 36, 0, 102, 137, 6, 12, 1, 0, 8, 100, 0, 82, 150, 6, 11, 1, 0, 8, 68, 0, 90, 66, 8, 10, 1, 1, 10, 164, 0, 14, 79, 8, 7, 0, 3, 8, 37, 0, 2, 30, 10, 10, 1, 1, 12, 69, 0, 29, 191, 5, 10, 1, 1, 7, 165, 0, 79, 98, 7, 10, 0, 1, 8, 229, 0, 20, 196, 5, 12, 1, -1, 7, 197, 0, 83, 2, 11, 12, -1, -1, 9, 101, 0, 32, 124, 6, 8, 1, 3, 8, 38, 0, 67, 49, 9, 10, 1, 1, 10, 70, 0, 101, 105, 6, 10, 1, 1, 7, 198, 0, 21, 2, 12, 10, -1, 1, 12, 166, 0, 95, 228, 2, 14, 3, 0, 7, 102, 0, 2, 201, 5, 11, 0, 0, 4, 230, 0, 58, 34, 10, 8, 1, 3, 12, 71, 0, 66, 65, 8, 10, 1, 1, 10, 231, 0, 2, 186, 5, 11, 1, 3, 7, 199, 0, 57, 97, 7, 13, 1, 1, 8, 103, 0, 13, 107, 7, 11, 1, 3, 7, 167, 0, 112, 131, 6, 11, 0, 0, 7, 39, 0, 119, 219, 2, 4, 1, 1, 3, 72, 0, 54, 65, 8, 10, 1, 1, 10, 232, 0, 62, 143, 6, 11, 1, 0, 8, 200, 0, 47, 195, 5, 13, 1, -2, 7, 40, 0, 93, 212, 4, 12, 1, 1, 4, 104, 0, 72, 158, 6, 11, 1, 0, 8, 168, 0, 77, 217, 4, 2, 2, 0, 8, 73, 0, 38, 191, 5, 10, 0, 1, 5, 169, 0, 44, 34, 10, 10, 1, 1, 12, 233, 0, 52, 142, 6, 11, 1, 0, 8, 201, 0, 56, 197, 5, 13, 1, -2, 7, 41, 0, 51, 226, 3, 12, 0, 1, 4, 105, 0, 109, 213, 3, 11, 0, 0, 4, 106, 0, 101, 213, 4, 14, -1, 0, 4, 74, 0, 92, 195, 5, 13, -2, 1, 3, 202, 0, 65, 202, 5, 13, 1, -2, 7, 42, 0, 108, 80, 7, 6, 0, 0, 8, 170, 0, 29, 205, 4, 5, 0, 1, 5, 234, 0, 12, 181, 6, 11, 1, 0, 8, 171, 0, 22, 181, 5, 6, 1, 4, 7, 43, 0, 101, 94, 7, 7, 0, 3, 8, 107, 0, 112, 92, 7, 11, 1, 0, 7, 203, 0, 83, 200, 5, 13, 1, -2, 7, 235, 0, 2, 171, 6, 11, 1, 0, 8, 75, 0, 102, 66, 8, 10, 1, 1, 8, 44, 0, 107, 231, 2, 3, 1, 9, 4, 172, 0, 2, 104, 7, 4, 0, 6, 8, 108, 0, 113, 228, 2, 11, 1, 0, 4, 204, 0, 101, 196, 5, 13, 0, -2, 5, 236, 0, 30, 214, 3, 11, 0, 0, 4, 76, 0, 22, 124, 6, 10, 1, 1, 7, 173, 0, 16, 229, 3, 2, 1, 7, 5, 45, 0, 123, 201, 3, 2, 1, 7, 5, 109, 0, 68, 2, 11, 8, 1, 3, 13, 205, 0, 11, 211, 5, 13, 0, -2, 5, 237, 0, 37, 214, 3, 11, 1, 0, 4, 77, 0, 62, 20, 10, 10, 1, 1, 12, 46, 0, 101, 231, 2, 2, 1, 9, 4, 110, 0, 111, 107, 6, 8, 1, 3, 8, 206, 0, 20, 212, 5, 13, 0, -2, 5, 238, 0, 11, 196, 5, 11, -1, 0, 4, 174, 0, 30, 33, 10, 10, 1, 1, 12, 78, 0, 2, 79, 8, 10, 1, 1, 10, 175, 0, 35, 111, 7, 1, 0, -1, 7, 111, 0, 102, 153, 6, 8, 1, 3, 8, 207, 0, 119, 184, 5, 13, 0, -2, 5, 239, 0, 69, 219, 4, 11, 0, 0, 4, 79, 0, 41, 66, 9, 10, 1, 1, 11, 47, 0, 90, 105, 7, 10, -1, 1, 5, 176, 0, 61, 219, 4, 4, 1, 1, 6, 112, 0, 32, 150, 6, 11, 1, 3, 8, 240, 0, 82, 165, 6, 11, 1, 0, 8, 208, 0, 86, 33, 9, 10, 0, 1, 10, 80, 0, 52, 128, 6, 10, 1, 1, 8, 48, 0, 42, 135, 6, 10, 1, 1, 8, 177, 0, 46, 97, 7, 8, 0, 3, 8, 113, 0, 22, 152, 6, 11, 1, 3, 8, 241, 0, 2, 112, 6, 12, 1, -1, 8, 81, 0, 15, 59, 9, 13, 1, 1, 11, 209, 0, 74, 80, 8, 14, 1, -3, 10, 49, 0, 45, 212, 4, 10, 2, 1, 8, 178, 0, 58, 187, 5, 6, 0, 1, 5, 114, 0, 85, 217, 4, 8, 1, 3, 5, 210, 0, 2, 62, 9, 13, 1, -2, 11, 242, 0, 62, 165, 6, 11, 1, 0, 8, 82, 0, 35, 97, 7, 10, 1, 1, 8, 50, 0, 57, 114, 7, 10, 1, 1, 8, 179, 0, 53, 214, 4, 6, 0, 1, 5, 115, 0, 112, 146, 6, 8, 0, 3, 7, 211, 0, 106, 49, 9, 13, 1, -2, 11, 243, 0, 52, 172, 6, 11, 1, 0, 8, 83, 0, 24, 96, 7, 10, 0, 1, 7, 51, 0, 22, 138, 6, 10, 1, 1, 8, 180, 0, 9, 228, 3, 2, 3, 0, 8, 116, 0, 67, 188, 5, 10, 0, 1, 5, 212, 0, 93, 49, 9, 13, 1, -2, 11, 244, 0, 42, 164, 6, 11, 1, 0, 8, 84, 0, 13, 93, 7, 10, 0, 1, 7, 52, 0, 24, 110, 7, 10, 1, 1, 8, 53, 0, 92, 119, 6, 10, 1, 1, 8, 85, 0, 114, 66, 8, 10, 1, 1, 10, 213, 0, 2, 44, 9, 14, 1, -3, 11, 117, 0, 42, 123, 6, 8, 1, 3, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 245, 0, 12, 165, 6, 12, 1, -1, 8, 54, 0, 82, 121, 6, 10, 1, 1, 8, 86, 0, 76, 18, 10, 10, -1, 1, 8, 246, 0, 72, 173, 6, 11, 1, 0, 8, 214, 0, 80, 49, 9, 13, 1, -2, 11, 182, 0, 68, 98, 7, 13, 1, 0, 9, 118, 0, 15, 47, 9, 8, -1, 3, 7, 55, 0, 72, 129, 6, 10, 1, 1, 8, 87, 0, 2, 2, 15, 10, -1, 1, 13, 119, 0, 37, 2, 12, 8, -1, 3, 10, 247, 0, 90, 94, 7, 7, 0, 3, 8, 215, 0, 2, 93, 7, 7, 0, 3, 8, 183, 0, 77, 223, 2, 2, 1, 5, 4, 56, 0, 62, 129, 6, 10, 1, 1, 8, 88, 0, 90, 19, 10, 10, -1, 1, 8, 216, 0, 99, 33, 9, 12, 1, 0, 11, 248, 0, 2, 128, 6, 8, 1, 3, 8, 120, 0, 119, 80, 7, 8, 0, 3, 7, 184, 0, 116, 212, 3, 3, 0, 11, 3, 89, 0, 28, 65, 9, 10, -1, 1, 7, 217, 0, 38, 80, 8, 13, 1, -2, 10, 249, 0, 52, 157, 6, 11, 1, 0, 8, 121, 0, 112, 33, 9, 11, -1, 3, 7, 57, 0, 12, 122, 6, 10, 1, 1, 8, 185, 0, 23, 229, 3, 6, 0, 1, 5, 218, 0, 26, 79, 8, 13, 1, -2, 10, 250, 0, 42, 149, 6, 11, 1, 0, 8, 90, 0, 32, 136, 6, 10, 1, 1, 8, 122, 0, 112, 119, 6, 8, 1, 3, 7, 58, 0, 89, 229, 2, 8, 1, 3, 4, 186, 0, 37, 205, 4, 5, 0, 1, 5, 219, 0, 50, 80, 8, 13, 1, -2, 10, 91, 0, 58, 227, 3, 12, 1, 1, 4, 123, 0, 103, 180, 5, 12, 0, 1, 5, 251, 0, 12, 150, 6, 11, 1, 0, 8, 59, 0, 71, 234, 2, 9, 1, 3, 4, 187, 0, 31, 181, 5, 6, 1, 4, 7, 188, 0, 16, 33, 10, 10, 0, 1, 10, 124, 0, 83, 229, 2, 14, 3, 0, 7, 220, 0, 62, 79, 8, 13, 1, -2, 10, 252, 0, 92, 133, 6, 11, 1, 0, 8, 92, 0, 97, 80, 7, 10, -1, 1, 5, 60, 0, 92, 153, 6, 7, 1, 3, 8, 189, 0, 47, 20, 11, 10, 0, 1, 10, 253, 0, 28, 47, 9, 14, -1, 0, 7, 221, 0, 54, 48, 9, 13, -1, -2, 7, 93, 0, 44, 226, 3, 12, 0, 1, 4, 125, 0, 110, 196, 5, 12, 0, 1, 5, 61, 0, 79, 112, 7, 5, 0, 4, 8, 190, 0, 104, 19, 10, 10, 0, 1, 10, 222, 0, 32, 165, 6, 10, 1, 1, 8, 254, 0, 102, 119, 6, 14, 1, 0, 8, 62, 0, 112, 158, 6, 7, 1, 3, 8, 94, 0, 86, 80, 7, 6, 0, 1, 7, 126, 0, 62, 158, 6, 3, 1, 5, 8, 223, 0, 82, 135, 6, 11, 1, 0, 8, 255, 0, 41, 48, 9, 14, -1, 0, 7, 191, 0, 94, 180, 5, 11, 0, 3, 6, 63, 0, 74, 202, 5, 10, 0, 1, 6, 95, 0, 92, 148, 6, 1, 0, 12, 6 ) [sub_resource type="Image" id=35] data = { diff --git a/projeto/recursos/abertura/abertura.tscn b/projeto/recursos/abertura/abertura.tscn index 5ad6bb2..2b0f342 100644 --- a/projeto/recursos/abertura/abertura.tscn +++ b/projeto/recursos/abertura/abertura.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://elementos/imagem/abertura/logo.png" type="Texture" id=1] [ext_resource path="res://recursos/abertura/abertura.gd" type="Script" id=2] @@ -31,6 +31,18 @@ tracks/1/keys = { "update": 0, "values": [ Vector2( 0, 0 ) ] } +tracks/2/type = "value" +tracks/2/path = NodePath("CenterContainer/logo:material:shader_param/frequency") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} [sub_resource type="Animation" id=1] resource_name = "abertura" @@ -59,6 +71,57 @@ tracks/1/keys = { "update": 0, "values": [ Vector2( 1, 1 ), Vector2( -1, 1 ), Vector2( 1, 1 ) ] } +tracks/2/type = "value" +tracks/2/path = NodePath("CenterContainer/logo:material:shader_param/frequency") +tracks/2/interp = 0 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0, 2.5, 3 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ 0.0, 1.0, 0.0 ] +} + +[sub_resource type="Shader" id=5] +code = "shader_type canvas_item; + +// The color that flashes when highlighting the sprite +uniform vec4 highlight_color : hint_color = vec4(1.0, 1.0, 1.0, 1.0); + +// Used to control the time between flashes +uniform float frequency : hint_range(0.0, 25.0) = 0.35; + +// Speed of each flash +uniform float highlight_speed : hint_range(0.0, 25.0) = 6.0; + +// How much area each flash covers (width) +uniform float highlight_width : hint_range(0.0, 50.0) = 15.0; + +void fragment( ) +{ + vec4 input_color = texture(TEXTURE, UV); + float width = 0.001 * frequency * highlight_width / 2.0; + + // can play with + or - sign for each UV + // to control which direction the highlight moves + // ex. -UV.x - UV.y makes the highlight go from + // top left to bottom right + float value = floor(sin(frequency * ((UV.x - UV.y) + TIME * highlight_speed)) + width); + + // used to control when to use input color vs highlight color + float highlight = value > 0.5? 1.0: 0.0; + vec3 new_color = input_color.rgb * (1.0 - highlight) + highlight_color.rgb * highlight; + COLOR = vec4(new_color, input_color.a); +}" + +[sub_resource type="ShaderMaterial" id=4] +shader = SubResource( 5 ) +shader_param/highlight_color = Color( 1, 1, 1, 1 ) +shader_param/frequency = 0.0 +shader_param/highlight_speed = 6.0 +shader_param/highlight_width = 15.0 [node name="Abertura" type="Control"] anchor_right = 1.0 @@ -80,6 +143,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 [node name="logo" type="TextureRect" parent="CenterContainer"] +material = SubResource( 4 ) margin_left = 235.0 margin_top = 515.0 margin_right = 485.0 diff --git a/projeto/recursos/jogos/enchente/abertura/CutsceneBase.gd b/projeto/recursos/jogos/enchente/abertura/CutsceneBase.gd index 13e954a..7504ac4 100644 --- a/projeto/recursos/jogos/enchente/abertura/CutsceneBase.gd +++ b/projeto/recursos/jogos/enchente/abertura/CutsceneBase.gd @@ -19,7 +19,7 @@ var tempo_entre_pontos : float = 1 var tempo_entre_efeitos : float = 3 var ponto_atual = 1 -func _ready(): +func _ready(): var time = Time.get_datetime_dict_from_system() texto_2.definir_texto(str(time["day"]) + "/" + str(time["month"]) + "/" + str(time["year"]) + " - " + str(time["hour"]) + ":" + str(time["minute"])) @@ -47,7 +47,7 @@ func avancar(): ponto_atual = 3 proximo_ponto() -func fim(): +func fim(): TrocadorDeCenas.trocar_cena("res://recursos/jogos/enchente/cenas/Enchente.tscn") func _on_dialogic_signal(arg): diff --git a/projeto/recursos/jogos/enchente/abertura/CutsceneBase.tscn b/projeto/recursos/jogos/enchente/abertura/CutsceneBase.tscn index af8063f..73f0cac 100644 --- a/projeto/recursos/jogos/enchente/abertura/CutsceneBase.tscn +++ b/projeto/recursos/jogos/enchente/abertura/CutsceneBase.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://elementos/imagem/enchente/cutscene/tela_saco.png" type="Texture" id=1] [ext_resource path="res://elementos/imagem/enchente/cutscene/tela_saco_senhora.png" type="Texture" id=2] -[ext_resource path="res://elementos/imagem/enchente/cutscene/tela_predios.png" type="Texture" id=3] +[ext_resource path="res://elementos/imagem/enchente/cutscene/bg.png" type="Texture" id=3] [ext_resource path="res://elementos/imagem/enchente/cutscene/gota_chuva.png" type="Texture" id=4] [ext_resource path="res://addons/label_temporizada/LabelTemporizada.gd" type="Script" id=5] [ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=6] @@ -174,26 +174,19 @@ texture_normal = ExtResource( 10 ) texture_pressed = ExtResource( 6 ) texture_hover = ExtResource( 11 ) expand = true -stretch_mode = 4 +stretch_mode = 5 __meta__ = { "_edit_use_anchors_": true } [node name="Label" type="Label" parent="Botoes/BotaoAvancar"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -60.0 -margin_top = -29.0 -margin_right = 60.0 -margin_bottom = 10.0 +anchor_right = 1.0 +anchor_bottom = 1.0 theme = ExtResource( 8 ) custom_colors/font_color = Color( 0.203922, 0.203922, 0.203922, 1 ) text = "Avançar" -__meta__ = { -"_edit_use_anchors_": true -} +align = 1 +valign = 1 [node name="BotaoPular" type="TextureButton" parent="Botoes"] anchor_left = 0.720833 @@ -204,23 +197,19 @@ texture_normal = ExtResource( 10 ) texture_pressed = ExtResource( 6 ) texture_hover = ExtResource( 11 ) expand = true -stretch_mode = 4 +stretch_mode = 5 __meta__ = { "_edit_use_anchors_": true } [node name="Label" type="Label" parent="Botoes/BotaoPular"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -41.0 -margin_top = -26.0 -margin_right = 79.0 -margin_bottom = 13.0 +anchor_right = 1.0 +anchor_bottom = 1.0 theme = ExtResource( 8 ) custom_colors/font_color = Color( 0.203922, 0.203922, 0.203922, 1 ) text = "Pular" +align = 1 +valign = 1 [connection signal="Fim" from="Tela1/Texto1" to="." method="proximo_ponto"] [connection signal="Fim" from="Tela1/Texto2" to="." method="proximo_ponto"] diff --git a/projeto/recursos/jogos/enchente/abertura/test.tscn b/projeto/recursos/jogos/enchente/abertura/test.tscn deleted file mode 100644 index c232064..0000000 --- a/projeto/recursos/jogos/enchente/abertura/test.tscn +++ /dev/null @@ -1,5 +0,0 @@ -[gd_scene format=2] - -[node name="test" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 diff --git a/projeto/recursos/jogos/enchente/cenas/Enchente.gd b/projeto/recursos/jogos/enchente/cenas/Enchente.gd index d236675..73a54e6 100644 --- a/projeto/recursos/jogos/enchente/cenas/Enchente.gd +++ b/projeto/recursos/jogos/enchente/cenas/Enchente.gd @@ -20,7 +20,9 @@ func _ready(): player_lane_3d.controle_faixa_3d.faixas.append(faixa_2.global_position) player_lane_3d.controle_faixa_3d.faixas.append(faixa_3.global_position) player_lane_3d.controle_faixa_3d.posicao_inicial = 1 - + SingletonOpcoesGlobais.pularCutScene = true + SingletonOpcoesGlobais.pularTutorial = true + SingletonOpcoesGlobais.salvar_globais() $Contador.visible = true $Contador/Animador.play("aproximar") diff --git a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn index d8e6730..a572df5 100644 --- a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn +++ b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=87 format=2] +[gd_scene load_steps=90 format=2] [ext_resource path="res://elementos/imagem/enchente/senhorinha/idle/Timeline 1_0000.png" type="Texture" id=1] [ext_resource path="res://addons/controles3D/ControleFaixa3D.gd" type="Script" id=2] @@ -139,7 +139,7 @@ animations = [ { } ] [sub_resource type="PlaneMesh" id=4] -material = ExtResource( 80 ) +material = ExtResource( 84 ) [sub_resource type="Curve" id=5] _data = [ Vector2( 0, 0.507955 ), 0.0, 0.0, 0, 0, Vector2( 0.995049, 0 ), 0.0, 0.0, 0, 0 ]