Merge pull request #192 from tecMTST/remocao-de-bandeira

Remocao de bandeira e botão de menu

projeto/elementos/modelos/skybox/skyboxNuvens.tscn

@@ -925,8 +925,28 @@ material/3 = ExtResource( 10 )
 material/4 = ExtResource( 8 )
 material/5 = ExtResource( 11 )
 
+[node name="Plane3" type="MeshInstance" parent="."]
+transform = Transform( -1.21686, -0.103247, 0.138969, -0.0379539, 1.15224, 0.349844, -0.323126, 0.566785, -1.13555, -5.96046e-08, 1.32958, 0 )
+mesh = SubResource( 19 )
+material/0 = ExtResource( 12 )
+material/1 = ExtResource( 1 )
+material/2 = ExtResource( 9 )
+material/3 = ExtResource( 10 )
+material/4 = ExtResource( 8 )
+material/5 = ExtResource( 11 )
+
 [node name="Plane2" type="MeshInstance" parent="."]
-transform = Transform( -0.809658, 0, 0.86558, 0, 1.2382, 0, -1.40237, 0, -0.499743, -5.96046e-08, 0, 0 )
+transform = Transform( -0.809659, 0, 0.86558, 0, 1.2382, 0, -1.40237, 0, -0.499743, -5.96046e-08, 0, 0 )
+mesh = SubResource( 19 )
+material/0 = ExtResource( 12 )
+material/1 = ExtResource( 1 )
+material/2 = ExtResource( 9 )
+material/3 = ExtResource( 10 )
+material/4 = ExtResource( 8 )
+material/5 = ExtResource( 11 )
+
+[node name="Plane4" type="MeshInstance" parent="."]
+transform = Transform( -1.04709, 0.0522926, 0.735398, 0.182083, 1.22065, 0.0648864, -1.00625, 0.257757, -0.817084, -5.96046e-08, 1.6644, 0 )
 mesh = SubResource( 19 )
 material/0 = ExtResource( 12 )
 material/1 = ExtResource( 1 )

projeto/recursos/Menu_principal/Menu_Principal.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=29 format=2]
+[gd_scene load_steps=30 format=2]
 
 [ext_resource path="res://elementos/UI/minigame_senhorinha/MenuPrincipal/Clouds_BG.png" type="Texture" id=1]
 [ext_resource path="res://elementos/UI/botao_jogar_pressed.png" type="Texture" id=2]
@@ -24,6 +24,7 @@
 [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]
 [ext_resource path="res://elementos/audio/sfx/hud-clique.mp3" type="AudioStream" id=24]
+[ext_resource path="res://recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn" type="PackedScene" id=25]
 
 [sub_resource type="Shader" id=1]
 code = "shader_type canvas_item;
@@ -99,40 +100,39 @@ bus = "SFX Menu"
 [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
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -1544.0
+margin_top = -495.0
+margin_right = 1552.0
+margin_bottom = 471.0
 texture = ExtResource( 21 )
+expand = true
 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
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -1540.0
+margin_top = -54.0
+margin_right = 1555.0
+margin_bottom = -480.0
 texture = ExtResource( 1 )
+expand = true
 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
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = -1535.0
+margin_top = -487.0
+margin_right = 1567.0
+margin_bottom = 502.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
 texture = ExtResource( 4 )
+expand = true
 stretch_mode = 1
 
 [node name="Logo" type="TextureRect" parent="Background"]
@@ -149,14 +149,14 @@ texture = ExtResource( 6 )
 stretch_mode = 6
 
 [node name="Titulo" type="TextureRect" parent="Background"]
-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
+anchor_left = 0.501
+anchor_top = 0.395
+anchor_right = 0.501
+anchor_bottom = 0.395
+margin_left = -316.72
+margin_top = -161.6
+margin_right = 159.28
+margin_bottom = 80.4
 rect_scale = Vector2( 1.33029, 1.33029 )
 texture = ExtResource( 7 )
 stretch_mode = 6
@@ -202,5 +202,15 @@ stretch_mode = 5
 
 [node name="tween_jogar" type="Tween" parent="Buttons/Btn_Jogar"]
 
+[node name="BotaoMenu" parent="." instance=ExtResource( 25 )]
+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
+
 [connection signal="button_down" from="Buttons/Btn_Jogar" to="." method="_on_Btn_Jogar_button_down"]
 [connection signal="button_up" from="Buttons/Btn_Jogar" to="." method="_on_Jogar_button_up"]

projeto/recursos/Menu_principal/TelasExtras/Instrucoes.tscn

@@ -495,10 +495,10 @@ anchor_left = 0.242
 anchor_top = 0.598
 anchor_right = 0.242
 anchor_bottom = 0.598
-margin_left = -40.998
-margin_top = -120.696
-margin_right = 45.002
-margin_bottom = 148.304
+margin_left = 133.0
+margin_top = 329.0
+margin_right = 219.0
+margin_bottom = 598.0
 rect_pivot_offset = Vector2( 43, 133 )
 texture = ExtResource( 13 )
 expand = true
@@ -509,10 +509,10 @@ anchor_left = 0.362
 anchor_top = 0.512
 anchor_right = 0.362
 anchor_bottom = 0.512
-margin_left = -84.278
-margin_top = 57.976
-margin_right = 84.704
-margin_bottom = 226.981
+margin_left = 176.0
+margin_top = 443.0
+margin_right = 344.982
+margin_bottom = 612.005
 rect_rotation = -5.0
 rect_pivot_offset = Vector2( 86, 85 )
 texture = ExtResource( 12 )

projeto/recursos/Menu_principal/TelasExtras/Instrucoes_unica.tscn

@@ -496,10 +496,10 @@ anchor_left = 0.242
 anchor_top = 0.598
 anchor_right = 0.242
 anchor_bottom = 0.598
-margin_left = -40.998
-margin_top = -120.696
-margin_right = 45.002
-margin_bottom = 148.304
+margin_left = 133.0
+margin_top = 329.0
+margin_right = 219.0
+margin_bottom = 598.0
 rect_pivot_offset = Vector2( 43, 133 )
 texture = ExtResource( 13 )
 expand = true
@@ -510,10 +510,10 @@ anchor_left = 0.362
 anchor_top = 0.512
 anchor_right = 0.362
 anchor_bottom = 0.512
-margin_left = -84.278
-margin_top = 57.976
-margin_right = 84.704
-margin_bottom = 226.981
+margin_left = 176.0
+margin_top = 443.0
+margin_right = 344.982
+margin_bottom = 612.005
 rect_rotation = -5.0
 rect_pivot_offset = Vector2( 86, 85 )
 texture = ExtResource( 12 )

projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn

@@ -1,29 +1,34 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://elementos/UI/botao_pause_default.png" type="Texture" id=1]
 [ext_resource path="res://recursos/Menu_principal/menu_opcoes/botaoMenu.gd" type="Script" id=2]
 [ext_resource path="res://elementos/UI/botao_pause_hover.png" type="Texture" id=3]
 [ext_resource path="res://elementos/UI/botao_pause_pressed.png" type="Texture" id=4]
 [ext_resource path="res://elementos/audio/sfx/hud-clique.mp3" type="AudioStream" id=5]
+[ext_resource path="res://elementos/UI/botao_opcoes_hover.png" type="Texture" id=6]
+[ext_resource path="res://elementos/UI/botao_opcoes_pressed.png" type="Texture" id=7]
+[ext_resource path="res://elementos/UI/botao_opcoes_default.png" type="Texture" id=8]
 
 [node name="BotaoMenu" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( 2 )
+img_pause = [ ExtResource( 1 ), ExtResource( 4 ), ExtResource( 3 ) ]
+img_config = [ ExtResource( 8 ), ExtResource( 7 ), ExtResource( 6 ) ]
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 layer = 5
 
 [node name="Menu" type="TextureButton" parent="CanvasLayer"]
-anchor_left = 0.89
-anchor_top = 0.124
-anchor_right = 0.89
-anchor_bottom = 0.124
-margin_left = -43.8001
-margin_top = -43.72
-margin_right = 44.1999
-margin_bottom = 44.28
-rect_pivot_offset = Vector2( 44, 44 )
+anchor_left = 0.887
+anchor_top = 0.118
+anchor_right = 0.887
+anchor_bottom = 0.118
+margin_left = -53.64
+margin_top = -54.04
+margin_right = 54.36
+margin_bottom = 53.96
+rect_pivot_offset = Vector2( 54, 54 )
 texture_normal = ExtResource( 1 )
 texture_pressed = ExtResource( 4 )
 texture_hover = ExtResource( 3 )

projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn

@@ -21,6 +21,7 @@ font_data = ExtResource( 4 )
 
 [node name="MenuDeOpcoes" type="CanvasLayer"]
 pause_mode = 2
+layer = 7
 script = ExtResource( 6 )
 
 [node name="MenuDeOpcoes" type="Control" parent="."]