From f9b6ea4f1186092e2022bb4b8b833abc877a7c27 Mon Sep 17 00:00:00 2001 From: ClockWritesDev Date: Sun, 10 Nov 2024 18:15:05 -0300 Subject: [PATCH 1/2] fix do fix --- .../Menu_principal/Menu_Principal.tscn | 14 +++--------- .../TelasExtras/Instrucoes.tscn | 20 +++++++---------- .../TelasExtras/Instrucoes_unica.tscn | 20 +++++++---------- .../TelasExtras/Tela_Derrota.tscn | 6 +---- .../TelasExtras/Tela_Vitoria.tscn | 6 +---- .../Menu_principal/menu_opcoes/BotaoMenu.tscn | 16 +++++++------- .../menu_opcoes/MenuDeOpcoes.tscn | 10 ++------- .../Menu_principal/menu_opcoes/MenuOpcoes.gd | 22 ++++++++++++------- .../menu_opcoes/TemaSeletorDeLevel.tres | 2 +- .../Menu_principal/menu_opcoes/botaoMenu.gd | 13 ++++++----- .../jogos/enchente/cenas/Enchente.tscn | 7 ++++-- .../jogos/enchente/jogador/playerLane3D.tscn | 5 +---- 12 files changed, 60 insertions(+), 81 deletions(-) diff --git a/projeto/recursos/Menu_principal/Menu_Principal.tscn b/projeto/recursos/Menu_principal/Menu_Principal.tscn index 2c4026f..26ab611 100644 --- a/projeto/recursos/Menu_principal/Menu_Principal.tscn +++ b/projeto/recursos/Menu_principal/Menu_Principal.tscn @@ -102,10 +102,6 @@ bus = "SFX Menu" [node name="Bg_3" type="TextureRect" parent="Background"] 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 @@ -114,10 +110,10 @@ stretch_mode = 1 material = SubResource( 2 ) anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -1540.0 +margin_left = -1652.0 margin_top = -54.0 -margin_right = 1555.0 -margin_bottom = -480.0 +margin_right = 1722.0 +margin_bottom = -416.0 texture = ExtResource( 1 ) expand = true stretch_mode = 6 @@ -125,10 +121,6 @@ stretch_mode = 6 [node name="Bg_1" type="TextureRect" parent="Background"] 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 ) diff --git a/projeto/recursos/Menu_principal/TelasExtras/Instrucoes.tscn b/projeto/recursos/Menu_principal/TelasExtras/Instrucoes.tscn index 8ab56a6..0b7df5a 100644 --- a/projeto/recursos/Menu_principal/TelasExtras/Instrucoes.tscn +++ b/projeto/recursos/Menu_principal/TelasExtras/Instrucoes.tscn @@ -317,10 +317,6 @@ layer = 10 [node name="ColorRect" type="ColorRect" parent="canvasinstrucoes"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -2019.0 -margin_top = -1014.0 -margin_right = 2027.0 -margin_bottom = 1356.0 color = Color( 0.109804, 0.109804, 0.109804, 0.607843 ) __meta__ = { "_edit_lock_": true @@ -495,10 +491,10 @@ anchor_left = 0.242 anchor_top = 0.598 anchor_right = 0.242 anchor_bottom = 0.598 -margin_left = 133.0 -margin_top = 329.0 -margin_right = 219.0 -margin_bottom = 598.0 +margin_left = -40.998 +margin_top = -120.696 +margin_right = 45.002 +margin_bottom = 148.304 rect_pivot_offset = Vector2( 43, 133 ) texture = ExtResource( 13 ) expand = true @@ -509,10 +505,10 @@ anchor_left = 0.362 anchor_top = 0.512 anchor_right = 0.362 anchor_bottom = 0.512 -margin_left = 176.0 -margin_top = 443.0 -margin_right = 344.982 -margin_bottom = 612.005 +margin_left = -84.278 +margin_top = 57.976 +margin_right = 84.704 +margin_bottom = 226.981 rect_rotation = -5.0 rect_pivot_offset = Vector2( 86, 85 ) texture = ExtResource( 12 ) diff --git a/projeto/recursos/Menu_principal/TelasExtras/Instrucoes_unica.tscn b/projeto/recursos/Menu_principal/TelasExtras/Instrucoes_unica.tscn index 48a38ff..94bd377 100644 --- a/projeto/recursos/Menu_principal/TelasExtras/Instrucoes_unica.tscn +++ b/projeto/recursos/Menu_principal/TelasExtras/Instrucoes_unica.tscn @@ -317,10 +317,6 @@ layer = 10 [node name="ColorRect" type="ColorRect" parent="canvasinstrucoes"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -2019.0 -margin_top = -1014.0 -margin_right = 2027.0 -margin_bottom = 1356.0 color = Color( 0.109804, 0.109804, 0.109804, 0.607843 ) __meta__ = { "_edit_lock_": true @@ -496,10 +492,10 @@ anchor_left = 0.242 anchor_top = 0.598 anchor_right = 0.242 anchor_bottom = 0.598 -margin_left = 133.0 -margin_top = 329.0 -margin_right = 219.0 -margin_bottom = 598.0 +margin_left = -40.998 +margin_top = -120.696 +margin_right = 45.002 +margin_bottom = 148.304 rect_pivot_offset = Vector2( 43, 133 ) texture = ExtResource( 13 ) expand = true @@ -510,10 +506,10 @@ anchor_left = 0.362 anchor_top = 0.512 anchor_right = 0.362 anchor_bottom = 0.512 -margin_left = 176.0 -margin_top = 443.0 -margin_right = 344.982 -margin_bottom = 612.005 +margin_left = -84.278 +margin_top = 57.976 +margin_right = 84.704 +margin_bottom = 226.981 rect_rotation = -5.0 rect_pivot_offset = Vector2( 86, 85 ) texture = ExtResource( 12 ) diff --git a/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn b/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn index 339f547..712f50c 100644 --- a/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn +++ b/projeto/recursos/Menu_principal/TelasExtras/Tela_Derrota.tscn @@ -25,11 +25,7 @@ script = ExtResource( 7 ) [node name="Transparencia" type="ColorRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -1440.0 -margin_top = -708.0 -margin_right = 1520.0 -margin_bottom = 780.0 -color = Color( 0.0862745, 0.0862745, 0.0862745, 0.752941 ) +color = Color( 0.0901961, 0, 0, 0.47451 ) [node name="Menu" type="TextureRect" parent="."] pause_mode = 2 diff --git a/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn b/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn index 4e40104..a00dfbf 100644 --- a/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn +++ b/projeto/recursos/Menu_principal/TelasExtras/Tela_Vitoria.tscn @@ -25,11 +25,7 @@ script = ExtResource( 7 ) [node name="Transparencia" type="ColorRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -1529.0 -margin_top = -775.0 -margin_right = 1872.0 -margin_bottom = 539.0 -color = Color( 0.0862745, 0.0862745, 0.0862745, 0.752941 ) +color = Color( 0.0862745, 0.0862745, 0.0862745, 0.94902 ) [node name="Menu" type="TextureRect" parent="."] pause_mode = 2 diff --git a/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn b/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn index 75985e6..f860898 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn +++ b/projeto/recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn @@ -20,14 +20,14 @@ img_config = [ ExtResource( 8 ), ExtResource( 7 ), ExtResource( 6 ) ] layer = 5 [node name="Menu" type="TextureButton" parent="CanvasLayer"] -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 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = 225.0 +margin_top = -542.0 +margin_right = 333.0 +margin_bottom = -434.0 rect_pivot_offset = Vector2( 54, 54 ) texture_normal = ExtResource( 1 ) texture_pressed = ExtResource( 4 ) diff --git a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn index b30e743..ac397f2 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn @@ -37,14 +37,8 @@ margin_bottom = 474.0 rect_scale = Vector2( 1.31255, 1.31255 ) [node name="Transparencia" type="ColorRect" parent="MenuDeOpcoes"] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -1884.0 -margin_top = -1002.0 -margin_right = 1851.0 -margin_bottom = 1221.0 +anchor_right = 1.0 +anchor_bottom = 1.0 color = Color( 0.0862745, 0.0862745, 0.0862745, 0.498039 ) [node name="Menu" type="TextureRect" parent="MenuDeOpcoes"] diff --git a/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd index 98d8880..f1fa76a 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuOpcoes.gd @@ -10,6 +10,7 @@ onready var voltarmenu: TextureButton = $MenuDeOpcoes/Menu/VoltarMenu onready var voltarjogo: TextureButton = $MenuDeOpcoes/Menu/VoltarJogo onready var menu_instrucoes = preload("res://recursos/Menu_principal/TelasExtras/Instrucoes.tscn") onready var audio_stream_sfx = $MenuDeOpcoes/AudioStreamSFX +onready var cena_nodes = get_tree().get_nodes_in_group("Enchente") export var menupath: String = 'res://recursos/Menu_principal/Menu_Principal.tscn' @@ -24,11 +25,11 @@ func _ready(): efeitosWheel.value = SingletonGlobal.volumeSFX porcentagemEfeitosWheel.text = str(efeitosWheel.value) + '%' - #if get_tree().get_current_scene().get_name() != "Enchente": - # voltarmenu.visible = false - # $MenuDeOpcoes/Menu/VoltarJogo/Label.text = "voltar ao menu" - #print(get_tree().get_current_scene().get_name()) - + if cena_nodes: + voltarjogo.visible = true + else: + voltarjogo.visible = false + voltarjogo.connect("button_down", self, "_on_button_down_sound") voltarmenu.connect("button_down", self, "_on_button_down_sound") @@ -48,9 +49,14 @@ func _on_VoltarJogo_button_up(): func _on_VoltarMenu_button_up(): VisualServer.set_shader_time_scale(1) - get_tree().paused = false - TrocadorDeCenas.trocar_cena(menupath) - self.queue_free() + if cena_nodes: + get_tree().paused = false + TrocadorDeCenas.trocar_cena(menupath) + self.queue_free() + else: + VisualServer.set_shader_time_scale(1) + get_tree().paused = false + self.queue_free() func _process(delta): porcentagemMusicaWheel.text = str(musicaWheel.value) + '%' diff --git a/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres index eb4e3f9..e9bc58b 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres +++ b/projeto/recursos/Menu_principal/menu_opcoes/TemaSeletorDeLevel.tres @@ -30,7 +30,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, 117, 0, 42, 123, 6, 8, 1, 3, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 245, 0, 12, 165, 6, 12, 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, 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, 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, 117, 0, 42, 123, 6, 8, 1, 3, 8, 181, 0, 2, 140, 6, 11, 1, 3, 8, 245, 0, 12, 165, 6, 12, 1, -1, 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 = { diff --git a/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd b/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd index d0fafe6..25e850d 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd +++ b/projeto/recursos/Menu_principal/menu_opcoes/botaoMenu.gd @@ -10,14 +10,17 @@ export(Array, StreamTexture) var img_config var menuApertado: bool = false func _ready(): - if get_tree().get_current_scene().get_name() != "Enchente": - $CanvasLayer/Menu.texture_normal = img_config[0] - $CanvasLayer/Menu.texture_pressed = img_config[1] - $CanvasLayer/Menu.texture_hover = img_config[2] - else: + var cena_nodes = get_tree().get_nodes_in_group("Enchente") + if cena_nodes: + print(get_tree().get_nodes_in_group("Enchente")) $CanvasLayer/Menu.texture_normal = img_pause[0] $CanvasLayer/Menu.texture_pressed = img_pause[1] $CanvasLayer/Menu.texture_hover = img_pause[2] + else: + print(get_tree().get_nodes_in_group("Enchente")) + $CanvasLayer/Menu.texture_normal = img_config[0] + $CanvasLayer/Menu.texture_pressed = img_config[1] + $CanvasLayer/Menu.texture_hover = img_config[2] func _on_Menu_button_up(): menuApertado = true diff --git a/projeto/recursos/jogos/enchente/cenas/Enchente.tscn b/projeto/recursos/jogos/enchente/cenas/Enchente.tscn index d20fec5..c51f3ec 100644 --- a/projeto/recursos/jogos/enchente/cenas/Enchente.tscn +++ b/projeto/recursos/jogos/enchente/cenas/Enchente.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=22 format=2] [ext_resource path="res://recursos/jogos/enchente/barra_de_progresso/BarraDeProgresso.tscn" type="PackedScene" id=1] [ext_resource path="res://recursos/jogos/enchente/jogador/playerLane3D.tscn" type="PackedScene" id=2] @@ -18,6 +18,7 @@ [ext_resource path="res://recursos/jogos/enchente/chefao/ChamadaDoBoss.tscn" type="PackedScene" id=16] [ext_resource path="res://recursos/contador/contador.tscn" type="PackedScene" id=17] [ext_resource path="res://recursos/jogos/enchente/cenas/AudioStreamBGM.gd" type="Script" id=18] +[ext_resource path="res://recursos/Menu_principal/menu_opcoes/BotaoMenu.tscn" type="PackedScene" id=19] [sub_resource type="PlaneMesh" id=1] @@ -25,7 +26,7 @@ shader = ExtResource( 3 ) shader_param/Velocidade = 1.0 -[node name="Enchente" type="Spatial"] +[node name="Enchente" type="Spatial" groups=["Enchente"]] script = ExtResource( 14 ) [node name="TempoDeJogo" type="Timer" parent="."] @@ -199,4 +200,6 @@ bus = "SFX Game" [node name="Contador" parent="." instance=ExtResource( 17 )] +[node name="BotaoMenu" parent="." instance=ExtResource( 19 )] + [connection signal="timeout" from="cidadesubindo/TimerDoTempoDeEspera" to="cidadesubindo" method="_mover_cidade"] diff --git a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn index 001a67f..76c1ec4 100644 --- a/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn +++ b/projeto/recursos/jogos/enchente/jogador/playerLane3D.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=92 format=2] +[gd_scene load_steps=91 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/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] @@ -207,8 +206,6 @@ texture = ExtResource( 80 ) [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 From 6335ef9c7541db7b7bbb68da8bcab4470be7fb66 Mon Sep 17 00:00:00 2001 From: ClockWritesDev Date: Sun, 10 Nov 2024 18:17:30 -0300 Subject: [PATCH 2/2] fix do fix --- .../menu_opcoes/MenuDeOpcoes.tscn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn index ac397f2..fccf275 100644 --- a/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn +++ b/projeto/recursos/Menu_principal/menu_opcoes/MenuDeOpcoes.tscn @@ -24,23 +24,23 @@ pause_mode = 2 layer = 7 script = ExtResource( 6 ) +[node name="Transparencia" type="ColorRect" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color( 0.0862745, 0.0862745, 0.0862745, 0.498039 ) + [node name="MenuDeOpcoes" type="Control" parent="."] pause_mode = 2 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -margin_left = -472.0 -margin_top = -806.0 -margin_right = 248.0 -margin_bottom = 474.0 +margin_left = -360.0 +margin_top = -640.0 +margin_right = 189.0 +margin_bottom = 335.0 rect_scale = Vector2( 1.31255, 1.31255 ) -[node name="Transparencia" type="ColorRect" parent="MenuDeOpcoes"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0.0862745, 0.0862745, 0.0862745, 0.498039 ) - [node name="Menu" type="TextureRect" parent="MenuDeOpcoes"] pause_mode = 2 anchor_left = 0.5