diff --git a/.gitignore b/.gitignore index c04530b..fa7382d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ data_*/ mono_crash.*.json exportados/ + +.idea +.vscode \ No newline at end of file diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Comentario.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Comentario.png deleted file mode 100644 index e44dc39..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Comentario.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_hover.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_hover.png deleted file mode 100644 index e2a499d..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_hover.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png deleted file mode 100644 index 0d0aee7..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png deleted file mode 100644 index 7d2f680..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet (1).png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet (1).png deleted file mode 100644 index f66cf23..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet (1).png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet.png deleted file mode 100644 index 08184a3..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao1.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao1.png deleted file mode 100644 index ba80985..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao1.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao2.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao2.png deleted file mode 100644 index 9b473a2..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao2.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao3.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao3.png deleted file mode 100644 index be243da..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao3.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao4.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao4.png deleted file mode 100644 index c0ce635..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao4.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao5.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao5.png deleted file mode 100644 index 126b23f..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao5.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/Group 7.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/Group 7.png deleted file mode 100644 index beee2aa..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/Group 7.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar.png deleted file mode 100644 index 2221b34..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar_pressed.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar_pressed.png deleted file mode 100644 index e2bcd35..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Voltar_pressed.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png deleted file mode 100644 index 5549a7c..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_pressed.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_pressed.png deleted file mode 100644 index a3e91e7..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_pressed.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card.png deleted file mode 100644 index 38110c2..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia.png deleted file mode 100644 index c8f8a09..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png deleted file mode 100644 index a7ab228..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png deleted file mode 100644 index 7405e64..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png and /dev/null differ diff --git "a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/bot\303\243o menu.png" "b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/bot\303\243o menu.png" deleted file mode 100644 index 7f8537c..0000000 Binary files "a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/bot\303\243o menu.png" and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo 2.png b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo 2.png deleted file mode 100644 index 7fc082b..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo 2.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo.png b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo.png deleted file mode 100644 index 9f4ba7c..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed (1).png b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed (1).png deleted file mode 100644 index 558a004..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed (1).png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Menu/BotaoPause.png b/projeto/elementos/UI/minigame_senhorinha/Menu/BotaoPause.png new file mode 100644 index 0000000..0eb2ba9 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Menu/BotaoPause.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Menu/Derrota/derrota.png b/projeto/elementos/UI/minigame_senhorinha/Menu/Derrota/derrota.png new file mode 100644 index 0000000..4e3bfdd Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Menu/Derrota/derrota.png differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Unchecked.png b/projeto/elementos/UI/minigame_senhorinha/Menu/Slider/Unchecked.png similarity index 100% rename from projeto/elementos/imagem/imgs_menu_opcoes_enchente/Unchecked.png rename to projeto/elementos/UI/minigame_senhorinha/Menu/Slider/Unchecked.png diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/VolumeBar.png b/projeto/elementos/UI/minigame_senhorinha/Menu/Slider/VolumeBar.png similarity index 100% rename from projeto/elementos/imagem/imgs_menu_opcoes_enchente/VolumeBar.png rename to projeto/elementos/UI/minigame_senhorinha/Menu/Slider/VolumeBar.png diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/VolumeWheel.png b/projeto/elementos/UI/minigame_senhorinha/Menu/Slider/VolumeWheel.png similarity index 100% rename from projeto/elementos/imagem/imgs_menu_opcoes_enchente/VolumeWheel.png rename to projeto/elementos/UI/minigame_senhorinha/Menu/Slider/VolumeWheel.png diff --git a/projeto/elementos/UI/minigame_senhorinha/Menu/Vitoria/vitoria.png b/projeto/elementos/UI/minigame_senhorinha/Menu/Vitoria/vitoria.png new file mode 100644 index 0000000..744af9e Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Menu/Vitoria/vitoria.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Clouds_BG.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Clouds_BG.png new file mode 100644 index 0000000..481b576 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Clouds_BG.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Sky_BG.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Sky_BG.png new file mode 100644 index 0000000..8a0443b Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Sky_BG.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Titulo.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Titulo.png new file mode 100644 index 0000000..c2e06c8 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/Titulo.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_jogar_normal.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_jogar_normal.png new file mode 100644 index 0000000..de98a51 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_jogar_normal.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_opcoes_normal.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_opcoes_normal.png new file mode 100644 index 0000000..ae25420 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/btn_opcoes_normal.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/logo.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/logo.png new file mode 100644 index 0000000..4d4fc69 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/logo.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/transparency_BG.png b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/transparency_BG.png new file mode 100644 index 0000000..081b930 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/MenuPrincipal/transparency_BG.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 2.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 2.png deleted file mode 100644 index 8bf5b1c..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 2.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 3.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 3.png deleted file mode 100644 index 4f36dce..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/Frame 3.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/moldura.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/moldura.png deleted file mode 100644 index 8c47937..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/moldura.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Hovered.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Hovered.png deleted file mode 100644 index 6fa35e9..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Hovered.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Normal.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Normal.png deleted file mode 100644 index e7f22af..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Normal.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Pressed.png b/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Pressed.png deleted file mode 100644 index 5b92aa6..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Vitoria_derrota/voltar_feed/Pressed.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0000.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0000.png new file mode 100644 index 0000000..e7f3910 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0000.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0001.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0001.png new file mode 100644 index 0000000..5cdd3b0 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0001.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0002.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0002.png new file mode 100644 index 0000000..efc5bd2 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0002.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0003.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0003.png new file mode 100644 index 0000000..9643264 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0003.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0004.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0004.png new file mode 100644 index 0000000..d44f0a6 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0004.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0005.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0005.png new file mode 100644 index 0000000..feb8c35 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0005.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0006.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0006.png new file mode 100644 index 0000000..9c27f37 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0006.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0007.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0007.png new file mode 100644 index 0000000..0ee2dfa Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0007.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0008.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0008.png new file mode 100644 index 0000000..c22c1f1 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0008.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0009.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0009.png new file mode 100644 index 0000000..b48abae Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0009.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0010.png b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0010.png new file mode 100644 index 0000000..f58bffd Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0010.png differ diff --git a/projeto/elementos/imagem/abertura/logo.png b/projeto/elementos/imagem/abertura/logo.png index d08d1f4..7ba3644 100644 Binary files a/projeto/elementos/imagem/abertura/logo.png and b/projeto/elementos/imagem/abertura/logo.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/Mina.png b/projeto/elementos/imagem/enchente/chefe/Mina.png deleted file mode 100644 index 1adb517..0000000 Binary files a/projeto/elementos/imagem/enchente/chefe/Mina.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Checked.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Checked.png deleted file mode 100644 index 624349f..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Checked.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered-1.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered-1.png deleted file mode 100644 index ae1d48d..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered-1.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered.png deleted file mode 100644 index 6474690..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Hovered.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Menu.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Menu.png deleted file mode 100644 index 1aa219b..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Menu.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-1.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-1.png deleted file mode 100644 index ea71580..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-1.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-2.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-2.png deleted file mode 100644 index 65fcf8c..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-2.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-3.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-3.png deleted file mode 100644 index 77ed8f5..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-3.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-4.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-4.png deleted file mode 100644 index 60b173f..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal-4.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal.png deleted file mode 100644 index 2a6437d..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Normal.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-1.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-1.png deleted file mode 100644 index 00719e1..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-1.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-2.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-2.png deleted file mode 100644 index 2c219c6..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed-2.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed.png deleted file mode 100644 index 6ccc5bf..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/Pressed.png and /dev/null differ diff --git a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/botaomenu.png b/projeto/elementos/imagem/imgs_menu_opcoes_enchente/botaomenu.png deleted file mode 100644 index 70f8806..0000000 Binary files a/projeto/elementos/imagem/imgs_menu_opcoes_enchente/botaomenu.png and /dev/null differ diff --git a/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd b/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd deleted file mode 100644 index bf5a466..0000000 --- a/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd +++ /dev/null @@ -1,130 +0,0 @@ -tool -extends Control - -export var JsonCards = 'res://recursos/feed_de_noticias/Cards.json' -export var idCard = "Teste" -export var Imagem_card: StreamTexture -export var E_jogavel: bool -export var Cena_do_jogo: String -export var img_coracao_nao_apertado: StreamTexture -export var img_coracao_apertado: StreamTexture - -onready var card_img: TextureRect = $PainelPrincipal/ImgCard -onready var card_2: TextureRect = $PainelHidden/outline3/ImgCard2 -onready var titulo_texto: RichTextLabel = $PainelPrincipal/Titulo -onready var desc_basica: Label = $PainelPrincipal/Desc -onready var animacao_coracao: AnimationPlayer = $AnimationCoracao -onready var botao_saibaMais = $PainelPrincipal/SaibaMais -onready var tween_card: Tween = $Tween - -var saiba_mais_apertado: bool = false -var coracao_apertado: bool = false -var Titulo: String -var Descricao_basica: String -var Descricao_avancada: String -var quantidade_de_paineis = 0 - -func _atualizar_card(): - var valoresNoDict = loadJson(JsonCards) - var valoresId = valoresNoDict.get(String(idCard)) - - card_img.texture = Imagem_card - card_2.texture = Imagem_card - - # Extrai valores específicos do cartão - Titulo = valoresId.get("Titulo") - titulo_texto.bbcode_text = Titulo - Descricao_basica = valoresId.get("DescricaoBasica") - desc_basica.text = Descricao_basica - Descricao_avancada = valoresId.get("DescricaoAvancada") - -func _atualizar_painel(): - var painelSaibaMais = load("res://recursos/feed_de_noticias/PainelSaibaMais.tscn") - var instanciaSaibaMais = painelSaibaMais.instance() - var valoresNoDict = loadJson(JsonCards) - var valoresId = valoresNoDict.get(String(idCard)) - - instanciaSaibaMais.E_jogavel = E_jogavel - instanciaSaibaMais.Cena_do_jogo = Cena_do_jogo - - # Extrai valores específicos para o painel - Descricao_avancada = valoresId.get("DescricaoAvancada") - instanciaSaibaMais.Descricao_avancada = Descricao_avancada - - get_tree().root.add_child(instanciaSaibaMais) - -func _ready(): - recarregar_like() - _atualizar_card() -# var save = Salvamento.carregar_tudo("like") -# var dados = save.Dados -# print(dados[idCard]) -# print(dados) - -func recarregar_like(): - if not Salvamento.existe("like", idCard): - # print('Não possue like') - save_like() - else: - var save = Salvamento.carregar_tudo("like") - var dados = save.Dados - if dados[idCard] == false: - $PainelPrincipal/Coracao.texture = img_coracao_nao_apertado - coracao_apertado = false - else: - $PainelPrincipal/Coracao.texture = img_coracao_apertado - coracao_apertado = true - -func _tocar_animacao_coracao(): - if coracao_apertado == false: - animacao_coracao.play("Animação") - yield(animacao_coracao, "animation_finished") - coracao_apertado = true - save_like() - else: - animacao_coracao.play_backwards("Animação") - yield(animacao_coracao, "animation_finished") - coracao_apertado = false - save_like() - -func _on_SaibaMais_pressed(): - var botao_tween = $Tween - - if not saiba_mais_apertado: - botao_tween.interpolate_property(botao_saibaMais, "rect_scale", Vector2(1, 1), Vector2(1.1, 1.1), 0.1, Tween.TRANS_ELASTIC) - botao_tween.interpolate_property(botao_saibaMais, "rect_scale", Vector2(1.1, 1.1), Vector2(1, 1), 0.1, Tween.TRANS_ELASTIC) - botao_tween.start() - - yield(botao_tween, "tween_completed") - _atualizar_painel() - -func _on_coracaobotao_pressed(): - var coracao_tween = $PainelPrincipal/Coracao/TweenCoracao - coracao_tween.interpolate_property($PainelPrincipal/Coracao, "scale", Vector2(1.245, 1.245), Vector2(1.7, 1.7), 0.2, Tween.TRANS_ELASTIC) - coracao_tween.interpolate_property($PainelPrincipal/Coracao, "scale", Vector2(1.7, 1.7), Vector2(1.245, 1.245), 0.2, Tween.TRANS_ELASTIC) - coracao_tween.start() - _tocar_animacao_coracao() - -func save_like(): - Salvamento.salvar("like", idCard, coracao_apertado) - -func loadJson(nomejson): - var arquivo = File.new() - if arquivo.file_exists(nomejson): - arquivo.open(nomejson, arquivo.READ) - var conteudo = parse_json(arquivo.get_as_text()) - if conteudo == null: - print("Could not parse " + nomejson + " as JSON." + \ - "Porfavor cheque se o path está certo.") - #print(conteudo) - return conteudo - else: - print("File Open Error: could not open file " + nomejson) - arquivo.close() - -func _on_VisibilityNotifier2D_screen_entered(): - tween_card.interpolate_property($PainelPrincipal, "rect_position", Vector2(55, -5), Vector2(55, 32), 0.7, Tween.TRANS_LINEAR) - tween_card.interpolate_property($PainelPrincipal, "modulate:a", 0.2, 1, 0.5, Tween.TRANS_LINEAR) - tween_card.interpolate_property($PainelHidden, "rect_position", Vector2(19, -5), Vector2(19, 60), 0.7, Tween.TRANS_LINEAR) - tween_card.interpolate_property($PainelHidden, "modulate:a", 0.2, 1, 0.5, Tween.TRANS_LINEAR) - tween_card.start() diff --git a/projeto/elementos/scripts/ScriptsCartaoDeLevel/VBoxResizer.gd b/projeto/elementos/scripts/ScriptsCartaoDeLevel/VBoxResizer.gd deleted file mode 100644 index 65ed5d5..0000000 --- a/projeto/elementos/scripts/ScriptsCartaoDeLevel/VBoxResizer.gd +++ /dev/null @@ -1,21 +0,0 @@ -tool -extends VBoxContainer - -export var ajuste_manual: int = 0 # setar o numero de nodes se quiser fazer o ajuste manual -export var tamanho_total: int = 330 # setar o tamanho das nodes de noticias - -onready var quantidade_de_criancas = get_child_count() - -func _atualizador_de_container(): - if ajuste_manual == 0: # se o ajuste manual for igual a 0 ele ira pegar a quantidade de nodes no container e usar como quantidade - self.rect_min_size.y = tamanho_total * quantidade_de_criancas - print(self.rect_min_size.y) - print(quantidade_de_criancas) - - else: # se tiver qualquer numero no ajuste manual ele irá pegar o numero e multiplicar pelo tamanho total - self.rect_min_size.y = tamanho_total * ajuste_manual - print(self.rect_min_size.y) - print(quantidade_de_criancas) - -func _ready(): - _atualizador_de_container() diff --git a/projeto/project.godot b/projeto/project.godot index 0b56974..dae78a1 100644 --- a/projeto/project.godot +++ b/projeto/project.godot @@ -124,11 +124,6 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/gerenciador_de_estados/maquina_de_estados.gd" }, { -"base": "Node", -"class": "MenuOpcoes", -"language": "GDScript", -"path": "res://recursos/jogos/enchente/menu_de_opcoes/MenuOpcoesEnchente.gd" -}, { "base": "KinematicBody", "class": "Obstaculo", "language": "GDScript", @@ -178,7 +173,6 @@ _global_script_class_icons={ "GeradorObjeto": "", "HistoryRow": "", "MaquinaDeEstados": "", -"MenuOpcoes": "", "Obstaculo": "", "PlayerLane3D": "", "SaveFile": "", @@ -200,13 +194,15 @@ default_bus_layout="res://elementos/audio/mixer/mixer.tres" EnchenteEstadoDeJogo="*res://recursos/jogos/enchente/scripts/EnchenteEstadoDeJogo.gd" TrocadorDeCenas="*res://addons/trocador_de_cenas/trocador_de_cenas.tscn" -SingletonOpcoesGlobais="*res://recursos/jogos/enchente/menu_de_opcoes/SingletonOpcoesGlobais.gd" +SingletonOpcoesGlobais="*res://recursos/Menu_principal/SingletonOpcoesGlobais.gd" Salvamento="*res://addons/salvamento/Salvamento.gd" [display] window/size/width=720 window/size/height=1280 +window/size/test_width=360 +window/size/test_height=640 window/handheld/orientation="portrait" window/stretch/mode="2d" window/stretch/aspect="expand" diff --git a/projeto/recursos/feed_de_noticias/.gitkeep b/projeto/recursos/Menu_principal/.gitkeep similarity index 100% rename from projeto/recursos/feed_de_noticias/.gitkeep rename to projeto/recursos/Menu_principal/.gitkeep diff --git a/projeto/recursos/feed_de_noticias/AudioStreamEfeitos.gd b/projeto/recursos/Menu_principal/AudioStreamEfeitos.gd similarity index 100% rename from projeto/recursos/feed_de_noticias/AudioStreamEfeitos.gd rename to projeto/recursos/Menu_principal/AudioStreamEfeitos.gd diff --git a/projeto/recursos/feed_de_noticias/Cards.json b/projeto/recursos/Menu_principal/Cards.json similarity index 100% rename from projeto/recursos/feed_de_noticias/Cards.json rename to projeto/recursos/Menu_principal/Cards.json diff --git a/projeto/recursos/Menu_principal/Menu_Principal.tscn b/projeto/recursos/Menu_principal/Menu_Principal.tscn new file mode 100644 index 0000000..9904cf6 --- /dev/null +++ b/projeto/recursos/Menu_principal/Menu_Principal.tscn @@ -0,0 +1,174 @@ +[gd_scene load_steps=25 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] +[ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/btn_opcoes_normal.png" type="Texture" id=3] +[ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/transparency_BG.png" type="Texture" id=4] +[ext_resource path="res://elementos/audio/bgm/hub/hub-menu.mp3" type="AudioStream" id=5] +[ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/logo.png" type="Texture" id=6] +[ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/Titulo.png" type="Texture" id=7] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/Menu.gd" type="Script" id=8] +[ext_resource path="res://recursos/jogos/enchente/cenas/Enchente.tscn" type="PackedScene" id=9] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0007.png" type="Texture" id=10] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0001.png" type="Texture" id=11] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0005.png" type="Texture" id=12] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0003.png" type="Texture" id=13] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0004.png" type="Texture" id=14] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0009.png" type="Texture" id=15] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0010.png" type="Texture" id=16] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0002.png" type="Texture" id=17] +[ext_resource path="res://elementos/UI/minigame_senhorinha/bandeira/Timeline 1_0000.png" type="Texture" id=18] +[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] + +[sub_resource type="Shader" id=1] +code = "shader_type canvas_item; + +uniform float speed = 80; +uniform vec2 dir = vec2(1.0, 0.0); + +void fragment(){ + COLOR = texture(TEXTURE, mod(UV + (TIME / speed) * dir, 1.0)); +}" + +[sub_resource type="ShaderMaterial" id=2] +shader = SubResource( 1 ) +shader_param/speed = 80.0 +shader_param/dir = Vector2( 1, 0 ) + +[sub_resource type="SpriteFrames" id=3] +animations = [ { +"frames": [ ExtResource( 18 ), ExtResource( 11 ), ExtResource( 17 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 19 ), ExtResource( 10 ), ExtResource( 20 ), ExtResource( 15 ), ExtResource( 16 ) ], +"loop": true, +"name": "default", +"speed": 12.0 +} ] + +[node name="Menu_Principal" type="Control"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -360.0 +margin_top = -640.0 +margin_right = 360.0 +margin_bottom = 640.0 +rect_pivot_offset = Vector2( -1026, 372 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource( 8 ) +proxima_cena = ExtResource( 9 ) + +[node name="AudioStreamBGM" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) +autoplay = true +bus = "BGM Track" + +[node name="Background" type="CanvasLayer" parent="."] + +[node name="Bg_3" type="TextureRect" parent="Background"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -1330.0 +margin_top = -772.0 +margin_right = 1331.0 +margin_bottom = 793.0 +texture = ExtResource( 21 ) +stretch_mode = 1 + +[node name="Bg_2" type="TextureRect" parent="Background"] +material = SubResource( 2 ) +anchor_left = 0.5 +anchor_top = 0.233 +anchor_right = 0.5 +anchor_bottom = 0.233 +margin_left = -1631.0 +margin_top = -352.24 +margin_right = 1653.0 +margin_bottom = 501.76 +texture = ExtResource( 1 ) +stretch_mode = 6 + +[node name="Bg_1" type="TextureRect" parent="Background"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -1336.0 +margin_top = -771.0 +margin_right = 1336.0 +margin_bottom = 786.0 +texture = ExtResource( 4 ) +stretch_mode = 1 + +[node name="Logo" type="TextureRect" parent="Background"] +anchor_left = 0.5 +anchor_top = 0.088 +anchor_right = 0.5 +anchor_bottom = 0.088 +margin_left = -61.0 +margin_top = -61.64 +margin_right = 30.9998 +margin_bottom = 30.36 +rect_scale = Vector2( 1.33029, 1.33029 ) +texture = ExtResource( 6 ) +stretch_mode = 6 + +[node name="Titulo" type="TextureRect" parent="Background"] +anchor_left = 0.503 +anchor_top = 0.341 +anchor_right = 0.503 +anchor_bottom = 0.341 +margin_left = -225.16 +margin_top = -91.4801 +margin_right = 113.84 +margin_bottom = 80.52 +rect_scale = Vector2( 1.33029, 1.33029 ) +texture = ExtResource( 7 ) +stretch_mode = 6 + +[node name="Bandeira" type="AnimatedSprite" parent="Background"] +position = Vector2( 361, 1041 ) +scale = Vector2( 0.329724, 0.329724 ) +frames = SubResource( 3 ) +playing = true + +[node name="Buttons" type="CanvasLayer" parent="."] + +[node name="Btn_Opcoes" type="TextureButton" parent="Buttons"] +anchor_left = 0.5 +anchor_top = 0.862 +anchor_right = 0.5 +anchor_bottom = 0.862 +margin_left = -173.0 +margin_top = -61.3601 +margin_right = 177.0 +margin_bottom = 61.6399 +rect_pivot_offset = Vector2( 175, 61 ) +texture_normal = ExtResource( 3 ) +expand = true +stretch_mode = 5 + +[node name="tween_opcoes" type="Tween" parent="Buttons/Btn_Opcoes"] + +[node name="Btn_Jogar" type="TextureButton" parent="Buttons"] +anchor_left = 0.5 +anchor_top = 0.746 +anchor_right = 0.5 +anchor_bottom = 0.746 +margin_left = -173.0 +margin_top = -61.88 +margin_right = 177.0 +margin_bottom = 61.12 +rect_pivot_offset = Vector2( 175, 61 ) +texture_normal = ExtResource( 2 ) +expand = true +stretch_mode = 5 + +[node name="tween_jogar" type="Tween" parent="Buttons/Btn_Jogar"] + +[connection signal="button_up" from="Buttons/Btn_Opcoes" to="." method="_on_opcoes_button_up"] +[connection signal="button_up" from="Buttons/Btn_Jogar" to="." method="_on_Jogar_button_up"] diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/SingletonOpcoesGlobais.gd b/projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd similarity index 100% rename from projeto/recursos/jogos/enchente/menu_de_opcoes/SingletonOpcoesGlobais.gd rename to projeto/recursos/Menu_principal/SingletonOpcoesGlobais.gd diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd b/projeto/recursos/Menu_principal/TelasExtras/ManuseadorDaDescricaoAvancada.gd similarity index 100% rename from projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd rename to projeto/recursos/Menu_principal/TelasExtras/ManuseadorDaDescricaoAvancada.gd diff --git a/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn b/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn new file mode 100644 index 0000000..91db3ab --- /dev/null +++ b/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn @@ -0,0 +1,109 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/moldura.png" type="Texture" id=2] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Normal.png" type="Texture" id=3] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=4] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Hovered.png" type="Texture" id=5] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Derrota/derrota.png" type="Texture" id=6] +[ext_resource path="res://recursos/Menu_principal/TelasExtras/vitoria_derrota.gd" type="Script" id=7] + +[sub_resource type="DynamicFont" id=1] +size = 24 +font_data = ExtResource( 1 ) + +[node name="Tela_Derrota" type="Control"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -360.0 +margin_top = -640.0 +margin_right = 360.0 +margin_bottom = 640.0 +rect_pivot_offset = Vector2( -1549, 0 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource( 7 ) + +[node name="Transparencia" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.0862745, 0.0862745, 0.0862745, 0.301961 ) + +[node name="Menu" type="TextureRect" parent="."] +pause_mode = 2 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -303.0 +margin_top = -313.5 +margin_right = 303.0 +margin_bottom = 313.5 +mouse_filter = 0 +texture = ExtResource( 2 ) +expand = true +stretch_mode = 1 + +[node name="Label" type="Label" parent="Menu"] +anchor_left = 0.507 +anchor_top = 0.569 +anchor_right = 0.507 +anchor_bottom = 0.569 +margin_left = -126.242 +margin_top = -17.263 +margin_right = 126.758 +margin_bottom = 16.737 +rect_pivot_offset = Vector2( -705.917, -239.382 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 1 ) +text = "não foi dessa vez!" +align = 1 +valign = 1 + +[node name="icon" type="TextureRect" parent="Menu"] +pause_mode = 2 +anchor_left = 0.5 +anchor_top = 0.354 +anchor_right = 0.5 +anchor_bottom = 0.354 +margin_left = -93.0 +margin_top = -97.458 +margin_right = 101.0 +margin_bottom = 97.542 +mouse_filter = 0 +texture = ExtResource( 6 ) +stretch_mode = 4 + +[node name="VoltarMenu" type="TextureButton" parent="Menu"] +anchor_left = 0.303846 +anchor_top = 0.818386 +anchor_right = 0.694231 +anchor_bottom = 0.93722 +toggle_mode = true +texture_normal = ExtResource( 3 ) +texture_pressed = ExtResource( 4 ) +texture_hover = ExtResource( 5 ) +expand = true +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Label" type="Label" parent="Menu/VoltarMenu"] +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 +rect_pivot_offset = Vector2( -705.917, -239.382 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 1 ) +text = "voltar ao menu" +align = 1 +valign = 1 + +[connection signal="button_up" from="Menu/VoltarMenu" to="." method="_on_VoltarMenu_button_up"] diff --git a/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn b/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn new file mode 100644 index 0000000..2a4f26a --- /dev/null +++ b/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn @@ -0,0 +1,108 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/moldura.png" type="Texture" id=2] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Normal.png" type="Texture" id=3] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=4] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Hovered.png" type="Texture" id=5] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Vitoria/vitoria.png" type="Texture" id=6] +[ext_resource path="res://recursos/Menu_principal/TelasExtras/vitoria_derrota.gd" type="Script" id=7] + +[sub_resource type="DynamicFont" id=1] +size = 24 +font_data = ExtResource( 1 ) + +[node name="Tela_Vitoria" type="Control"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -360.0 +margin_top = -640.0 +margin_right = 360.0 +margin_bottom = 640.0 +rect_pivot_offset = Vector2( -1361, 0 ) +size_flags_horizontal = 3 +size_flags_vertical = 3 +script = ExtResource( 7 ) + +[node name="Transparencia" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.0862745, 0.0862745, 0.0862745, 0.301961 ) + +[node name="Menu" type="TextureRect" parent="."] +pause_mode = 2 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -303.0 +margin_top = -313.5 +margin_right = 303.0 +margin_bottom = 313.5 +mouse_filter = 0 +texture = ExtResource( 2 ) +expand = true +stretch_mode = 1 + +[node name="Label" type="Label" parent="Menu"] +anchor_left = 0.5 +anchor_top = 0.569 +anchor_right = 0.5 +anchor_bottom = 0.569 +margin_left = -118.0 +margin_top = -17.263 +margin_right = 135.0 +margin_bottom = 16.737 +rect_pivot_offset = Vector2( -705.917, -239.382 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 1 ) +text = "parabéns você venceu!" +align = 1 +valign = 1 + +[node name="icon" type="TextureRect" parent="Menu"] +pause_mode = 2 +anchor_left = 0.505 +anchor_top = 0.36 +anchor_right = 0.505 +anchor_bottom = 0.36 +margin_left = -135.03 +margin_top = -110.72 +margin_right = 134.97 +margin_bottom = 110.28 +mouse_filter = 0 +texture = ExtResource( 6 ) +expand = true +stretch_mode = 5 + +[node name="VoltarMenu" type="TextureButton" parent="Menu"] +anchor_left = 0.303846 +anchor_top = 0.818386 +anchor_right = 0.694231 +anchor_bottom = 0.93722 +toggle_mode = true +texture_normal = ExtResource( 3 ) +texture_pressed = ExtResource( 4 ) +texture_hover = ExtResource( 5 ) +expand = true +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Label" type="Label" parent="Menu/VoltarMenu"] +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 +rect_pivot_offset = Vector2( -705.917, -239.382 ) +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 1 ) +text = "voltar ao menu" +align = 1 +valign = 1 diff --git a/projeto/recursos/Menu_principal/TelasExtras/vitoria_derrota.gd b/projeto/recursos/Menu_principal/TelasExtras/vitoria_derrota.gd new file mode 100644 index 0000000..db8dd2d --- /dev/null +++ b/projeto/recursos/Menu_principal/TelasExtras/vitoria_derrota.gd @@ -0,0 +1,12 @@ +extends Node + +export var menupath: String = 'res://recursos/Menu_principal/Menu_Principal.tscn' + + +func _ready(): + pass # Replace with function body. + + +func _on_VoltarMenu_button_up(): + get_tree().paused = false + TrocadorDeCenas.trocar_cena(menupath) diff --git a/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn b/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn new file mode 100644 index 0000000..6cb78fa --- /dev/null +++ b/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn @@ -0,0 +1,30 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/BotaoPause.png" type="Texture" id=1] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/botaoMenu.gd" type="Script" id=2] + +[node name="BotaoMenu" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 2 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] +layer = 5 + +[node name="Menu" type="TextureButton" parent="CanvasLayer"] +anchor_left = 0.830556 +anchor_top = 0.0828125 +anchor_right = 0.952778 +anchor_bottom = 0.151562 +margin_right = 0.000183105 +margin_bottom = 0.000640869 +rect_pivot_offset = Vector2( 44, 44 ) +texture_normal = ExtResource( 1 ) +expand = true +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Tween" type="Tween" parent="CanvasLayer/Menu"] + +[connection signal="button_up" from="CanvasLayer/Menu" to="." method="_on_Menu_button_up"] diff --git a/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd b/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd new file mode 100644 index 0000000..312a2f9 --- /dev/null +++ b/projeto/recursos/Menu_principal/menu_opcoes/Menu.gd @@ -0,0 +1,50 @@ +extends Control + +onready var opcoesMenu = preload("res://recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn") +onready var audio_stream_bgm = $AudioStreamBGM +onready var tween_jogar = $Buttons/Btn_Jogar/tween_jogar +onready var tween_opcoes = $Buttons/Btn_Opcoes/tween_opcoes + +export(PackedScene) var proxima_cena: PackedScene + +var _volume_atual: float = 999 +var opcoes_apertado: bool = false +var jogar_apertado: bool = false + +func _ready(): + SingletonOpcoesGlobais.connect("Atualizou", self, "_atualizar_volume") + _atualizar_volume() + +func _atualizar_volume(): + if SingletonOpcoesGlobais.volumeSom != _volume_atual: + _volume_atual = SingletonOpcoesGlobais.volumeSom + if _volume_atual == 0: + audio_stream_bgm.stream_paused = true + else: + audio_stream_bgm.stream_paused = false + audio_stream_bgm.volume_db = range_lerp(_volume_atual, 1, 100, -30, 0) + +func _on_opcoes_button_up(): + opcoes_apertado = true + tween_opcoes.interpolate_property($Buttons/Btn_Opcoes, 'rect_scale', Vector2(1,1), Vector2(1.2,1.2), 0.45, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween_opcoes.interpolate_property($Buttons/Btn_Opcoes, 'rect_scale', Vector2(1.2,1.2), Vector2(1,1), 0.45, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween_opcoes.start() + $Buttons/Btn_Opcoes.disabled = true + yield(tween_opcoes, "tween_completed") + var instanciaMenu = opcoesMenu.instance() + if opcoes_apertado and jogar_apertado == false: + get_tree().get_root().add_child(instanciaMenu) + $Buttons/Btn_Opcoes.disabled = false + opcoes_apertado = false + +func _on_Jogar_button_up(): + jogar_apertado = true + tween_jogar.interpolate_property($Buttons/Btn_Jogar, 'rect_scale', Vector2(1,1), Vector2(1.2,1.2), 0.45, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween_jogar.interpolate_property($Buttons/Btn_Jogar, 'rect_scale', Vector2(1.2,1.2), Vector2(1,1), 0.45, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween_jogar.start() + $Buttons/Btn_Jogar.disabled = true + yield(tween_jogar, "tween_completed") + if jogar_apertado and opcoes_apertado == false: + TrocadorDeCenas.trocar_cena(proxima_cena.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 new file mode 100644 index 0000000..30e3aba --- /dev/null +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn @@ -0,0 +1,183 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Normal.png" type="Texture" id=1] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=2] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Hovered.png" type="Texture" id=3] +[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=4] +[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/moldura.png" type="Texture" id=5] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd" type="Script" id=6] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres" type="Theme" id=7] + +[sub_resource type="DynamicFont" id=2] +size = 24 +font_data = ExtResource( 4 ) + +[node name="MenuDeOpcoes" type="CanvasLayer"] +pause_mode = 2 +script = ExtResource( 6 ) + +[node name="MenuDeOpcoes" type="Control" parent="."] +pause_mode = 2 +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="Transparencia" type="ColorRect" parent="MenuDeOpcoes"] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.0862745, 0.0862745, 0.0862745, 0.301961 ) + +[node name="Menu" type="TextureRect" parent="MenuDeOpcoes"] +pause_mode = 2 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -260.0 +margin_top = -223.0 +margin_right = 260.0 +margin_bottom = 223.0 +mouse_filter = 0 +texture = ExtResource( 5 ) +expand = true +stretch_mode = 7 + +[node name="VolumeEfeitos" type="HSlider" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.436538 +anchor_top = 0.320628 +anchor_right = 0.829077 +anchor_bottom = 0.43296 +margin_top = 1.52588e-05 +margin_right = 224.88 +margin_bottom = 9.89999 +rect_scale = Vector2( 0.599953, 0.599953 ) +theme = ExtResource( 7 ) +scrollable = false +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="VolumeMusica" type="HSlider" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.438462 +anchor_top = 0.159193 +anchor_right = 1.26346 +anchor_bottom = 0.293722 +rect_scale = Vector2( 0.594453, 0.594453 ) +theme = ExtResource( 7 ) +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="VoltarMenu" type="TextureButton" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.303846 +anchor_top = 0.818386 +anchor_right = 0.694231 +anchor_bottom = 0.93722 +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 +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 = "voltar ao menu" +align = 1 +valign = 1 + +[node name="VoltarJogo" type="TextureButton" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.303846 +anchor_top = 0.70852 +anchor_right = 0.694231 +anchor_bottom = 0.827354 +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/VoltarJogo"] +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 = "voltar ao jogo" +align = 1 +valign = 1 + +[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.0442308 +anchor_top = 0.154709 +anchor_right = 0.409615 +anchor_bottom = 0.230942 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 2 ) +text = "volume música" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Porcentagem" type="Label" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.755769 +anchor_top = 0.112108 +anchor_right = 0.940385 +anchor_bottom = 0.199552 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 2 ) +text = "0%" +align = 1 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Titulo2" type="Label" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.0596154 +anchor_top = 0.316143 +anchor_right = 0.425 +anchor_bottom = 0.392377 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 2 ) +text = "volume efeitos" +align = 1 +valign = 1 +__meta__ = { +"_edit_use_anchors_": true +} + +[node name="Porcentagem2" type="Label" parent="MenuDeOpcoes/Menu"] +anchor_left = 0.761538 +anchor_top = 0.2713 +anchor_right = 0.946154 +anchor_bottom = 0.381166 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 2 ) +text = "0%" +align = 1 +__meta__ = { +"_edit_use_anchors_": true +} + +[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"] diff --git a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuOpcoesEnchentefeed.gd b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd similarity index 60% rename from projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuOpcoesEnchentefeed.gd rename to projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd index 6bd4b4e..b67f3fa 100644 --- a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuOpcoesEnchentefeed.gd +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd @@ -4,11 +4,12 @@ onready var SingletonGlobal = SingletonOpcoesGlobais onready var menu: TextureRect = $MenuDeOpcoes/Menu onready var musicaWheel: HSlider = $MenuDeOpcoes/Menu/VolumeMusica onready var efeitosWheel: HSlider = $MenuDeOpcoes/Menu/VolumeEfeitos -onready var porcentagemMusicaWheel: Label = $MenuDeOpcoes/Menu/VolumeMusica/Porcentagem -onready var porcentagemEfeitosWheel: Label = $MenuDeOpcoes/Menu/VolumeEfeitos/Porcentagem -onready var menuFeed: TextureButton = $MenuDeOpcoes/Menu/VoltarMenuFeed +onready var porcentagemMusicaWheel: Label = $MenuDeOpcoes/Menu/Porcentagem +onready var porcentagemEfeitosWheel: Label = $MenuDeOpcoes/Menu/Porcentagem2 +onready var voltarmenu: TextureButton = $MenuDeOpcoes/Menu/VoltarMenu +onready var voltarjogo: TextureButton = $MenuDeOpcoes/Menu/VoltarJogo -export var voltarJogo: String = '' +export var menupath: String = 'res://recursos/Menu_principal/Menu_Principal.tscn' func _ready(): print(SingletonGlobal.ativarBotoes) @@ -20,6 +21,14 @@ func _ready(): efeitosWheel.value = SingletonGlobal.volumeSFX porcentagemEfeitosWheel.text = str(efeitosWheel.value) + '%' + if get_tree().get_current_scene().get_name() == "Enchente": + #print(get_tree().get_current_scene().get_name()) + pass + else: + voltarmenu.visible = false + $MenuDeOpcoes/Menu/VoltarJogo/Label.text = "voltar ao menu" + #print(get_tree().get_current_scene().get_name()) + func _input(event): var valorMusicaGlobal = musicaWheel.value var valorSfxGlobal = efeitosWheel.value @@ -29,8 +38,13 @@ func _input(event): SingletonGlobal.volumeSFX = valorSfxGlobal SingletonOpcoesGlobais.salvar_globais() -func _on_VoltarMenuFeed_button_up(): +func _on_VoltarJogo_button_up(): + get_tree().paused = false + self.queue_free() + +func _on_VoltarMenu_button_up(): get_tree().paused = false + TrocadorDeCenas.trocar_cena(menupath) self.queue_free() func _process(delta): diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres similarity index 98% rename from projeto/recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres rename to projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres index e821602..f73ec03 100644 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres +++ b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres @@ -1,10 +1,4 @@ -[gd_resource type="Theme" load_steps=39 format=2] - -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Slider/botao.png" type="Texture" id=1] -[ext_resource path="res://elementos/imagem/imgs_menu_opcoes_enchente/Unchecked.png" type="Texture" id=2] -[ext_resource path="res://elementos/imagem/imgs_menu_opcoes_enchente/Checked.png" type="Texture" id=3] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda.tres" type="StyleBox" id=4] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Slider/slider.png" type="Texture" id=5] +[gd_resource type="Theme" load_steps=34 format=2] [sub_resource type="StyleBoxEmpty" id=4] @@ -31,7 +25,7 @@ size = Vector2( 128, 256 ) [sub_resource type="BitmapFont" id=12] textures = [ SubResource( 11 ) ] -chars = PoolIntArray( 32, 0, 0, 0, 0, 0, 0, 11, 4, 160, 0, 1734439808, 0, 0, 0, 0, 11, 4, 96, 0, 2, 216, 3, 2, 3, 0, 8, 192, 0, 32, 16, 11, 13, -1, -2, 9, 224, 0, 85, 180, 5, 11, 1, 0, 7, 64, 0, 72, 34, 10, 11, 1, 1, 12, 97, 0, 76, 188, 5, 8, 1, 3, 7, 65, 0, 2, 16, 11, 10, -1, 1, 9, 161, 0, 2, 222, 2, 11, 1, 3, 4, 193, 0, 17, 16, 11, 13, -1, -2, 9, 225, 0, 112, 169, 5, 11, 1, 0, 7, 33, 0, 65, 234, 2, 10, 1, 1, 4, 34, 0, 49, 187, 5, 4, 1, 1, 6, 162, 0, 12, 136, 6, 10, 1, 1, 8, 66, 0, 46, 109, 7, 10, 1, 1, 9, 194, 0, 113, 2, 11, 13, -1, -2, 9, 226, 0, 72, 143, 6, 11, 1, 0, 7, 98, 0, 102, 165, 6, 11, 1, 0, 8, 99, 0, 40, 179, 5, 8, 1, 3, 7, 67, 0, 68, 115, 7, 10, 1, 1, 8, 227, 0, 2, 155, 6, 12, 1, -1, 7, 195, 0, 53, 2, 11, 14, -1, -3, 9, 163, 0, 22, 167, 6, 10, 1, 1, 8, 35, 0, 78, 66, 8, 10, 0, 1, 9, 164, 0, 14, 79, 8, 7, 0, 3, 8, 68, 0, 90, 66, 8, 10, 1, 1, 10, 100, 0, 82, 150, 6, 11, 1, 0, 8, 36, 0, 102, 137, 6, 12, 1, 0, 8, 196, 0, 98, 2, 11, 13, -1, -2, 9, 228, 0, 121, 169, 5, 11, 1, 0, 7, 101, 0, 32, 124, 6, 8, 1, 3, 8, 197, 0, 83, 2, 11, 12, -1, -1, 9, 229, 0, 20, 196, 5, 12, 1, -1, 7, 165, 0, 79, 98, 7, 10, 0, 1, 8, 69, 0, 29, 191, 5, 10, 1, 1, 7, 37, 0, 2, 30, 10, 10, 1, 1, 12, 230, 0, 58, 34, 10, 8, 1, 3, 12, 102, 0, 2, 201, 5, 11, 0, 0, 4, 166, 0, 95, 228, 2, 14, 3, 0, 7, 198, 0, 21, 2, 12, 10, -1, 1, 12, 70, 0, 101, 105, 6, 10, 1, 1, 7, 38, 0, 67, 49, 9, 10, 1, 1, 10, 39, 0, 119, 219, 2, 4, 1, 1, 3, 167, 0, 112, 131, 6, 11, 0, 0, 7, 103, 0, 13, 107, 7, 11, 1, 3, 7, 199, 0, 57, 97, 7, 13, 1, 1, 8, 231, 0, 2, 186, 5, 11, 1, 3, 7, 71, 0, 66, 65, 8, 10, 1, 1, 10, 168, 0, 77, 217, 4, 2, 2, 0, 8, 104, 0, 72, 158, 6, 11, 1, 0, 8, 40, 0, 93, 212, 4, 12, 1, 1, 4, 200, 0, 47, 195, 5, 13, 1, -2, 7, 232, 0, 62, 143, 6, 11, 1, 0, 8, 72, 0, 54, 65, 8, 10, 1, 1, 10, 105, 0, 109, 213, 3, 11, 0, 0, 4, 41, 0, 51, 226, 3, 12, 0, 1, 4, 201, 0, 56, 197, 5, 13, 1, -2, 7, 233, 0, 52, 142, 6, 11, 1, 0, 8, 169, 0, 44, 34, 10, 10, 1, 1, 12, 73, 0, 38, 191, 5, 10, 0, 1, 5, 170, 0, 29, 205, 4, 5, 0, 1, 5, 42, 0, 108, 80, 7, 6, 0, 0, 8, 202, 0, 65, 202, 5, 13, 1, -2, 7, 74, 0, 92, 195, 5, 13, -2, 1, 3, 106, 0, 101, 213, 4, 14, -1, 0, 4, 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, 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, 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, 118, 0, 15, 47, 9, 8, -1, 3, 7, 182, 0, 68, 98, 7, 13, 1, 0, 9, 214, 0, 80, 49, 9, 13, 1, -2, 11, 246, 0, 72, 173, 6, 11, 1, 0, 8, 86, 0, 76, 18, 10, 10, -1, 1, 8, 54, 0, 82, 121, 6, 10, 1, 1, 8, 183, 0, 77, 223, 2, 2, 1, 5, 4, 215, 0, 2, 93, 7, 7, 0, 3, 8, 247, 0, 90, 94, 7, 7, 0, 3, 8, 119, 0, 37, 2, 12, 8, -1, 3, 10, 87, 0, 2, 2, 15, 10, -1, 1, 13, 55, 0, 72, 129, 6, 10, 1, 1, 8, 184, 0, 116, 212, 3, 3, 0, 11, 3, 120, 0, 119, 80, 7, 8, 0, 3, 7, 248, 0, 2, 128, 6, 8, 1, 3, 8, 216, 0, 99, 33, 9, 12, 1, 0, 11, 88, 0, 90, 19, 10, 10, -1, 1, 8, 56, 0, 62, 129, 6, 10, 1, 1, 8, 185, 0, 23, 229, 3, 6, 0, 1, 5, 57, 0, 12, 122, 6, 10, 1, 1, 8, 121, 0, 112, 33, 9, 11, -1, 3, 7, 249, 0, 52, 157, 6, 11, 1, 0, 8, 217, 0, 38, 80, 8, 13, 1, -2, 10, 89, 0, 28, 65, 9, 10, -1, 1, 7, 186, 0, 37, 205, 4, 5, 0, 1, 5, 58, 0, 89, 229, 2, 8, 1, 3, 4, 122, 0, 112, 119, 6, 8, 1, 3, 7, 90, 0, 32, 136, 6, 10, 1, 1, 8, 250, 0, 42, 149, 6, 11, 1, 0, 8, 218, 0, 26, 79, 8, 13, 1, -2, 10, 187, 0, 31, 181, 5, 6, 1, 4, 7, 59, 0, 71, 234, 2, 9, 1, 3, 4, 251, 0, 12, 150, 6, 11, 1, 0, 8, 123, 0, 103, 180, 5, 12, 0, 1, 5, 91, 0, 58, 227, 3, 12, 1, 1, 4, 219, 0, 50, 80, 8, 13, 1, -2, 10, 60, 0, 92, 153, 6, 7, 1, 3, 8, 92, 0, 97, 80, 7, 10, -1, 1, 5, 252, 0, 92, 133, 6, 11, 1, 0, 8, 220, 0, 62, 79, 8, 13, 1, -2, 10, 124, 0, 83, 229, 2, 14, 3, 0, 7, 188, 0, 16, 33, 10, 10, 0, 1, 10, 61, 0, 79, 112, 7, 5, 0, 4, 8, 125, 0, 110, 196, 5, 12, 0, 1, 5, 93, 0, 44, 226, 3, 12, 0, 1, 4, 221, 0, 54, 48, 9, 13, -1, -2, 7, 253, 0, 28, 47, 9, 14, -1, 0, 7, 189, 0, 47, 20, 11, 10, 0, 1, 10, 126, 0, 62, 158, 6, 3, 1, 5, 8, 94, 0, 86, 80, 7, 6, 0, 1, 7, 62, 0, 112, 158, 6, 7, 1, 3, 8, 254, 0, 102, 119, 6, 14, 1, 0, 8, 222, 0, 32, 165, 6, 10, 1, 1, 8, 190, 0, 104, 19, 10, 10, 0, 1, 10, 95, 0, 92, 148, 6, 1, 0, 12, 6, 63, 0, 74, 202, 5, 10, 0, 1, 6, 191, 0, 94, 180, 5, 11, 0, 3, 6, 255, 0, 41, 48, 9, 14, -1, 0, 7, 223, 0, 82, 135, 6, 11, 1, 0, 8 ) +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 ) [sub_resource type="Image" id=35] data = { @@ -190,12 +184,8 @@ margin_top = 4.0 margin_bottom = 4.0 [sub_resource type="StyleBoxTexture" id=33] -texture = ExtResource( 5 ) -region_rect = Rect2( 0, 0, 144, 6 ) -margin_left = 4.0 -margin_right = 4.0 -margin_top = 4.0 -margin_bottom = 4.0 +region_rect = Rect2( 1.14131, 3.66424, 429.781, 16.1113 ) +margin_top = 23.4698 [sub_resource type="StyleBoxEmpty" id=9] @@ -206,7 +196,7 @@ margin_bottom = 4.0 [sub_resource type="StyleBoxEmpty" id=3] [resource] -/styles/UiRedonda = ExtResource( 4 ) +/styles/UiRedonda = null Button/colors/font_color = Color( 0, 0, 0, 1 ) Button/colors/font_color_disabled = Color( 0, 0, 0, 1 ) Button/colors/font_color_focus = Color( 0, 0, 0, 1 ) @@ -235,13 +225,13 @@ CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 ) CheckBox/constants/check_vadjust = 0 CheckBox/constants/hseparation = 4 CheckBox/fonts/font = SubResource( 12 ) -CheckBox/icons/checked = ExtResource( 3 ) +CheckBox/icons/checked = null CheckBox/icons/checked_disabled = SubResource( 14 ) CheckBox/icons/radio_checked = SubResource( 16 ) CheckBox/icons/radio_checked_disabled = SubResource( 18 ) CheckBox/icons/radio_unchecked = SubResource( 20 ) CheckBox/icons/radio_unchecked_disabled = SubResource( 22 ) -CheckBox/icons/unchecked = ExtResource( 2 ) +CheckBox/icons/unchecked = null CheckBox/icons/unchecked_disabled = SubResource( 24 ) CheckBox/styles/disabled = SubResource( 25 ) CheckBox/styles/focus = SubResource( 28 ) @@ -260,14 +250,14 @@ HScrollBar/styles/grabber_highlight = null HScrollBar/styles/grabber_pressed = null HScrollBar/styles/scroll = null HScrollBar/styles/scroll_focus = null -HSlider/icons/grabber = ExtResource( 1 ) -HSlider/icons/grabber_disabled = ExtResource( 1 ) -HSlider/icons/grabber_highlight = ExtResource( 1 ) +HSlider/icons/grabber = null +HSlider/icons/grabber_disabled = null +HSlider/icons/grabber_highlight = null HSlider/icons/tick = null HSlider/styles/grabber_area = SubResource( 29 ) HSlider/styles/grabber_area_highlight = SubResource( 32 ) HSlider/styles/slider = SubResource( 33 ) -Panel/styles/panel = ExtResource( 4 ) +Panel/styles/panel = null ScrollContainer/styles/bg = null Tree/constants/scroll_border = 4 Tree/constants/scroll_speed = 12 diff --git a/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd b/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd new file mode 100644 index 0000000..5a8e737 --- /dev/null +++ b/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd @@ -0,0 +1,16 @@ +extends Node + +onready var opcoesMenu = preload("res://recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn") +onready var tween = $CanvasLayer/Menu/Tween + +var menuApertado: bool = false + +func _on_Menu_button_up(): + menuApertado = true + var instanciaMenu = opcoesMenu.instance() + if menuApertado: + tween.interpolate_property($CanvasLayer/Menu, "rect_scale", Vector2(1,1), Vector2(1.2,1.2), 0.4, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween.interpolate_property($CanvasLayer/Menu, "rect_scale", Vector2(1.2,1.2), Vector2(1,1), 0.4, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + tween.start() + yield(tween, "tween_completed") + get_tree().get_root().add_child(instanciaMenu) diff --git a/projeto/recursos/abertura/abertura.tscn b/projeto/recursos/abertura/abertura.tscn index 14ec6dd..5ad6bb2 100644 --- a/projeto/recursos/abertura/abertura.tscn +++ b/projeto/recursos/abertura/abertura.tscn @@ -2,7 +2,7 @@ [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] -[ext_resource path="res://recursos/feed_de_noticias/feed_de_noticia.tscn" type="PackedScene" id=3] +[ext_resource path="res://recursos/Menu_principal/Menu_Principal.tscn" type="PackedScene" id=3] [ext_resource path="res://elementos/audio/bgm/splash/splash-vinheta.mp3" type="AudioStream" id=4] [sub_resource type="Animation" id=2] diff --git a/projeto/recursos/enviroment/enviroment_padrao.tres b/projeto/recursos/enviroment/enviroment_padrao.tres index 87170e4..5f16beb 100644 --- a/projeto/recursos/enviroment/enviroment_padrao.tres +++ b/projeto/recursos/enviroment/enviroment_padrao.tres @@ -8,7 +8,6 @@ panorama = ExtResource( 1 ) [resource] background_mode = 2 background_sky = SubResource( 1 ) -background_sky_orientation = Basis( 0.45399, 0, 0.891007, 0, 1, 0, -0.891007, 0, 0.45399 ) ambient_light_color = Color( 1, 1, 1, 1 ) ambient_light_sky_contribution = 0.5 fog_enabled = true diff --git a/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn b/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn deleted file mode 100644 index 1c36d05..0000000 --- a/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn +++ /dev/null @@ -1,132 +0,0 @@ -[gd_scene load_steps=12 format=2] - -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres" type="Theme" id=1] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia.png" type="Texture" id=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png" type="Texture" id=3] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png" type="Texture" id=4] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png" type="Texture" id=5] -[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=6] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd" type="Script" id=7] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_pressed.png" type="Texture" id=9] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png" type="Texture" id=10] - -[sub_resource type="DynamicFont" id=1] -size = 27 -font_data = ExtResource( 6 ) - -[sub_resource type="DynamicFont" id=2] -size = 32 -font_data = ExtResource( 6 ) - -[node name="PainelSaibaMais" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 -script = ExtResource( 7 ) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] -follow_viewport_enable = true - -[node name="PainelDescricao" type="TextureRect" parent="CanvasLayer"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -337.0 -margin_top = 860.0 -margin_right = 337.0 -margin_bottom = 1637.0 -theme = ExtResource( 1 ) -texture = ExtResource( 2 ) -expand = true -stretch_mode = 1 - -[node name="outline" type="TextureRect" parent="CanvasLayer/PainelDescricao"] -anchor_left = 0.5 -anchor_top = 0.501 -anchor_right = 0.5 -anchor_bottom = 0.501 -margin_left = -345.0 -margin_top = -400.277 -margin_right = 348.0 -margin_bottom = 400.723 -theme = ExtResource( 1 ) -texture = ExtResource( 4 ) -expand = true -stretch_mode = 1 - -[node name="Desc" type="RichTextLabel" parent="CanvasLayer/PainelDescricao"] -anchor_left = 0.5 -anchor_top = 0.44 -anchor_right = 0.5 -anchor_bottom = 0.44 -margin_left = -313.0 -margin_top = -317.88 -margin_right = 309.0 -margin_bottom = 317.12 -custom_colors/default_color = Color( 0, 0, 0, 1 ) -custom_fonts/italics_font = SubResource( 1 ) -custom_fonts/bold_font = SubResource( 1 ) -custom_fonts/normal_font = SubResource( 1 ) -bbcode_enabled = true -bbcode_text = "Coloque Uma Descrição avancada Aqui" -text = "Coloque Uma Descrição avancada Aqui" - -[node name="SaibaMenos" type="TextureButton" parent="CanvasLayer/PainelDescricao"] -anchor_left = 0.502 -anchor_top = -0.026 -anchor_right = 0.502 -anchor_bottom = -0.026 -margin_left = -94.348 -margin_top = -15.798 -margin_right = 66.652 -margin_bottom = 29.202 -rect_scale = Vector2( 1.17494, 0.69494 ) -mouse_filter = 1 -toggle_mode = true -texture_normal = ExtResource( 5 ) -texture_pressed = ExtResource( 3 ) -expand = true -stretch_mode = 4 - -[node name="TweenSaibaMenos" type="Tween" parent="CanvasLayer/PainelDescricao/SaibaMenos"] - -[node name="Jogar" type="TextureButton" parent="CanvasLayer/PainelDescricao"] -anchor_left = 0.512 -anchor_top = 0.936 -anchor_right = 0.512 -anchor_bottom = 0.936 -margin_left = -115.088 -margin_top = -29.272 -margin_right = 114.912 -margin_bottom = 28.728 -mouse_filter = 1 -toggle_mode = true -texture_normal = ExtResource( 10 ) -texture_pressed = ExtResource( 9 ) -expand = true -stretch_mode = 5 - -[node name="TweenJogar" type="Tween" parent="CanvasLayer/PainelDescricao/Jogar"] - -[node name="Jogar" type="Label" parent="CanvasLayer/PainelDescricao/Jogar"] -anchor_left = 0.489 -anchor_top = 0.5 -anchor_right = 0.489 -anchor_bottom = 0.5 -margin_left = -77.47 -margin_top = -21.0 -margin_right = 77.53 -margin_bottom = 18.0 -mouse_filter = 1 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "jogar" -align = 1 -valign = 1 -autowrap = true -max_lines_visible = 10 - -[node name="TweenPainel" type="Tween" parent="CanvasLayer/PainelDescricao"] - -[connection signal="button_up" from="CanvasLayer/PainelDescricao/SaibaMenos" to="." method="_on_SaibaMenos_button_up"] -[connection signal="button_up" from="CanvasLayer/PainelDescricao/Jogar" to="." method="_on_Jogar_button_up"] diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDeAnimacoes.gd b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDeAnimacoes.gd deleted file mode 100644 index 9382b99..0000000 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDeAnimacoes.gd +++ /dev/null @@ -1,40 +0,0 @@ -extends Node - -onready var animacao_coracao: AnimationPlayer = $AnimationPlayer2 -onready var animacao_painel: AnimationPlayer = $AnimationPlayer - -var coracao_apertado: bool = false -var saiba_mais_apertado: bool = false -var saiba_menos_apertado: bool = false - -func _tocar_animacao_coracao(): - if coracao_apertado == false: - animacao_coracao.play("Animação") - yield(animacao_coracao, "animation_finished") - coracao_apertado = true - else: - animacao_coracao.play_backwards("Animação") - yield(animacao_coracao, "animation_finished") - coracao_apertado = false - -func _tocar_animacao_saiba_mais(): - if saiba_mais_apertado: - animacao_painel.play("Transicao") - elif saiba_mais_apertado == false and saiba_menos_apertado: - animacao_painel.play_backwards("Transicao") - - -func _on_coracaobotao_pressed(): - _tocar_animacao_coracao() - -func _on_SaibaMais_pressed(): - saiba_mais_apertado = true - _tocar_animacao_saiba_mais() - yield(animacao_painel, "animation_finished") - saiba_mais_apertado = false - -func _on_SaibaMenos_pressed(): - saiba_menos_apertado = true - _tocar_animacao_saiba_mais() - yield(animacao_painel, "animation_finished") - saiba_menos_apertado = false diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda.tres b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda.tres deleted file mode 100644 index c05cada..0000000 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda.tres +++ /dev/null @@ -1,7 +0,0 @@ -[gd_resource type="StyleBoxFlat" format=2] - -[resource] -bg_color = Color( 0.933333, 0.933333, 0.933333, 1 ) -corner_radius_bottom_right = 15 -corner_radius_bottom_left = 15 -anti_aliasing_size = 0.02 diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda2.tres b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda2.tres deleted file mode 100644 index cbeed15..0000000 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda2.tres +++ /dev/null @@ -1,8 +0,0 @@ -[gd_resource type="StyleBoxFlat" format=2] - -[resource] -bg_color = Color( 0.933333, 0.933333, 0.933333, 1 ) -corner_radius_top_left = 15 -corner_radius_top_right = 15 -corner_radius_bottom_right = 15 -corner_radius_bottom_left = 15 diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn deleted file mode 100644 index 505da13..0000000 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn +++ /dev/null @@ -1,303 +0,0 @@ -[gd_scene load_steps=25 format=2] - -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png" type="Texture" id=1] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres" type="Theme" id=2] -[ext_resource path="res://elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd" type="Script" id=3] -[ext_resource path="res://recursos/feed_de_noticias/AudioStreamEfeitos.gd" type="Script" id=4] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card.png" type="Texture" id=5] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/Group 7.png" type="Texture" id=6] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao3.png" type="Texture" id=7] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao5.png" type="Texture" id=8] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao4.png" type="Texture" id=9] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet (1).png" type="Texture" id=10] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao1.png" type="Texture" id=11] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/coracao2.png" type="Texture" id=12] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like componet.png" type="Texture" id=14] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Comentario.png" type="Texture" id=15] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/UiRedonda2.tres" type="StyleBox" id=16] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png" type="Texture" id=17] -[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=18] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png" type="Texture" id=19] - -[sub_resource type="DynamicFont" id=11] -size = 24 -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=7] -size = 26 -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=8] -size = 26 -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=9] -size = 26 -font_data = ExtResource( 18 ) - -[sub_resource type="DynamicFont" id=6] -size = 26 -font_data = ExtResource( 18 ) - -[sub_resource type="Animation" id=2] -resource_name = "Animação" -length = 0.65 -tracks/0/type = "value" -tracks/0/path = NodePath("../PainelPrincipal/Coracao:texture") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 7 ), ExtResource( 9 ), ExtResource( 8 ), ExtResource( 10 ) ] -} - -[node name="CartaoDeNoticia" type="Control"] -anchor_top = 0.239063 -anchor_right = 1.0 -anchor_bottom = 0.807813 -mouse_filter = 1 -size_flags_horizontal = 3 -size_flags_vertical = 3 -script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": true -} -Imagem_card = ExtResource( 6 ) -E_jogavel = true -img_coracao_nao_apertado = ExtResource( 14 ) -img_coracao_apertado = ExtResource( 10 ) - -[node name="PainelHidden" type="Panel" parent="."] -modulate = Color( 0.776471, 0.776471, 0.776471, 1 ) -anchor_left = 0.307 -anchor_top = 0.508 -anchor_right = 0.307 -anchor_bottom = 0.508 -margin_left = -202.04 -margin_top = -309.824 -margin_right = 187.96 -margin_bottom = 328.176 -rect_rotation = -2.5 -mouse_filter = 1 -theme = ExtResource( 2 ) -custom_styles/panel = ExtResource( 16 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="outline3" type="TextureRect" parent="PainelHidden"] -anchor_left = 0.764 -anchor_top = 0.5 -anchor_right = 0.764 -anchor_bottom = 0.5 -margin_left = -297.656 -margin_top = -317.0 -margin_right = 313.344 -margin_bottom = 339.0 -theme = ExtResource( 2 ) -texture = ExtResource( 5 ) -expand = true - -[node name="ImgCard2" type="TextureRect" parent="PainelHidden/outline3"] -anchor_left = 0.412101 -anchor_top = 0.363915 -anchor_right = 0.412101 -anchor_bottom = 0.363915 -margin_left = -250.361 -margin_top = -234.647 -margin_right = 363.639 -margin_bottom = 128.353 -mouse_filter = 2 -theme = ExtResource( 2 ) -texture = ExtResource( 6 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="outline2" type="TextureRect" parent="PainelHidden"] -anchor_left = 0.790653 -anchor_top = 0.53255 -anchor_right = 0.791 -anchor_bottom = 0.53255 -margin_left = -313.424 -margin_top = -346.027 -margin_right = 313.441 -margin_bottom = 312.038 -theme = ExtResource( 2 ) -texture = ExtResource( 19 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="PainelPrincipal" type="TextureRect" parent="."] -anchor_left = 0.503 -anchor_top = 0.500658 -anchor_right = 0.503 -anchor_bottom = 0.500659 -margin_left = -307.16 -margin_top = -363.479 -margin_right = 324.84 -margin_bottom = 351.521 -theme = ExtResource( 2 ) -texture = ExtResource( 5 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="ImgCard" type="TextureRect" parent="PainelPrincipal"] -anchor_left = 0.503 -anchor_top = 0.313 -anchor_right = 0.503 -anchor_bottom = 0.313 -margin_left = -317.896 -margin_top = -223.795 -margin_right = 296.104 -margin_bottom = 139.205 -mouse_filter = 2 -theme = ExtResource( 2 ) -texture = ExtResource( 6 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="outline" type="TextureRect" parent="PainelPrincipal"] -anchor_left = 0.498225 -anchor_top = 0.487337 -anchor_right = 0.498225 -anchor_bottom = 0.497127 -margin_left = -320.878 -margin_top = -359.446 -margin_right = 308.122 -margin_bottom = 350.554 -mouse_filter = 2 -theme = ExtResource( 2 ) -texture = ExtResource( 19 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Coracao" type="Sprite" parent="PainelPrincipal"] -position = Vector2( 62, 649.999 ) -scale = Vector2( 1.24522, 1.24522 ) -texture = ExtResource( 14 ) - -[node name="coracaobotao" type="Button" parent="PainelPrincipal/Coracao"] -anchor_left = 0.0805201 -anchor_top = -0.0243497 -anchor_right = 0.953248 -anchor_bottom = 0.93565 -margin_left = -15.0 -margin_top = -12.0 -margin_right = -15.0 -margin_bottom = -12.0 -mouse_filter = 1 -theme = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="TweenCoracao" type="Tween" parent="PainelPrincipal/Coracao"] - -[node name="Chat" type="Sprite" parent="PainelPrincipal"] -position = Vector2( 147, 647.999 ) -scale = Vector2( 1.20356, 1.20356 ) -texture = ExtResource( 15 ) - -[node name="SaibaMais" type="TextureButton" parent="PainelPrincipal"] -anchor_left = 0.76 -anchor_top = 0.898 -anchor_right = 0.76 -anchor_bottom = 0.898 -margin_left = -105.32 -margin_top = -31.0707 -margin_right = 105.68 -margin_bottom = 31.1038 -mouse_filter = 1 -texture_normal = ExtResource( 1 ) -texture_pressed = ExtResource( 17 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="PainelPrincipal/SaibaMais"] -anchor_left = 0.491 -anchor_top = 0.5 -anchor_right = 0.491 -anchor_bottom = 0.5 -margin_left = -103.601 -margin_top = -31.0872 -margin_right = 103.399 -margin_bottom = 26.9128 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "saiba mais..." -align = 1 -valign = 1 - -[node name="Titulo" type="RichTextLabel" parent="PainelPrincipal"] -anchor_left = 0.0268987 -anchor_top = 0.522752 -anchor_right = 0.951265 -anchor_bottom = 0.615872 -margin_top = 0.23175 -margin_right = -0.199768 -margin_bottom = -0.349213 -mouse_filter = 1 -custom_colors/default_color = Color( 0, 0, 0, 1 ) -custom_fonts/italics_font = SubResource( 7 ) -custom_fonts/bold_font = SubResource( 8 ) -custom_fonts/normal_font = SubResource( 9 ) -bbcode_enabled = true -bbcode_text = "[rainbow]Noticia 2[/rainbow]" -tab_size = 1 -text = "Noticia 2" -fit_content_height = true -scroll_active = false -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Desc" type="Label" parent="PainelPrincipal"] -anchor_left = 0.028481 -anchor_top = 0.612586 -anchor_right = 0.950949 -anchor_bottom = 0.827971 -mouse_filter = 1 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 6 ) -text = "Coloque Uma Descrição Aqui" -autowrap = true -max_lines_visible = 3 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="AnimationCoracao" type="AnimationPlayer" parent="."] -root_node = NodePath(".") -playback_speed = 1.4 -"anims/Animação" = SubResource( 2 ) - -[node name="AudioStreamCartao" type="AudioStreamPlayer" parent="."] -bus = "SFX Menu" -script = ExtResource( 4 ) - -[node name="Tween" type="Tween" parent="."] - -[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."] -position = Vector2( 358.5, 389.999 ) -scale = Vector2( 31.95, 20.6 ) - -[connection signal="pressed" from="PainelPrincipal/Coracao/coracaobotao" to="." method="_on_coracaobotao_pressed"] -[connection signal="pressed" from="PainelPrincipal/Coracao/coracaobotao" to="AudioStreamCartao" method="_on_coracaobotao_pressed"] -[connection signal="pressed" from="PainelPrincipal/SaibaMais" to="." method="_on_SaibaMais_pressed"] -[connection signal="screen_entered" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_entered"] diff --git a/projeto/recursos/feed_de_noticias/feed_de_noticia.gd b/projeto/recursos/feed_de_noticias/feed_de_noticia.gd deleted file mode 100644 index 0e4b9cf..0000000 --- a/projeto/recursos/feed_de_noticias/feed_de_noticia.gd +++ /dev/null @@ -1,18 +0,0 @@ -extends Control - -onready var audio_stream_bgm = $AudioStreamBGM - -var _volume_atual = 999 - -func _ready(): - SingletonOpcoesGlobais.connect("Atualizou", self, "_atualizar_volume") - _atualizar_volume() - -func _atualizar_volume(): - if SingletonOpcoesGlobais.volumeSom != _volume_atual: - _volume_atual = SingletonOpcoesGlobais.volumeSom - if _volume_atual == 0: - audio_stream_bgm.stream_paused = true - else: - audio_stream_bgm.stream_paused = false - audio_stream_bgm.volume_db = range_lerp(_volume_atual, 1, 100, -30, 0) diff --git a/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn b/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn deleted file mode 100644 index 3596d0f..0000000 --- a/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn +++ /dev/null @@ -1,164 +0,0 @@ -[gd_scene load_steps=12 format=2] - -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn" type="PackedScene" id=1] -[ext_resource path="res://elementos/scripts/ScriptsCartaoDeLevel/VBoxResizer.gd" type="Script" id=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png" type="Texture" id=3] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres" type="Theme" id=4] -[ext_resource path="res://elementos/audio/bgm/hub/hub-menu.mp3" type="AudioStream" id=5] -[ext_resource path="res://elementos/audio/sfx/hub/hub-slide.wav" type="AudioStream" id=6] -[ext_resource path="res://recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn" type="PackedScene" id=7] -[ext_resource path="res://recursos/feed_de_noticias/feed_de_noticia.gd" type="Script" id=8] -[ext_resource path="res://recursos/feed_de_noticias/logo.gd" type="Script" id=9] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/logo.png" type="Texture" id=10] - -[sub_resource type="GDScript" id=1] -script/source = "extends AudioStreamPlayer - -func _on_ContainerDeScroll_scroll_started() -> void: - play() - -func _on_ContainerDeScroll_scroll_ended() -> void: - stop() -" - -[node name="FeedDeNoticias" type="Control"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -360.0 -margin_top = -640.0 -margin_right = 360.0 -margin_bottom = 640.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -script = ExtResource( 8 ) - -[node name="Fundo" type="ColorRect" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -1479.0 -margin_top = -959.0 -margin_right = 1505.0 -margin_bottom = 1200.0 -mouse_filter = 1 -size_flags_horizontal = 3 -size_flags_vertical = 3 -color = Color( 0.247059, 0.717647, 0.239216, 1 ) - -[node name="ContainerDeScroll" type="ScrollContainer" parent="."] -anchor_left = 0.5 -anchor_top = 0.611 -anchor_right = 0.5 -anchor_bottom = 0.611 -margin_left = -360.0 -margin_top = -502.08 -margin_right = 360.0 -margin_bottom = 501.68 -rect_clip_content = false -mouse_filter = 1 -size_flags_horizontal = 3 -size_flags_vertical = 3 -theme = ExtResource( 4 ) -follow_focus = true -scroll_horizontal_enabled = false - -[node name="VBoxContainer" type="VBoxContainer" parent="ContainerDeScroll"] -margin_right = 720.0 -margin_bottom = 2912.0 -rect_min_size = Vector2( 720, 2912 ) -alignment = 1 -script = ExtResource( 2 ) -tamanho_total = 728 - -[node name="CartaoDeNoticia" parent="ContainerDeScroll/VBoxContainer" instance=ExtResource( 1 )] -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_right = 720.0 -margin_bottom = 725.0 -idCard = "SurfTerminalBandeira" -Cena_do_jogo = "res://recursos/jogos/enchente/abertura/CutsceneBase.tscn" - -[node name="CartaoDeNoticia2" parent="ContainerDeScroll/VBoxContainer" instance=ExtResource( 1 )] -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_top = 729.0 -margin_right = 720.0 -margin_bottom = 1454.0 -E_jogavel = false - -[node name="CartaoDeNoticia3" parent="ContainerDeScroll/VBoxContainer" instance=ExtResource( 1 )] -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_top = 1458.0 -margin_right = 720.0 -margin_bottom = 2183.0 -E_jogavel = false - -[node name="CartaoDeNoticia4" parent="ContainerDeScroll/VBoxContainer" instance=ExtResource( 1 )] -anchor_top = 0.0 -anchor_right = 0.0 -anchor_bottom = 0.0 -margin_top = 2187.0 -margin_right = 720.0 -margin_bottom = 2912.0 -E_jogavel = false - -[node name="Logo" type="CanvasLayer" parent="."] -layer = 2 -script = ExtResource( 9 ) - -[node name="Logo" type="Control" parent="Logo"] -anchor_right = 1.0 -anchor_bottom = 0.266 -margin_top = -50.0 -margin_bottom = -50.24 -mouse_filter = 1 - -[node name="TextureRect" type="TextureRect" parent="Logo/Logo"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -360.0 -margin_top = -511.12 -margin_right = 360.0 -margin_bottom = 128.88 -texture = ExtResource( 3 ) -expand = true - -[node name="SPnews" type="TextureRect" parent="Logo/Logo/TextureRect"] -anchor_left = 0.493 -anchor_top = 0.758 -anchor_right = 0.493 -anchor_bottom = 0.758 -margin_left = -136.96 -margin_top = -122.12 -margin_right = 137.04 -margin_bottom = 121.88 -texture = ExtResource( 10 ) -expand = true - -[node name="BotaoMenufeed" parent="Logo/Logo" instance=ExtResource( 7 )] -offset = Vector2( 0, -50 ) -transform = Transform2D( 1, 0, 0, 1, 0, -50 ) - -[node name="TweenLogo" type="Tween" parent="Logo"] - -[node name="AudioStreamBGM" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 5 ) -autoplay = true -bus = "BGM Track" - -[node name="AudioStreamInteracao" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 6 ) -bus = "SFX Menu" -script = SubResource( 1 ) - -[connection signal="scroll_ended" from="ContainerDeScroll" to="AudioStreamInteracao" method="_on_ContainerDeScroll_scroll_ended"] -[connection signal="scroll_started" from="ContainerDeScroll" to="AudioStreamInteracao" method="_on_ContainerDeScroll_scroll_started"] diff --git a/projeto/recursos/feed_de_noticias/logo.gd b/projeto/recursos/feed_de_noticias/logo.gd deleted file mode 100644 index d73457d..0000000 --- a/projeto/recursos/feed_de_noticias/logo.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends CanvasLayer - -onready var tween_logo: Tween = $TweenLogo -onready var logo: Control = $Logo -onready var botao_menu: CanvasLayer = $Logo/BotaoMenufeed - -func _ready(): - tween_logo.interpolate_property(logo, "rect_position", Vector2(0, -50), Vector2(0, 0), 0.6, Tween.TRANS_LINEAR) - tween_logo.interpolate_property(botao_menu, "offset", Vector2(0, -50), Vector2(0, 0), 0.6, Tween.TRANS_LINEAR) - tween_logo.start() diff --git a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn b/projeto/recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn deleted file mode 100644 index 7625fa8..0000000 --- a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn +++ /dev/null @@ -1,24 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/botão menu.png" type="Texture" id=1] -[ext_resource path="res://recursos/feed_de_noticias/menu_opcoes_feed/botaoMenufeed.gd" type="Script" id=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed (1).png" type="Texture" id=3] - -[node name="BotaoMenufeed" type="CanvasLayer"] -layer = 3 -script = ExtResource( 2 ) - -[node name="Menu" type="TextureButton" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = 226.0 -margin_top = -486.0 -margin_right = 284.0 -margin_bottom = -428.0 -texture_normal = ExtResource( 1 ) -texture_pressed = ExtResource( 3 ) -expand = true - -[connection signal="button_up" from="Menu" to="." method="_on_Menu_button_up"] diff --git a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuDeOpcoesFeed.tscn b/projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuDeOpcoesFeed.tscn deleted file mode 100644 index e6281e6..0000000 --- a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/MenuDeOpcoesFeed.tscn +++ /dev/null @@ -1,153 +0,0 @@ -[gd_scene load_steps=9 format=2] - -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres" type="Theme" id=2] -[ext_resource path="res://recursos/feed_de_noticias/menu_opcoes_feed/MenuOpcoesEnchentefeed.gd" type="Script" id=3] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Normal.png" type="Texture" id=4] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/moldura.png" type="Texture" id=6] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=7] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Hovered.png" type="Texture" id=8] -[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=9] - -[sub_resource type="DynamicFont" id=2] -size = 24 -font_data = ExtResource( 9 ) - -[node name="MenuDeOpcoesFeed" type="CanvasLayer"] -pause_mode = 2 -script = ExtResource( 3 ) -voltarJogo = "res://recursos/feed_de_noticias/feed_de_noticia.tscn" - -[node name="MenuDeOpcoes" type="Control" parent="."] -pause_mode = 2 -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="Transparencia" type="ColorRect" parent="MenuDeOpcoes"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0.0862745, 0.0862745, 0.0862745, 0.301961 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Menu" type="TextureRect" parent="MenuDeOpcoes"] -pause_mode = 2 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -260.0 -margin_top = -223.0 -margin_right = 260.0 -margin_bottom = 223.0 -mouse_filter = 0 -texture = ExtResource( 6 ) -expand = true -stretch_mode = 7 - -[node name="VolumeMusica" type="HSlider" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.488462 -anchor_top = 0.11435 -anchor_right = 0.851923 -anchor_bottom = 0.206278 -theme = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu/VolumeMusica"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -304.5 -margin_top = -16.0001 -margin_right = -114.5 -margin_bottom = 17.9999 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "Volume Música" -align = 1 -valign = 1 - -[node name="Porcentagem" type="Label" parent="MenuDeOpcoes/Menu/VolumeMusica"] -anchor_left = 0.809524 -anchor_top = -0.317073 -anchor_right = 0.994709 -anchor_bottom = 0.414634 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "0%" -align = 1 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="VolumeEfeitos" type="HSlider" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.488462 -anchor_top = 0.237668 -anchor_right = 0.851923 -anchor_bottom = 0.329596 -theme = ExtResource( 2 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu/VolumeEfeitos"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -304.5 -margin_top = -16.0001 -margin_right = -114.5 -margin_bottom = 17.9999 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "Volume Efeitos" -align = 1 -valign = 1 - -[node name="Porcentagem" type="Label" parent="MenuDeOpcoes/Menu/VolumeEfeitos"] -anchor_left = 0.809524 -anchor_top = -0.292683 -anchor_right = 0.994709 -anchor_bottom = 0.439024 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 2 ) -text = "0%" -align = 1 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="VoltarMenuFeed" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.303846 -anchor_top = 0.818386 -anchor_right = 0.694231 -anchor_bottom = 0.93722 -toggle_mode = true -texture_normal = ExtResource( 4 ) -texture_pressed = ExtResource( 7 ) -texture_hover = ExtResource( 8 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/VoltarMenuFeed"] -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 = "voltar ao feed" -align = 1 -valign = 1 - -[connection signal="button_up" from="MenuDeOpcoes/Menu/VoltarMenuFeed" to="." method="_on_VoltarMenuFeed_button_up"] diff --git a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/botaoMenufeed.gd b/projeto/recursos/feed_de_noticias/menu_opcoes_feed/botaoMenufeed.gd deleted file mode 100644 index 28e69cf..0000000 --- a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/botaoMenufeed.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Node - -onready var opcoesMenu = preload("res://recursos/feed_de_noticias/menu_opcoes_feed/MenuDeOpcoesFeed.tscn") - -var menuApertado: bool = false - -func _on_Menu_button_up(): - menuApertado = true - var instanciaMenu = opcoesMenu.instance() - if menuApertado: - get_tree().get_root().add_child(instanciaMenu) diff --git a/projeto/recursos/jogos/enchente/chefao/BombasChefe.tscn b/projeto/recursos/jogos/enchente/chefao/BombasChefe.tscn index c01d014..4ca09c0 100644 --- a/projeto/recursos/jogos/enchente/chefao/BombasChefe.tscn +++ b/projeto/recursos/jogos/enchente/chefao/BombasChefe.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=4 format=2] [ext_resource path="res://recursos/jogos/enchente/chefao/Obstaculo.gd" type="Script" id=1] -[ext_resource path="res://elementos/imagem/enchente/chefe/Mina.png" type="Texture" id=2] +[ext_resource path="res://elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0014.png" type="Texture" id=2] [sub_resource type="SphereShape" id=1] -[node name="BombasChefe" type="KinematicBody" groups=["minasAquaticas", "obstaculo"]] +[node name="BombasChefe" type="KinematicBody" groups=["aereo", "minasAquaticas", "obstaculo"]] script = ExtResource( 1 ) velocidade = 30.0 diff --git a/projeto/recursos/jogos/enchente/chefao/Chefao.tscn b/projeto/recursos/jogos/enchente/chefao/Chefao.tscn index a03fa4d..53f7092 100644 --- a/projeto/recursos/jogos/enchente/chefao/Chefao.tscn +++ b/projeto/recursos/jogos/enchente/chefao/Chefao.tscn @@ -147,13 +147,13 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.251, 8.09071 ) [node name="Faixas" type="Node" parent="."] [node name="Faixa1" type="Position3D" parent="Faixas"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 0, 22.727 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00036, 0, 22.727 ) [node name="Faixa2" type="Position3D" parent="Faixas"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 22.7269 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00173688, 0, 22.7269 ) [node name="Faixa3" type="Position3D" parent="Faixas"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, 22.727 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 2.03278, 0, 22.727 ) [node name="Timers" type="Node" parent="."] diff --git a/projeto/recursos/jogos/enchente/chefao/ChefaoScript.gd b/projeto/recursos/jogos/enchente/chefao/ChefaoScript.gd index 87f4a65..f6b88ec 100644 --- a/projeto/recursos/jogos/enchente/chefao/ChefaoScript.gd +++ b/projeto/recursos/jogos/enchente/chefao/ChefaoScript.gd @@ -91,6 +91,7 @@ func animacao(animacao): func _realizar_ataque(): var lane_atual = 1 + var animacao_ataque_feita = false for obj_pos in lista_posicoes: var instanciaMinaAquatica = BombasChefe.instance() as KinematicBody @@ -107,7 +108,9 @@ func _realizar_ataque(): elif obj_pos == 1: add_child(instanciaMinaAquatica) - animacao("Ataque_bombas") + if animacao_ataque_feita == false: + animacao("Ataque_bombas") + animacao_ataque_feita = true if lane_atual == 1: instanciaMinaAquatica.global_position = Vector3(faixa_1.global_position.x, origem_obstaculos.global_position.y, origem_obstaculos.global_position.z) elif lane_atual == 2: @@ -119,18 +122,19 @@ func _realizar_ataque(): elif obj_pos == 2: add_child(instanciaTentaculo) - if lane_atual == 1: + if animacao_ataque_feita == false: animacao("Ataque_tentaculo") + animacao_ataque_feita = true + if lane_atual == 1: instanciaTentaculo.global_position = faixa_1.global_position elif lane_atual == 2: - animacao("Ataque_tentaculo") instanciaTentaculo.global_position = faixa_2.global_position elif lane_atual == 3: - animacao("Ataque_tentaculo") instanciaTentaculo.global_position = faixa_3.global_position yield(Animplayer, "animation_finished") animacao("Idle") lane_atual += 1 + animacao_ataque_feita = false func loadJson(nomejson): var arquivo = File.new() @@ -152,3 +156,5 @@ func _auto_destruir(): emit_signal("Chefao_Derrotado") yield(get_tree().create_timer(2), "timeout") self.queue_free() + yield(get_tree().create_timer(1.2), "timeout") + TrocadorDeCenas.trocar_cena('res://recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn') diff --git a/projeto/recursos/jogos/enchente/chefao/EnchenteBossTeste.tscn b/projeto/recursos/jogos/enchente/chefao/EnchenteBossTeste.tscn index 0b6f9d6..892e091 100644 --- a/projeto/recursos/jogos/enchente/chefao/EnchenteBossTeste.tscn +++ b/projeto/recursos/jogos/enchente/chefao/EnchenteBossTeste.tscn @@ -1,13 +1,13 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://elementos/temas/debug-labels.tres" type="Theme" id=1] [ext_resource path="res://elementos/audio/bgm/minigame-1/minigame1-surf-lv1.mp3" type="AudioStream" id=2] [ext_resource path="res://elementos/imagem/enchente/rosto-senhora.png" type="Texture" id=3] +[ext_resource path="res://elementos/imagem/enchente/background_skyline.png" type="Texture" id=4] [ext_resource path="res://recursos/jogos/enchente/jogador/playerLane3D.tscn" type="PackedScene" id=5] [ext_resource path="res://elementos/audio/bgm/minigame-1/minigame1-amb-corrente.mp3" type="AudioStream" id=6] [ext_resource path="res://recursos/jogos/enchente/componentes/CriadorDePredios.tscn" type="PackedScene" id=7] [ext_resource path="res://addons/sistema_vida/interface/vida_icones.tscn" type="PackedScene" id=8] -[ext_resource path="res://elementos/imagem/enchente/background.png" type="Texture" id=9] [ext_resource path="res://elementos/scripts/ScriptsBackgroundCidadeSubindo/cidadeSubindo.gd" type="Script" id=10] [ext_resource path="res://elementos/modelos/skybox/skyboxNuvens.tscn" type="PackedScene" id=11] [ext_resource path="res://elementos/shaders/enchente/agua_shader.tres" type="Shader" id=12] @@ -47,118 +47,6 @@ shader_param/Velocidade = 1.0 [sub_resource type="BoxShape" id=6] extents = Vector3( 5.65031, 3.0316, 1 ) -[sub_resource type="Animation" id=8] -resource_name = "cidadesubindofase1" -length = 2.0 -tracks/0/type = "value" -tracks/0/path = NodePath("SpriteCidade2:translation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 2 ), -"transitions": PoolRealArray( 1.6245, 1 ), -"update": 0, -"values": [ Vector3( 19, -15, -5 ), Vector3( 19, -5, -5 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("SpriteCidade:translation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 2 ), -"transitions": PoolRealArray( 1.6245, 1 ), -"update": 0, -"values": [ Vector3( -11, -15, 0 ), Vector3( -11, -3, 0 ) ] -} - -[sub_resource type="Animation" id=9] -resource_name = "cidadesubindofase2" -length = 2.0 -tracks/0/type = "value" -tracks/0/path = NodePath("SpriteCidade:translation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector3( -11, -3, 0 ), Vector3( -11, 8, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("SpriteCidade2:translation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector3( 19, -5, -5 ), Vector3( 19, 9, -5 ) ] -} - -[sub_resource type="Animation" id=10] -resource_name = "cidadesubindofim" -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("SpriteCidade:translation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector3( -11, 8, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("SpriteCidade2:translation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector3( 19, 9, -5 ) ] -} - -[sub_resource type="Animation" id=11] -resource_name = "reset" -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("SpriteCidade:translation") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector3( -11, -15, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("SpriteCidade2:translation") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector3( 19, -15, -5 ) ] -} - [node name="Enchente" type="Spatial"] script = SubResource( 7 ) @@ -269,28 +157,17 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -70.8976 ) script = ExtResource( 10 ) [node name="SpriteCidade" type="Sprite3D" parent="cidadesubindo"] -transform = Transform( 8.46765, 0, 0.0831564, 0, 6.79913, 0, -0.741566, 0, 0.949525, -11, -15, 0 ) +transform = Transform( 6.65691, 0, 0.0653741, 0, 5.34519, 0, -0.582988, 0, 0.746477, 0, -15, 0 ) billboard = 1 double_sided = false alpha_cut = 2 -texture = ExtResource( 9 ) - -[node name="SpriteCidade2" type="Sprite3D" parent="cidadesubindo"] -transform = Transform( 10.7519, -0.00490382, -0.290019, 0.00675251, 9.93325, -0.000153019, 2.58632, -0.000179814, 1.20567, 19, -15, -5 ) -billboard = 1 -double_sided = false -alpha_cut = 2 -texture = ExtResource( 9 ) - -[node name="AnimationPlayer" type="AnimationPlayer" parent="cidadesubindo"] -autoplay = "reset" -playback_speed = 0.1 -anims/cidadesubindofase1 = SubResource( 8 ) -anims/cidadesubindofase2 = SubResource( 9 ) -anims/cidadesubindofim = SubResource( 10 ) -anims/reset = SubResource( 11 ) +texture = ExtResource( 4 ) [node name="TimerDoTempoDeEspera" type="Timer" parent="cidadesubindo"] +wait_time = 5.0 +one_shot = true + +[node name="Tween" type="Tween" parent="cidadesubindo"] [node name="AudioStreamAMB" type="AudioStreamPlayer" parent="."] stream = ExtResource( 6 ) diff --git a/projeto/recursos/jogos/enchente/chefao/Tentaculos.tscn b/projeto/recursos/jogos/enchente/chefao/Tentaculos.tscn index 95325de..e838556 100644 --- a/projeto/recursos/jogos/enchente/chefao/Tentaculos.tscn +++ b/projeto/recursos/jogos/enchente/chefao/Tentaculos.tscn @@ -52,7 +52,6 @@ tracks/0/keys = { [sub_resource type="Animation" id=4] resource_name = "In_OUt" length = 0.8 -step = 1.0 tracks/0/type = "value" tracks/0/path = NodePath("Sprite3D:texture") tracks/0/interp = 1 @@ -80,12 +79,12 @@ extents = Vector3( 0.563659, 1.91059, 1 ) [sub_resource type="BoxShape" id=2] extents = Vector3( 1.11342, 3.0316, 1.52967 ) -[node name="Tentaculos" type="KinematicBody" groups=["obstaculo"]] -transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, -0.341995, 0, 0 ) +[node name="Tentaculos" type="KinematicBody" groups=["obstaculo", "terrestre"]] +transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 ) script = ExtResource( 3 ) [node name="Sprite3D" type="Sprite3D" parent="."] -transform = Transform( 0.947729, 0, 0, 0, 1.47727, 0, 0, 0, 1.27601, 1.17185, 3.14595, 0 ) +transform = Transform( 0.784259, 0, 0, 0, 1.22246, 0, 0, 0, 1.05592, 0.541796, 2.60755, 0 ) texture = ExtResource( 10 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="Sprite3D"] @@ -95,12 +94,12 @@ anims/Idle = SubResource( 6 ) anims/In_OUt = SubResource( 4 ) [node name="onda" type="AnimatedSprite3D" parent="."] -transform = Transform( 1.08773, 0, 0, 0, -4.75461e-08, 1.08773, 0, -1.08773, -4.75461e-08, 0.471415, 0.209962, 0.0947884 ) +transform = Transform( 1.08773, 0, 0, 0, -4.75461e-08, 1.08773, 0, -1.08773, -4.75461e-08, 0, 0.21, 0.095 ) frames = SubResource( 5 ) playing = true [node name="CollisionShape" type="CollisionShape" parent="."] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.416055, 1.73612, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.736, 0 ) shape = SubResource( 1 ) [node name="Timer" type="Timer" parent="."] @@ -111,7 +110,7 @@ autostart = true transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.714325, -0.462577 ) [node name="CollisionShape" type="CollisionShape" parent="AreaColetoraObstaculos"] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.392235, 0, 0.581716 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.582 ) shape = SubResource( 2 ) [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"] diff --git a/projeto/recursos/jogos/enchente/jogador/playerLane3D.gd b/projeto/recursos/jogos/enchente/jogador/playerLane3D.gd index 002798d..def6aae 100644 --- a/projeto/recursos/jogos/enchente/jogador/playerLane3D.gd +++ b/projeto/recursos/jogos/enchente/jogador/playerLane3D.gd @@ -3,6 +3,7 @@ class_name PlayerLane3D export var tempo_imunidade_dano: float = 3.0 export var tempo_imunidade_item: float = 5.0 +export(Array, StreamTexture) var texturas onready var controle_faixa_3d = $ControleFaixa3D onready var vida = $Vida as Vida @@ -10,22 +11,25 @@ onready var sprite = $Sprite as AnimatedSprite3D onready var sprite_agua = $SpriteAgua as AnimatedSprite3D onready var timer_imunidade = $TimerImunidade onready var imunidade_modulate = false -onready var menuOpcoes = preload("res://recursos/jogos/enchente/menu_de_opcoes/MenuDeOpcoes.tscn") +onready var menuOpcoes = preload("res://recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn") onready var posicao_sprite_agua_original = sprite_agua.global_position onready var imunidade_particulas = $ImunidadeParticulas - +onready var BaloesDeFalha: Sprite3D = $BalaoDeFala +onready var TweenBalao: Tween = $BalaoDeFala/TweenBalao var imune = false var imune_dano = false var imunidade_time: float = 0 +var range_baloes: int = 4 var abaixado = false var pulando = false var anim_cair = false +var lastrnd func _input(event): if Input.is_action_just_pressed("pause"): pause() - + func _process(delta): sprite_agua.global_position.y = posicao_sprite_agua_original.y @@ -40,9 +44,11 @@ func _on_ControladorArrasta_arrastado(chave): func _on_AreaDano_body_entered(body: Node) -> void: if body.is_in_group("terrestre") and not imune and not pulando: vida.receber_dano(1.0) + _gerar_fala_de_dano() imunidade(true, tempo_imunidade_dano) if body.is_in_group("aereo") and not imune and not abaixado: vida.receber_dano(1.0) + _gerar_fala_de_dano() imunidade(true, tempo_imunidade_dano) if body.is_in_group("invencibilidade"): body.queue_free() @@ -54,7 +60,7 @@ func _on_AreaDano_body_entered(body: Node) -> void: controle_faixa_3d.pular() func _on_Vida_vida_acabou() -> void: - TrocadorDeCenas.trocar_cena('res://recursos/feed_de_noticias/feed_de_noticia.tscn') + TrocadorDeCenas.trocar_cena('res://recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn') func imunidade(dano: bool, tempo: float): if imune: @@ -128,3 +134,28 @@ func _on_SpriteAgua_animation_finished(): if anim_cair: anim_cair = false sprite_agua.play("Idle") + +func _gerar_fala_de_dano(): + randomize() + var rndbalao = randi() % 4 + 1 + if rndbalao == lastrnd: + randomize() + rndbalao = randi() % 4 + 1 + print(rndbalao) + lastrnd = rndbalao + BaloesDeFalha.texture = texturas[rndbalao - 1] + _animar_tween_balao("Aparecer") + $BalaoDeFala/DeixarInvisivel.start(1.2) + yield($BalaoDeFala/DeixarInvisivel, 'timeout') + _animar_tween_balao("Desaparecer") + +func _animar_tween_balao(anim): + if anim == "Aparecer": + BaloesDeFalha.visible = true + TweenBalao.interpolate_property(BaloesDeFalha, "scale", Vector3(0.54, 0.54, 0.54), Vector3(0.71, 0.71, 0.71), 0.5, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + TweenBalao.start() + elif anim == "Desaparecer": + TweenBalao.interpolate_property(BaloesDeFalha, "scale", Vector3(0.71, 0.71, 0.71), Vector3(0.54, 0.54, 0.54), 0.5, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) + TweenBalao.start() + yield(TweenBalao, "tween_completed") + BaloesDeFalha.visible = false diff --git a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn index 2ccd317..cc8471b 100644 --- a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn +++ b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn @@ -1,11 +1,11 @@ -[gd_scene load_steps=86 format=2] +[gd_scene load_steps=87 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] [ext_resource path="res://recursos/jogos/enchente/jogador/playerLane3D.gd" type="Script" id=3] [ext_resource path="res://recursos/jogos/enchente/controlador_arrasta/ControladorArrasta.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/sistema_vida/vida.gd" type="Script" id=5] -[ext_resource path="res://recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn" type="PackedScene" id=6] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn" type="PackedScene" id=6] [ext_resource path="res://elementos/imagem/enchente/senhorinha/idle/Timeline 1_0002.png" type="Texture" id=7] [ext_resource path="res://recursos/jogos/enchente/jogador/AudioStreamPlayer.gd" type="Script" id=8] [ext_resource path="res://elementos/imagem/enchente/senhorinha/idle/Timeline 1_0001.png" type="Texture" id=9] @@ -79,7 +79,11 @@ [ext_resource path="res://elementos/imagem/enchente/senhorinha/agachamento_agua/Timeline 1_0001.png" type="Texture" id=77] [ext_resource path="res://elementos/imagem/enchente/senhorinha/agachamento_agua/Timeline 1_0004.png" type="Texture" id=78] [ext_resource path="res://elementos/imagem/enchente/senhorinha/agachamento_agua/Timeline 1_0002.png" type="Texture" id=79] -[ext_resource path="res://elementos/imagem/enchente/Efeitos/InvencibilidadeSpriteMat.tres" type="Material" id=80] +[ext_resource path="res://elementos/imagem/baloes/bobeira.png" type="Texture" id=80] +[ext_resource path="res://elementos/imagem/baloes/moca.png" type="Texture" id=81] +[ext_resource path="res://elementos/imagem/baloes/raiva.png" type="Texture" id=82] +[ext_resource path="res://elementos/imagem/baloes/onibus.png" type="Texture" id=83] +[ext_resource path="res://elementos/imagem/enchente/Efeitos/InvencibilidadeSpriteMat.tres" type="Material" id=84] [sub_resource type="SphereShape" id=1] @@ -144,6 +148,7 @@ _data = [ Vector2( 0, 0.507955 ), 0.0, 0.0, 0, 0, Vector2( 0.995049, 0 ), 0.0, 0 axis_lock_motion_z = true move_lock_z = true script = ExtResource( 3 ) +texturas = [ ExtResource( 80 ), ExtResource( 81 ), ExtResource( 83 ), ExtResource( 82 ) ] [node name="CollisionShape" type="CollisionShape" parent="."] transform = Transform( 0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 0, 0 ) @@ -181,8 +186,6 @@ vida_maxima = 3.0 bus = "SFX Player" script = ExtResource( 8 ) -[node name="BotaoMenu" parent="." instance=ExtResource( 6 )] - [node name="AreaDano" type="Area" parent="."] [node name="CollisionShape" type="CollisionShape" parent="AreaDano"] @@ -191,6 +194,19 @@ shape = SubResource( 1 ) [node name="TimerImunidade" type="Timer" parent="."] wait_time = 0.2 +[node name="BalaoDeFala" type="Sprite3D" parent="."] +transform = Transform( -0.54, 0, 8.15377e-08, 0, 0.54, 0, -8.15377e-08, 0, -0.54, -0.0177393, 3.00375, 0.12553 ) +visible = false +billboard = 1 +texture = ExtResource( 80 ) + +[node name="TweenBalao" type="Tween" parent="BalaoDeFala"] + +[node name="DeixarInvisivel" type="Timer" parent="BalaoDeFala"] +wait_time = 3.0 + +[node name="BotaoMenu" parent="." instance=ExtResource( 6 )] + [node name="ImunidadeParticulas" type="CPUParticles" parent="."] transform = Transform( 1, 0, 0, 0, 0.707107, -0.707107, 0, 0.707107, 0.707107, 0, 0.880999, 0 ) visible = false diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn b/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn deleted file mode 100644 index 4f48ed3..0000000 --- a/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn +++ /dev/null @@ -1,30 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed (1).png" type="Texture" id=1] -[ext_resource path="res://recursos/jogos/enchente/menu_de_opcoes/botaoMenu.gd" type="Script" id=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/HUD_ingame/Menu_normal.png" type="Texture" id=3] - -[node name="BotaoMenu" type="Control"] -anchor_right = 1.0 -anchor_bottom = 1.0 -script = ExtResource( 2 ) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="Menu" type="TextureButton" parent="CanvasLayer"] -anchor_left = 0.936 -anchor_top = 0.037 -anchor_right = 0.936 -anchor_bottom = 0.037 -margin_left = -28.92 -margin_top = -28.36 -margin_right = 29.08 -margin_bottom = 29.64 -texture_normal = ExtResource( 3 ) -texture_pressed = ExtResource( 1 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[connection signal="button_up" from="CanvasLayer/Menu" to="." method="_on_Menu_button_up"] diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuDeOpcoes.tscn b/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuDeOpcoes.tscn deleted file mode 100644 index c45559f..0000000 --- a/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuDeOpcoes.tscn +++ /dev/null @@ -1,290 +0,0 @@ -[gd_scene load_steps=15 format=2] - -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/moldura.png" type="Texture" id=1] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botoes_dificuldade/Botoes_sem_tipografia/Normal.png" type="Texture" id=2] -[ext_resource path="res://recursos/jogos/enchente/menu_de_opcoes/MenuOpcoesEnchente.gd" type="Script" id=3] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botoes_dificuldade/Botoes_sem_tipografia/Pressed.png" type="Texture" id=4] -[ext_resource path="res://recursos/feed_de_noticias/SeletorDeNiveis/TemaSeletorDeLevel.tres" type="Theme" id=5] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botoes_dificuldade/Botoes_sem_tipografia/Hovered.png" type="Texture" id=6] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Hovered.png" type="Texture" id=11] -[ext_resource path="res://elementos/imagem/imgs_menu_opcoes_enchente/Checked.png" type="Texture" id=12] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Normal.png" type="Texture" id=13] -[ext_resource path="res://elementos/imagem/imgs_menu_opcoes_enchente/Unchecked.png" type="Texture" id=14] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Menu/Botao_voltar/voltar_feed/Pressed.png" type="Texture" id=15] -[ext_resource path="res://elementos/fontes/Lacquer-Regular.ttf" type="DynamicFontData" id=20] - -[sub_resource type="DynamicFont" id=12] -size = 24 -font_data = ExtResource( 20 ) - -[sub_resource type="DynamicFont" id=11] -size = 24 -font_data = ExtResource( 20 ) - -[node name="MenuDeOpcoes" type="CanvasLayer"] -pause_mode = 2 -script = ExtResource( 3 ) -voltarJogo = "res://recursos/feed_de_noticias/feed_de_noticia.tscn" - -[node name="MenuDeOpcoes" type="Control" parent="."] -pause_mode = 2 -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="Transparencia" type="ColorRect" parent="MenuDeOpcoes"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0.0862745, 0.0862745, 0.0862745, 0.301961 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Menu" type="TextureRect" parent="MenuDeOpcoes"] -pause_mode = 2 -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -260.0 -margin_top = -223.0 -margin_right = 260.0 -margin_bottom = 223.0 -mouse_filter = 0 -texture = ExtResource( 1 ) -expand = true -stretch_mode = 7 - -[node name="VolumeMusica" type="HSlider" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.488462 -anchor_top = 0.11435 -anchor_right = 0.851923 -anchor_bottom = 0.206278 -theme = ExtResource( 5 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu/VolumeMusica"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -304.5 -margin_top = -16.0001 -margin_right = -114.5 -margin_bottom = 17.9999 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 12 ) -text = "Volume Música" -valign = 1 - -[node name="Porcentagem" type="Label" parent="MenuDeOpcoes/Menu/VolumeMusica"] -anchor_left = 0.809524 -anchor_top = -0.317073 -anchor_right = 0.994709 -anchor_bottom = 0.414634 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "0%" -align = 1 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="VolumeEfeitos" type="HSlider" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.488462 -anchor_top = 0.237668 -anchor_right = 0.851923 -anchor_bottom = 0.329596 -theme = ExtResource( 5 ) -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu/VolumeEfeitos"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -304.5 -margin_top = -16.0001 -margin_right = -114.5 -margin_bottom = 17.9999 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 12 ) -text = "Volume Efeitos" -valign = 1 - -[node name="Porcentagem" type="Label" parent="MenuDeOpcoes/Menu/VolumeEfeitos"] -anchor_left = 0.809524 -anchor_top = -0.292683 -anchor_right = 0.994709 -anchor_bottom = 0.439024 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "0%" -align = 1 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="VoltarJogar" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.0769231 -anchor_top = 0.818386 -anchor_right = 0.467308 -anchor_bottom = 0.93722 -toggle_mode = true -texture_normal = ExtResource( 13 ) -texture_pressed = ExtResource( 15 ) -texture_hover = ExtResource( 11 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/VoltarJogar"] -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( 11 ) -text = "voltar ao jogo" -align = 1 -valign = 1 - -[node name="VoltarMenuFeed" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.528846 -anchor_top = 0.818386 -anchor_right = 0.919231 -anchor_bottom = 0.93722 -toggle_mode = true -texture_normal = ExtResource( 13 ) -texture_pressed = ExtResource( 15 ) -texture_hover = ExtResource( 11 ) -expand = true -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/VoltarMenuFeed"] -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( 11 ) -text = "voltar ao feed" -align = 1 -valign = 1 - -[node name="Controles" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.778846 -anchor_top = 0.360987 -anchor_right = 0.844231 -anchor_bottom = 0.43722 -toggle_mode = true -texture_normal = ExtResource( 14 ) -texture_pressed = ExtResource( 12 ) -expand = true -stretch_mode = 4 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Titulo" type="Label" parent="MenuDeOpcoes/Menu/Controles"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -375.0 -margin_top = -16.0001 -margin_right = -163.0 -margin_bottom = 17.9999 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 12 ) -text = "Controles em tela" -valign = 1 - -[node name="facil" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.119231 -anchor_top = 0.605382 -anchor_right = 0.344231 -anchor_bottom = 0.751122 -toggle_mode = true -texture_normal = ExtResource( 2 ) -texture_pressed = ExtResource( 4 ) -texture_hover = ExtResource( 6 ) -expand = true -stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/facil"] -anchor_right = 1.0 -anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "Fácil" -align = 1 -valign = 1 - -[node name="medio" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.371154 -anchor_top = 0.605382 -anchor_right = 0.596154 -anchor_bottom = 0.751122 -toggle_mode = true -texture_normal = ExtResource( 2 ) -texture_pressed = ExtResource( 4 ) -texture_hover = ExtResource( 6 ) -expand = true -stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/medio"] -anchor_right = 1.0 -anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "Médio" -align = 1 -valign = 1 - -[node name="dificil" type="TextureButton" parent="MenuDeOpcoes/Menu"] -anchor_left = 0.625 -anchor_top = 0.605382 -anchor_right = 0.85 -anchor_bottom = 0.751122 -toggle_mode = true -texture_normal = ExtResource( 2 ) -texture_pressed = ExtResource( 4 ) -texture_hover = ExtResource( 6 ) -expand = true -stretch_mode = 6 -__meta__ = { -"_edit_use_anchors_": true -} - -[node name="Label" type="Label" parent="MenuDeOpcoes/Menu/dificil"] -anchor_right = 1.0 -anchor_bottom = 1.0 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 11 ) -text = "Difícil" -align = 1 -valign = 1 - -[connection signal="button_up" from="MenuDeOpcoes/Menu/VoltarJogar" to="." method="_on_VoltarJogar_button_up"] -[connection signal="button_up" from="MenuDeOpcoes/Menu/VoltarMenuFeed" to="." method="_on_VoltarMenuFeed_button_up"] diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuOpcoesEnchente.gd b/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuOpcoesEnchente.gd deleted file mode 100644 index ab7faf6..0000000 --- a/projeto/recursos/jogos/enchente/menu_de_opcoes/MenuOpcoesEnchente.gd +++ /dev/null @@ -1,68 +0,0 @@ -extends Node -class_name MenuOpcoes - -onready var SingletonGlobal = SingletonOpcoesGlobais -onready var menu: TextureRect = $MenuDeOpcoes/Menu -onready var musicaWheel: HSlider = $MenuDeOpcoes/Menu/VolumeMusica -onready var efeitosWheel: HSlider = $MenuDeOpcoes/Menu/VolumeEfeitos -onready var porcentagemMusicaWheel: Label = $MenuDeOpcoes/Menu/VolumeMusica/Porcentagem -onready var porcentagemEfeitosWheel: Label = $MenuDeOpcoes/Menu/VolumeEfeitos/Porcentagem -onready var voltar: TextureButton = $MenuDeOpcoes/Menu/VoltarJogar -onready var menuFeed: TextureButton = $MenuDeOpcoes/Menu/VoltarMenuFeed -onready var controles: TextureButton = $MenuDeOpcoes/Menu/Controles -onready var facil: TextureButton = $MenuDeOpcoes/Menu/facil -onready var medio: TextureButton = $MenuDeOpcoes/Menu/medio -onready var dificil: TextureButton = $MenuDeOpcoes/Menu/dificil - -export var voltarJogo: String = '' - -func _ready(): - get_tree().paused = true - facil.connect('pressed',self,"_botao_dificuldade",[facil]) - medio.connect('pressed',self,"_botao_dificuldade",[medio]) - dificil.connect('pressed',self,"_botao_dificuldade",[dificil]) - controles.connect('toggled',self,"_mudar_controles") - _definir_valores() - -func _definir_valores(): - musicaWheel.value = SingletonGlobal.volumeSom - efeitosWheel.value = SingletonGlobal.volumeSFX - self[SingletonGlobal.dificuldadeAtual].pressed = true - -func _input(event): - var valorMusicaGlobal = musicaWheel.value - var valorSfxGlobal = efeitosWheel.value - if event is InputEventScreenTouch: - #envia para o singleton o valor de som e de musica - SingletonGlobal.volumeSom = valorMusicaGlobal - SingletonGlobal.volumeSFX = valorSfxGlobal - SingletonOpcoesGlobais.salvar_globais() - -func _on_VoltarJogar_button_up(): - get_tree().paused = false - self.queue_free() - -func _on_VoltarMenuFeed_button_up(): - get_tree().paused = false - TrocadorDeCenas.trocar_cena(voltarJogo) - self.queue_free() - -func _mudar_controles(alteracao: bool): - SingletonGlobal.ativarBotoes = alteracao - SingletonOpcoesGlobais.salvar_globais() - -func _botao_dificuldade(dificuldadeAtual): - if not dificuldadeAtual: - pass - SingletonOpcoesGlobais.dificuldadeAtual = dificuldadeAtual.name - SingletonOpcoesGlobais.salvar_globais() - - var botoes := [facil,medio,dificil] - botoes.erase(dificuldadeAtual) - for botao in botoes: - botao.pressed = false - -func _process(delta): - porcentagemMusicaWheel.text = str(musicaWheel.value) + '%' - porcentagemEfeitosWheel.text = str(efeitosWheel.value) + '%' - controles.pressed = SingletonGlobal.ativarBotoes diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/botaoMenu.gd b/projeto/recursos/jogos/enchente/menu_de_opcoes/botaoMenu.gd deleted file mode 100644 index c03873e..0000000 --- a/projeto/recursos/jogos/enchente/menu_de_opcoes/botaoMenu.gd +++ /dev/null @@ -1,11 +0,0 @@ -extends Node - -onready var opcoesMenu = preload("res://recursos/jogos/enchente/menu_de_opcoes/MenuDeOpcoes.tscn") - -var menuApertado: bool = false - -func _on_Menu_button_up(): - menuApertado = true - var instanciaMenu = opcoesMenu.instance() - if menuApertado: - get_tree().get_root().add_child(instanciaMenu)