Merge pull request #178 from tecMTST/169-aplicar-UI

Assets de UI (menu principal by Rodolfo)

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

projeto/recursos/Menu_principal/Menu_Principal.tscn

@@ -1,27 +1,28 @@
-[gd_scene load_steps=26 format=2]
+[gd_scene load_steps=28 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/botao_jogar_pressed.png" type="Texture" id=2]
+[ext_resource path="res://elementos/UI/botao_jogar_default.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/bandeirinha/Timeline 1_0002.png" type="Texture" id=10]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0007.png" type="Texture" id=11]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0005.png" type="Texture" id=12]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0009.png" type="Texture" id=13]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0006.png" type="Texture" id=14]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0008.png" type="Texture" id=15]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0001.png" type="Texture" id=16]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0010.png" type="Texture" id=17]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0000.png" type="Texture" id=18]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0004.png" type="Texture" id=19]
+[ext_resource path="res://elementos/UI/bandeirinha/Timeline 1_0003.png" type="Texture" id=20]
 [ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/Sky_BG.png" type="Texture" id=21]
 [ext_resource path="res://recursos/jogos/enchente/abertura/CutsceneBase.tscn" type="PackedScene" id=22]
+[ext_resource path="res://elementos/UI/botao_jogar_hover.png" type="Texture" id=23]
 
 [sub_resource type="Shader" id=1]
 code = "shader_type canvas_item;
@@ -38,13 +39,36 @@ 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
-} ]
+[sub_resource type="Animation" id=3]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/path = NodePath(".: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 ),
+"update": 1,
+"values": [ ExtResource( 16 ) ]
+}
+
+[sub_resource type="Animation" id=4]
+resource_name = "start"
+loop = true
+tracks/0/type = "value"
+tracks/0/path = NodePath(".: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, 0.7, 0.8, 0.9, 1 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ),
+"update": 1,
+"values": [ ExtResource( 18 ), ExtResource( 16 ), ExtResource( 10 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 12 ), ExtResource( 14 ), ExtResource( 11 ), ExtResource( 15 ), ExtResource( 13 ), ExtResource( 17 ) ]
+}
 
 [node name="Menu_Principal" type="Control"]
 anchor_left = 0.5
@@ -120,57 +144,57 @@ 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
+anchor_left = 0.506
+anchor_top = 0.31
+anchor_right = 0.506
+anchor_bottom = 0.31
+margin_left = -247.32
+margin_top = -125.8
+margin_right = 124.68
+margin_bottom = 63.2
 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 )
+[node name="Bandeira" type="TextureRect" parent="Background"]
+anchor_left = 0.527
+anchor_top = 0.855
+anchor_right = 0.527
+anchor_bottom = 0.855
+margin_left = -140.44
+margin_top = -402.4
+margin_right = 140.56
+margin_bottom = 402.6
+texture = ExtResource( 16 )
 expand = true
 stretch_mode = 5
+__meta__ = {
+"_edit_use_anchors_": true
+}
 
-[node name="tween_opcoes" type="Tween" parent="Buttons/Btn_Opcoes"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="Background/Bandeira"]
+autoplay = "start"
+anims/RESET = SubResource( 3 )
+anims/start = SubResource( 4 )
+
+[node name="Buttons" type="CanvasLayer" parent="."]
 
 [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 )
+anchor_left = 0.506
+anchor_top = 0.789
+anchor_right = 0.506
+anchor_bottom = 0.789
+margin_left = -249.32
+margin_top = -87.92
+margin_right = 248.68
+margin_bottom = 87.08
+rect_pivot_offset = Vector2( 249, 88 )
+texture_normal = ExtResource( 3 )
+texture_pressed = ExtResource( 2 )
+texture_hover = ExtResource( 23 )
 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"]

projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn

@@ -1,16 +1,10 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=6 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 )
+[ext_resource path="res://elementos/UI/botao_tentar_novamente_default.png" type="Texture" id=1]
+[ext_resource path="res://elementos/UI/botao_tentar_novamente_pressed.png" type="Texture" id=2]
+[ext_resource path="res://elementos/UI/card_derrota.png" type="Texture" id=3]
+[ext_resource path="res://elementos/UI/botao_tentar_novamente_hover.png" type="Texture" id=4]
+[ext_resource path="res://recursos/Menu_principal/TelasExtras/Tela_derrota.gd" type="Script" id=7]
 
 [node name="Tela_Derrota" type="Control"]
 anchor_left = 0.5
@@ -33,77 +27,33 @@ 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
+anchor_left = 0.506
+anchor_top = 0.512
+anchor_right = 0.506
+anchor_bottom = 0.512
+margin_left = -262.32
+margin_top = -393.36
+margin_right = 253.68
+margin_bottom = 274.64
 mouse_filter = 0
-texture = ExtResource( 2 )
+texture = ExtResource( 3 )
 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
+stretch_mode = 6
+
+[node name="Voltarjogo" type="TextureButton" parent="Menu"]
+anchor_left = 0.486
+anchor_top = 1.112
+anchor_right = 0.486
+anchor_bottom = 1.112
+margin_left = -233.776
+margin_top = -44.8161
+margin_right = 234.224
+margin_bottom = 45.1839
 toggle_mode = true
-texture_normal = ExtResource( 3 )
-texture_pressed = ExtResource( 4 )
-texture_hover = ExtResource( 5 )
+texture_normal = ExtResource( 1 )
+texture_pressed = ExtResource( 2 )
+texture_hover = ExtResource( 4 )
 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
+stretch_mode = 5
 
-[connection signal="button_up" from="Menu/VoltarMenu" to="." method="_on_VoltarMenu_button_up"]
+[connection signal="button_up" from="Menu/Voltarjogo" to="." method="_on_Voltarjogo_button_up"]