diff --git a/projeto/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres b/projeto/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres index 41c5bcc..e6e6cd4 100644 --- a/projeto/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres +++ b/projeto/addons/dialogic/Editor/Events/styles/ResourceMenuPanelBackground.tres @@ -5,7 +5,7 @@ content_margin_left = 10.0 content_margin_right = 10.0 content_margin_top = 10.0 content_margin_bottom = 10.0 -bg_color = Color( 0.2, 0.23, 0.31, 1 ) +bg_color = Color( 0.364706, 0.396078, 0.486275, 1 ) border_width_left = 1 border_width_top = 1 border_width_right = 1 diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_Normal.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_Normal.png deleted file mode 100644 index 8fb2181..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_Normal.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 new file mode 100644 index 0000000..e2a499d Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_hover.png 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 index e2a499d..0d0aee7 100644 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png and b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_Mais_pressed.png 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 index 090766a..7d2f680 100644 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png and b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Leia_mais/Leia_mais.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Voltar/Voltar_normal.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Voltar/Voltar_normal.png deleted file mode 100644 index 9184801..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Voltar/Voltar_normal.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/noticia 1.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/noticia 1.png deleted file mode 100644 index e390a2a..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Feed_noticias/noticia 1.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Jogar.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Jogar.png deleted file mode 100644 index c963555..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/Jogar.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 index ac1bb52..5549a7c 100644 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png and b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/botao_jogar/jogar_normal.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card_outline.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card_outline.png deleted file mode 100644 index b4b8205..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card_outline.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura.png deleted file mode 100644 index 9b9c92e..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura_outline.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura_outline.png deleted file mode 100644 index 01b5442..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/moldura_outline.png and /dev/null differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia_outline.png b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia_outline.png deleted file mode 100644 index 6a9fd8d..0000000 Binary files a/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia_outline.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 new file mode 100644 index 0000000..a7ab228 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/outline_noticia.png differ diff --git a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png new file mode 100644 index 0000000..7405e64 Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/CabecalhoJornal.png differ diff --git "a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/cabe\303\247alho jornal (1).png" "b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/cabe\303\247alho jornal (1).png" deleted file mode 100644 index 44ed6be..0000000 Binary files "a/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/cabe\303\247alho jornal (1).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 new file mode 100644 index 0000000..9f4ba7c Binary files /dev/null and b/projeto/elementos/UI/minigame_senhorinha/Feed/cabecalho/logo.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0000.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0000.png new file mode 100644 index 0000000..0cbff27 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0000.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0001.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0001.png new file mode 100644 index 0000000..5ea6049 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0001.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0002.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0002.png new file mode 100644 index 0000000..ccfb46b Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0002.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0003.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0003.png new file mode 100644 index 0000000..6988328 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0003.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0004.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0004.png new file mode 100644 index 0000000..cffcd4b Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0004.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0005.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0005.png new file mode 100644 index 0000000..7cbc24a Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0005.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0006.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0006.png new file mode 100644 index 0000000..bf05f72 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0006.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0007.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0007.png new file mode 100644 index 0000000..cd36a4e Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0007.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0008.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0008.png new file mode 100644 index 0000000..2e6c032 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0008.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0009.png b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0009.png new file mode 100644 index 0000000..6d87e20 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/ataque_bombas/Timeline 1_0009.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/ataque_tentaculos/Timeline 1_0000.png b/projeto/elementos/imagem/enchente/chefe/ataque_tentaculos/Timeline 1_0000.png index cb73e05..1339eae 100644 Binary files a/projeto/elementos/imagem/enchente/chefe/ataque_tentaculos/Timeline 1_0000.png and b/projeto/elementos/imagem/enchente/chefe/ataque_tentaculos/Timeline 1_0000.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0000.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0000.png new file mode 100644 index 0000000..20fe20e Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0000.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0001.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0001.png new file mode 100644 index 0000000..2095929 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0001.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0002.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0002.png new file mode 100644 index 0000000..a9d74e7 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0002.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0003.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0003.png new file mode 100644 index 0000000..5a5bc80 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0003.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0004.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0004.png new file mode 100644 index 0000000..2aea635 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0004.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0005.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0005.png new file mode 100644 index 0000000..86422d3 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0005.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0006.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0006.png new file mode 100644 index 0000000..04b855e Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0006.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0007.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0007.png new file mode 100644 index 0000000..c107ab3 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0007.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0008.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0008.png new file mode 100644 index 0000000..4aa03d7 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0008.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0009.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0009.png new file mode 100644 index 0000000..e7d7b49 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0009.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0010.png b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0010.png new file mode 100644 index 0000000..70d48a0 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/in_out/Timeline 1_0010.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0000.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0000.png new file mode 100644 index 0000000..e705a8f Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0000.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0001.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0001.png new file mode 100644 index 0000000..74f1032 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0001.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0002.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0002.png new file mode 100644 index 0000000..4bccaf1 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0002.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0003.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0003.png new file mode 100644 index 0000000..735dfc2 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0003.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0004.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0004.png new file mode 100644 index 0000000..ee40f95 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0004.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0005.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0005.png new file mode 100644 index 0000000..9387745 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0005.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0006.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0006.png new file mode 100644 index 0000000..2270481 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0006.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0007.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0007.png new file mode 100644 index 0000000..4eb698f Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0007.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0008.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0008.png new file mode 100644 index 0000000..7cc20d3 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0008.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0009.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0009.png new file mode 100644 index 0000000..0d69014 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0009.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0010.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0010.png new file mode 100644 index 0000000..ec14ae2 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0010.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0011.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0011.png new file mode 100644 index 0000000..70c9226 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0011.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0012.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0012.png new file mode 100644 index 0000000..c2a21bd Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0012.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0013.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0013.png new file mode 100644 index 0000000..f620078 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0013.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0014.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0014.png new file mode 100644 index 0000000..53c4bce Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0014.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0015.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0015.png new file mode 100644 index 0000000..7213e8a Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0015.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0016.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0016.png new file mode 100644 index 0000000..4746da2 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0016.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0017.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0017.png new file mode 100644 index 0000000..e7683aa Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0017.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0018.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0018.png new file mode 100644 index 0000000..eabe747 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0018.png differ diff --git a/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0019.png b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0019.png new file mode 100644 index 0000000..ca22b89 Binary files /dev/null and b/projeto/elementos/imagem/enchente/chefe/tentaculos/Timeline 1_0019.png differ diff --git a/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd b/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd index 325fe6b..bf5a466 100644 --- a/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd +++ b/projeto/elementos/scripts/ScriptsCartaoDeLevel/CartaoGeral.gd @@ -6,12 +6,16 @@ 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 @@ -25,6 +29,7 @@ func _atualizar_card(): 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") @@ -39,7 +44,6 @@ func _atualizar_painel(): var valoresNoDict = loadJson(JsonCards) var valoresId = valoresNoDict.get(String(idCard)) - instanciaSaibaMais.Imagem_card = Imagem_card instanciaSaibaMais.E_jogavel = E_jogavel instanciaSaibaMais.Cena_do_jogo = Cena_do_jogo @@ -47,20 +51,41 @@ func _atualizar_painel(): Descricao_avancada = valoresId.get("DescricaoAvancada") instanciaSaibaMais.Descricao_avancada = Descricao_avancada - add_child(instanciaSaibaMais) + 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 @@ -75,11 +100,14 @@ func _on_SaibaMais_pressed(): func _on_coracaobotao_pressed(): var coracao_tween = $PainelPrincipal/Coracao/TweenCoracao - coracao_tween.interpolate_property($PainelPrincipal/Coracao, "scale", Vector2(1.907, 1.907), Vector2(2, 2), 0.2, Tween.TRANS_ELASTIC) - coracao_tween.interpolate_property($PainelPrincipal/Coracao, "scale", Vector2(2, 2), Vector2(1.907, 1.907), 0.2, Tween.TRANS_ELASTIC) + 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): @@ -93,3 +121,10 @@ func loadJson(nomejson): 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/recursos/feed_de_noticias/PainelSaibaMais.tscn b/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn index 171d8d6..1c36d05 100644 --- a/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn +++ b/projeto/recursos/feed_de_noticias/PainelSaibaMais.tscn @@ -2,104 +2,85 @@ [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/Voltar/Voltar_pressed.png" type="Texture" id=3] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/noticia_outline.png" type="Texture" id=4] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Voltar/Voltar_normal.png" type="Texture" id=5] +[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/Group 7.png" type="Texture" id=8] [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 = 24 +size = 27 font_data = ExtResource( 6 ) -[node name="PainelSaibaMais" type="CanvasLayer"] -script = ExtResource( 7 ) +[sub_resource type="DynamicFont" id=2] +size = 32 +font_data = ExtResource( 6 ) -[node name="Fundo" type="ColorRect" parent="."] -modulate = Color( 1, 1, 1, 0 ) -anchor_left = 0.503 -anchor_top = 0.5 -anchor_right = 0.503 -anchor_bottom = 0.5 -margin_left = -562.16 -margin_top = -765.0 -margin_right = 581.84 -margin_bottom = 727.0 -color = Color( 0.247059, 0.717647, 0.239216, 1 ) +[node name="PainelSaibaMais" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 7 ) -[node name="TweenFundo" type="Tween" parent="Fundo"] +[node name="CanvasLayer" type="CanvasLayer" parent="."] +follow_viewport_enable = true -[node name="PainelDescricao" type="TextureRect" parent="."] -modulate = Color( 1, 1, 1, 0 ) +[node name="PainelDescricao" type="TextureRect" parent="CanvasLayer"] anchor_left = 0.5 -anchor_top = 0.606 +anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.606 +anchor_bottom = 0.5 margin_left = -337.0 -margin_top = -498.68 +margin_top = 860.0 margin_right = 337.0 -margin_bottom = 499.321 +margin_bottom = 1637.0 theme = ExtResource( 1 ) texture = ExtResource( 2 ) expand = true stretch_mode = 1 -[node name="ImgCard" type="TextureRect" parent="PainelDescricao"] -anchor_left = 0.5 -anchor_top = 0.174 -anchor_right = 0.5 -anchor_bottom = 0.174 -margin_left = -337.0 -margin_top = -173.652 -margin_right = 337.0 -margin_bottom = 186.348 -theme = ExtResource( 1 ) -texture = ExtResource( 8 ) -expand = true -stretch_mode = 1 - -[node name="outline" type="TextureRect" parent="PainelDescricao"] +[node name="outline" type="TextureRect" parent="CanvasLayer/PainelDescricao"] anchor_left = 0.5 -anchor_top = 0.5 +anchor_top = 0.501 anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -344.0 -margin_top = -511.0 -margin_right = 344.0 -margin_bottom = 505.0 +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="Label" parent="PainelDescricao"] +[node name="Desc" type="RichTextLabel" parent="CanvasLayer/PainelDescricao"] anchor_left = 0.5 -anchor_top = 0.612 +anchor_top = 0.44 anchor_right = 0.5 -anchor_bottom = 0.612 -margin_left = -321.0 -margin_top = -235.776 -margin_right = 323.0 -margin_bottom = 258.224 -mouse_filter = 1 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 1 ) +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" -autowrap = true -max_lines_visible = 10 -[node name="SaibaMenos" type="TextureButton" parent="PainelDescricao"] -anchor_left = 0.498223 -anchor_top = 0.964 -anchor_right = 0.498223 -anchor_bottom = 0.964 -margin_left = -83.802 -margin_top = -24.072 -margin_right = 83.198 -margin_bottom = 20.928 +[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 ) @@ -107,63 +88,45 @@ texture_pressed = ExtResource( 3 ) expand = true stretch_mode = 4 -[node name="TweenSaibaMenos" type="Tween" parent="PainelDescricao/SaibaMenos"] - -[node name="voltar" type="Label" parent="PainelDescricao/SaibaMenos"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -79.5 -margin_top = -20.5 -margin_right = 75.5 -margin_bottom = 15.5 -mouse_filter = 1 -custom_colors/font_color = Color( 0, 0, 0, 1 ) -custom_fonts/font = SubResource( 1 ) -text = "Voltar" -align = 1 -valign = 1 -autowrap = true -max_lines_visible = 10 - -[node name="Jogar" type="TextureButton" parent="PainelDescricao"] -anchor_left = 0.49919 -anchor_top = 0.902879 -anchor_right = 0.49919 -anchor_bottom = 0.902879 -margin_left = -96.4541 -margin_top = -21.0733 -margin_right = 96.5459 -margin_bottom = 27.9267 +[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 = 4 +stretch_mode = 5 -[node name="TweenJogar" type="Tween" parent="PainelDescricao/Jogar"] +[node name="TweenJogar" type="Tween" parent="CanvasLayer/PainelDescricao/Jogar"] -[node name="Jogar" type="Label" parent="PainelDescricao/Jogar"] -anchor_left = 0.5 +[node name="Jogar" type="Label" parent="CanvasLayer/PainelDescricao/Jogar"] +anchor_left = 0.489 anchor_top = 0.5 -anchor_right = 0.5 +anchor_right = 0.489 anchor_bottom = 0.5 -margin_left = -80.4997 -margin_top = -18.5007 -margin_right = 74.5003 -margin_bottom = 17.4993 +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( 1 ) -text = "Jogar" +custom_fonts/font = SubResource( 2 ) +text = "jogar" align = 1 valign = 1 autowrap = true max_lines_visible = 10 -[node name="TweenPainel" type="Tween" parent="PainelDescricao"] +[node name="TweenPainel" type="Tween" parent="CanvasLayer/PainelDescricao"] -[connection signal="button_up" from="PainelDescricao/SaibaMenos" to="." method="_on_SaibaMenos_button_up"] -[connection signal="button_up" from="PainelDescricao/Jogar" to="." method="_on_Jogar_button_up"] +[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/ManuseadorDaDescricaoAvancada.gd b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd index c1b4894..89d637c 100644 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd +++ b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/ManuseadorDaDescricaoAvancada.gd @@ -1,15 +1,13 @@ -extends CanvasLayer - -onready var card_img: TextureRect = $PainelDescricao/ImgCard -onready var desc_avanc: Label = $PainelDescricao/Desc -onready var btn_jogar = $PainelDescricao/Jogar -onready var btn_saiba_menos = $PainelDescricao/SaibaMenos -onready var botao_jogar_tween = $PainelDescricao/Jogar/TweenJogar -onready var botao_SaibaMenos_tween = $PainelDescricao/SaibaMenos/TweenSaibaMenos -onready var TweenFundo = $Fundo/TweenFundo -onready var TweenPainel = $PainelDescricao/TweenPainel -onready var Fundo = $Fundo -onready var PainelDescricao = $PainelDescricao +extends Control + +onready var desc_avanc: RichTextLabel = $CanvasLayer/PainelDescricao/Desc +onready var btn_jogar: TextureButton = $CanvasLayer/PainelDescricao/Jogar +onready var btn_saiba_menos: TextureButton = $CanvasLayer/PainelDescricao/SaibaMenos +onready var botao_jogar_tween: Tween = $CanvasLayer/PainelDescricao/Jogar/TweenJogar +onready var botao_SaibaMenos_tween: Tween = $CanvasLayer/PainelDescricao/SaibaMenos/TweenSaibaMenos +onready var TweenPainel: Tween = $CanvasLayer/PainelDescricao/TweenPainel +onready var PainelDescricao = $CanvasLayer/PainelDescricao +onready var lugar_na_tela = $CanvasLayer/PainelDescricao.rect_global_position.x var Descricao_avancada: String var Imagem_card: StreamTexture @@ -23,13 +21,10 @@ func _ready(): else: btn_jogar.visible = false - card_img.texture = Imagem_card desc_avanc.text = Descricao_avancada - TweenPainel.interpolate_property(PainelDescricao, "modulate:a", 0, 1, 0.7, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - TweenFundo.interpolate_property(Fundo, "modulate:a", 0, 1, 0.7, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) + TweenPainel.interpolate_property(PainelDescricao, "rect_position", Vector2(lugar_na_tela, 1350), Vector2(lugar_na_tela, 498), 0.65, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) TweenPainel.start() - TweenFundo.start() func _auto_deletar(): if saiba_menos_apertado: @@ -37,14 +32,12 @@ func _auto_deletar(): func _on_SaibaMenos_button_up(): botao_SaibaMenos_tween.start() - botao_SaibaMenos_tween.interpolate_property(btn_saiba_menos, "rect_scale", Vector2(1, 1), Vector2(1.1, 1.1), 0.1, Tween.TRANS_ELASTIC) - botao_SaibaMenos_tween.interpolate_property(btn_saiba_menos, "rect_scale", Vector2(1.1, 1.1), Vector2(1, 1), 0.1, Tween.TRANS_ELASTIC) + botao_SaibaMenos_tween.interpolate_property(btn_saiba_menos, "rect_scale", Vector2(1.175, 0.695), Vector2(1.25, 0.74), 0.1, Tween.TRANS_ELASTIC) + botao_SaibaMenos_tween.interpolate_property(btn_saiba_menos, "rect_scale", Vector2(1.25, 0.74), Vector2(1.175, 0.695), 0.1, Tween.TRANS_ELASTIC) saiba_menos_apertado = true - TweenPainel.interpolate_property(PainelDescricao, "modulate:a", 1, 0, 0.7, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) - TweenFundo.interpolate_property(Fundo, "modulate:a", 1, 0, 0.7, Tween.TRANS_CUBIC, Tween.EASE_IN_OUT) + TweenPainel.interpolate_property(PainelDescricao, "rect_position", Vector2(lugar_na_tela, 498), Vector2(lugar_na_tela, 1350), 1.4, Tween.TRANS_ELASTIC, Tween.EASE_IN_OUT) TweenPainel.start() - TweenFundo.start() - yield(TweenFundo, "tween_completed") + yield(TweenPainel, "tween_completed") _auto_deletar() func _on_Jogar_button_up(): diff --git a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn index e2db89d..505da13 100644 --- a/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn +++ b/projeto/recursos/feed_de_noticias/SeletorDeNiveis/cartao_de_noticia.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=25 format=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Noticia_aberta/card_outline.png" type="Texture" id=1] +[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] @@ -9,116 +9,50 @@ [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_pressed.png" type="Texture" id=10] +[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/Leia_mais/Leia_Mais_Normal.png" type="Texture" id=13] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/Feed_noticias/Like/Like_unpressed.png" type="Texture" id=14] +[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/texto/NoticiaText-Regular.ttf" type="DynamicFontData" id=19] -[ext_resource path="res://elementos/texto/NoticiaText-Italic.ttf" type="DynamicFontData" id=20] -[ext_resource path="res://elementos/texto/NoticiaText-Bold.ttf" type="DynamicFontData" id=21] - -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ ExtResource( 14 ) ], -"loop": true, -"name": "Idle", -"speed": 5.0 -}, { -"frames": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 7 ), ExtResource( 9 ), ExtResource( 8 ), ExtResource( 10 ) ], -"loop": false, -"name": "Play", -"speed": 15.0 -} ] +[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 = 22 -font_data = ExtResource( 20 ) +size = 26 +font_data = ExtResource( 18 ) [sub_resource type="DynamicFont" id=8] -size = 22 -font_data = ExtResource( 21 ) +size = 26 +font_data = ExtResource( 18 ) [sub_resource type="DynamicFont" id=9] -size = 22 -font_data = ExtResource( 19 ) +size = 26 +font_data = ExtResource( 18 ) [sub_resource type="DynamicFont" id=6] -size = 21 -font_data = ExtResource( 19 ) +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:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 1 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ 0, 6 ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("../PainelPrincipal/Coracao:playing") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 0.2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ false, true ] -} - -[sub_resource type="Animation" id=10] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("../PainelPrincipal/Coracao:frame") +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 ), -"transitions": PoolRealArray( 1 ), +"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": [ 0 ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("../PainelPrincipal/Coracao:speed_scale") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0.001 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ 1.5 ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("../PainelPrincipal/Coracao:playing") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0.001 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] +"values": [ ExtResource( 14 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 7 ), ExtResource( 9 ), ExtResource( 8 ), ExtResource( 10 ) ] } [node name="CartaoDeNoticia" type="Control"] @@ -134,6 +68,8 @@ __meta__ = { } 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 ) @@ -166,6 +102,23 @@ 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 @@ -176,7 +129,7 @@ margin_top = -346.027 margin_right = 313.441 margin_bottom = 312.038 theme = ExtResource( 2 ) -texture = ExtResource( 1 ) +texture = ExtResource( 19 ) expand = true __meta__ = { "_edit_use_anchors_": true @@ -184,13 +137,13 @@ __meta__ = { [node name="PainelPrincipal" type="TextureRect" parent="."] anchor_left = 0.503 -anchor_top = 0.535 +anchor_top = 0.500658 anchor_right = 0.503 -anchor_bottom = 0.535 +anchor_bottom = 0.500659 margin_left = -307.16 -margin_top = -357.48 +margin_top = -363.479 margin_right = 324.84 -margin_bottom = 357.52 +margin_bottom = 351.521 theme = ExtResource( 2 ) texture = ExtResource( 5 ) expand = true @@ -216,28 +169,26 @@ __meta__ = { } [node name="outline" type="TextureRect" parent="PainelPrincipal"] -anchor_left = 0.501389 -anchor_top = 0.491533 -anchor_right = 0.501389 -anchor_bottom = 0.491533 +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( 1 ) +texture = ExtResource( 19 ) expand = true __meta__ = { "_edit_use_anchors_": true } -[node name="Coracao" type="AnimatedSprite" parent="PainelPrincipal"] -position = Vector2( 50, 656.999 ) -scale = Vector2( 1.90712, 1.90712 ) -frames = SubResource( 1 ) -animation = "Play" -speed_scale = 1.5 +[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 @@ -257,8 +208,8 @@ __meta__ = { [node name="TweenCoracao" type="Tween" parent="PainelPrincipal/Coracao"] [node name="Chat" type="Sprite" parent="PainelPrincipal"] -position = Vector2( 127, 656.999 ) -scale = Vector2( 1.90712, 1.90712 ) +position = Vector2( 147, 647.999 ) +scale = Vector2( 1.20356, 1.20356 ) texture = ExtResource( 15 ) [node name="SaibaMais" type="TextureButton" parent="PainelPrincipal"] @@ -271,7 +222,7 @@ margin_top = -31.0707 margin_right = 105.68 margin_bottom = 31.1038 mouse_filter = 1 -texture_normal = ExtResource( 13 ) +texture_normal = ExtResource( 1 ) texture_pressed = ExtResource( 17 ) expand = true __meta__ = { @@ -297,7 +248,7 @@ valign = 1 anchor_left = 0.0268987 anchor_top = 0.522752 anchor_right = 0.951265 -anchor_bottom = 0.641047 +anchor_bottom = 0.615872 margin_top = 0.23175 margin_right = -0.199768 margin_bottom = -0.349213 @@ -317,10 +268,10 @@ __meta__ = { } [node name="Desc" type="Label" parent="PainelPrincipal"] -anchor_left = 0.0221519 -anchor_top = 0.633566 -anchor_right = 0.94462 -anchor_bottom = 0.848951 +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 ) @@ -335,7 +286,6 @@ __meta__ = { root_node = NodePath(".") playback_speed = 1.4 "anims/Animação" = SubResource( 2 ) -anims/RESET = SubResource( 10 ) [node name="AudioStreamCartao" type="AudioStreamPlayer" parent="."] bus = "SFX Menu" @@ -343,6 +293,11 @@ 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.tscn b/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn index 5194fc0..3596d0f 100644 --- a/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn +++ b/projeto/recursos/feed_de_noticias/feed_de_noticia.tscn @@ -1,13 +1,15 @@ -[gd_scene load_steps=10 format=2] +[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/cabeçalho_jornal.png" type="Texture" id=3] +[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 @@ -65,8 +67,8 @@ scroll_horizontal_enabled = false [node name="VBoxContainer" type="VBoxContainer" parent="ContainerDeScroll"] margin_right = 720.0 -margin_bottom = 1456.0 -rect_min_size = Vector2( 720, 1456 ) +margin_bottom = 2912.0 +rect_min_size = Vector2( 720, 2912 ) alignment = 1 script = ExtResource( 2 ) tamanho_total = 728 @@ -76,7 +78,7 @@ anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 720.0 -margin_bottom = 726.0 +margin_bottom = 725.0 idCard = "SurfTerminalBandeira" Cena_do_jogo = "res://recursos/jogos/enchente/abertura/CutsceneBase.tscn" @@ -84,42 +86,69 @@ Cena_do_jogo = "res://recursos/jogos/enchente/abertura/CutsceneBase.tscn" anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 730.0 +margin_top = 729.0 margin_right = 720.0 -margin_bottom = 1456.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_bottom = -0.23999 +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.403 +anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 0.403 +anchor_bottom = 0.5 margin_left = -360.0 -margin_top = -503.117 +margin_top = -511.12 margin_right = 360.0 -margin_bottom = 136.883 +margin_bottom = 128.88 texture = ExtResource( 3 ) expand = true -[node name="ColorRect" type="ColorRect" parent="Logo"] -anchor_left = 0.5 -anchor_top = -0.458 -anchor_right = 0.5 -anchor_bottom = -0.458 -margin_left = -360.0 -margin_top = -164.17 -margin_right = 360.0 -margin_bottom = 163.83 -color = Color( 1, 0.52549, 0.52549, 1 ) +[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 ) @@ -131,7 +160,5 @@ stream = ExtResource( 6 ) bus = "SFX Menu" script = SubResource( 1 ) -[node name="BotaoMenufeed" parent="." instance=ExtResource( 7 )] - [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 new file mode 100644 index 0000000..d73457d --- /dev/null +++ b/projeto/recursos/feed_de_noticias/logo.gd @@ -0,0 +1,10 @@ +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 index 3ed4ff7..7625fa8 100644 --- a/projeto/recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn +++ b/projeto/recursos/feed_de_noticias/menu_opcoes_feed/BotaoMenuFeed.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/menu.png" type="Texture" id=1] +[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.png" type="Texture" id=3] +[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 diff --git a/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn b/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn index f0be16b..4f48ed3 100644 --- a/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn +++ b/projeto/recursos/jogos/enchente/menu_de_opcoes/BotaoMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://elementos/UI/minigame_senhorinha/Feed/cabecalho/menu_pressed.png" type="Texture" id=1] +[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]