From d4df06fc4006b658393aadd00342998aa40f65c2 Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Thu, 27 Mar 2025 20:52:26 -0400 Subject: [PATCH] Moving ui_node out of SaveLevelDataComponent into SaveLoadUI --- .../components/save_level_data_component.gd | 1 - scenes/ui/menus/saves_manager/save_load_ui.gd | 11 ++++++----- scenes/ui/ui.tscn | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/addons/save_load_system/components/save_level_data_component.gd b/addons/save_load_system/components/save_level_data_component.gd index f4f8e78..77bf043 100644 --- a/addons/save_load_system/components/save_level_data_component.gd +++ b/addons/save_load_system/components/save_level_data_component.gd @@ -5,7 +5,6 @@ extends Node @export var settings: SaveGameSettings ## The SaveGameSettings resource -@export var ui_node: CanvasLayer ## The UI to Show/Hide when taking screenshot (e.g. save icon generation) func _ready() -> void: diff --git a/scenes/ui/menus/saves_manager/save_load_ui.gd b/scenes/ui/menus/saves_manager/save_load_ui.gd index 6f92972..fff905d 100644 --- a/scenes/ui/menus/saves_manager/save_load_ui.gd +++ b/scenes/ui/menus/saves_manager/save_load_ui.gd @@ -12,6 +12,8 @@ signal open_save_list @export var create_save_button: BaseButton @export var create_save_cancel_button: BaseButton +@export var ui_node: CanvasLayer ## The UI to Show/Hide when taking screenshot (e.g. save icon generation) + func _ready() -> void: show_save_ui_button.pressed.connect(_on_show_save_ui_button_pressed) @@ -26,13 +28,12 @@ func _on_create_save_button_pressed() -> void: if save_name.strip_edges() == "": save_name = Time.get_datetime_string_from_system().replace(":", "") - var _save_level_data_component: SaveLevelDataComponent = get_tree().get_first_node_in_group("save_level_data_component") - if _save_level_data_component.ui_node != null: - _save_level_data_component.ui_node.visible = false + if ui_node != null: + ui_node.visible = false await get_tree().create_timer(.150).timeout # A hack to allow time for UI to hide before taking screenshot SaveGameManager.create_save.emit(save_name) - if _save_level_data_component.ui_node != null: - _save_level_data_component.ui_node.visible = true + if ui_node != null: + ui_node.visible = true new_save_ui.hide() SignalManager.resume_game.emit() diff --git a/scenes/ui/ui.tscn b/scenes/ui/ui.tscn index d0c4768..2b77c1f 100644 --- a/scenes/ui/ui.tscn +++ b/scenes/ui/ui.tscn @@ -38,5 +38,6 @@ save_load_ui = NodePath("../SaveLoadUI") [node name="SettingsMenu" parent="." instance=ExtResource("7_7vp6q")] visible = false -[node name="SaveLoadUI" parent="." instance=ExtResource("8_jcn1r")] +[node name="SaveLoadUI" parent="." node_paths=PackedStringArray("ui_node") instance=ExtResource("8_jcn1r")] visible = false +ui_node = NodePath("..")