From 7db2491c7d16c33b5bc9a35ecc028508fbb446a4 Mon Sep 17 00:00:00 2001 From: oier Date: Sat, 2 Nov 2024 22:58:30 +0100 Subject: [PATCH] hide dialogs --- .../rtmi_dialog_simple.gd | 12 +++++----- .../escoria-ui-return-monkey-island/game.tscn | 22 +++++++++---------- .../menus/pause_menu/pause_menu.gd | 1 + 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd index 32763c05..ec0781aa 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd @@ -108,7 +108,7 @@ func do_say(global_id: String, text: String) -> void: # before we're ready, and only if it's necessary if not _dialog_player.get_children().has(_type_player): _dialog_player.add_child(_type_player) - show_dialog_tip() + add_dialog_tip() _type_player.say(global_id, text) @@ -144,7 +144,7 @@ func _initialize_say_states(global_id: String, text: String, type: String) -> vo func _on_say_finished(): if not _should_preserve_dialog_box and _dialog_player.get_children().has(_type_player): _dialog_player.remove_child(_type_player) - hide_dialop_tip() + remove_dialop_tip() _is_saying = false @@ -211,7 +211,7 @@ func interrupt(): if not _should_preserve_dialog_box and _dialog_player.get_children().has(_type_player): _dialog_player.remove_child(_type_player) - hide_dialop_tip() + remove_dialop_tip() emit_signal("say_finished") @@ -222,9 +222,9 @@ func voice_audio_finished(): _type_player.voice_audio_finished() -func show_dialog_tip(): +func add_dialog_tip(): if not _dialog_player.get_children().has(_dialog_tip): _dialog_player.add_child(_dialog_tip) - -func hide_dialop_tip(): + +func remove_dialop_tip(): _dialog_player.remove_child(_dialog_tip) diff --git a/addons/escoria-ui-return-monkey-island/game.tscn b/addons/escoria-ui-return-monkey-island/game.tscn index 06a09dcc..779c6e9d 100644 --- a/addons/escoria-ui-return-monkey-island/game.tscn +++ b/addons/escoria-ui-return-monkey-island/game.tscn @@ -27,6 +27,17 @@ ui_parent_control_node = NodePath("CanvasLayer/ui") [node name="camera" parent="." instance=ExtResource( 3 )] +[node name="tooltip_layer" type="CanvasLayer" parent="."] +layer = 2 + +[node name="tooltip" parent="tooltip_layer" instance=ExtResource( 4 )] +z_index = 10 +color = Color( 1, 1, 1, 1 ) +offset_from_cursor_action1 = Vector2( 0, 30 ) +offset_from_cursor_action2 = Vector2( 0, -20 ) +offset_from_cursor_action3 = Vector2( 0, 30 ) +offset_from_cursor_action4 = Vector2( 0, -20 ) + [node name="dialog_layer" type="CanvasLayer" parent="."] layer = 3 @@ -107,16 +118,5 @@ visible = false [node name="video_player" parent="CanvasLayer" instance=ExtResource( 12 )] visible = false -[node name="tooltip_layer" type="CanvasLayer" parent="."] -layer = 2 - -[node name="tooltip" parent="tooltip_layer" instance=ExtResource( 4 )] -z_index = 10 -color = Color( 1, 1, 1, 1 ) -offset_from_cursor_action1 = Vector2( 0, 30 ) -offset_from_cursor_action2 = Vector2( 0, -20 ) -offset_from_cursor_action3 = Vector2( 0, 30 ) -offset_from_cursor_action4 = Vector2( 0, -20 ) - [connection signal="pressed" from="CanvasLayer/ui/menu_button/HBoxContainer/MusicButton" to="." method="_on_MusicButton_pressed"] [connection signal="pressed" from="CanvasLayer/ui/menu_button/HBoxContainer/MenuButton" to="." method="_on_MenuButton_pressed"] diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd index 4e474aab..6bf0769a 100644 --- a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.gd @@ -5,6 +5,7 @@ extends Control # Make the pause menu process in pause mode and hide it just to be sure func _ready(): self.pause_mode = Node.PAUSE_MODE_PROCESS + escoria.game_scene.hide_ui() hide()