Merge pull request #154 from tecMTST/146-bug-troca-do-feed-para-um-me…

…nu-inicial-e-adição-de-telas-de-vitória-e-derrota

146 troca do feed para um menu inicial e adição de telas de vitória e derrota

.gitignore

@@ -13,3 +13,6 @@ data_*/
 mono_crash.*.json
 
 exportados/
+
+.idea
+.vscode

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"

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"]