From 1af8d16e6afd56008f858ed13d284b48302a7e2a Mon Sep 17 00:00:00 2001 From: Tomasz Boruc Date: Thu, 30 Oct 2025 22:54:17 +0100 Subject: [PATCH] =?UTF-8?q?Powr=C3=B3t=20do=20menu=20i=20powr=C3=B3t=20do?= =?UTF-8?q?=20gry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/menu.tscn | 2 ++ scripts/galaxy.gd | 19 ++++++++++++++++++- scripts/menu.gd | 19 +++++++++++++------ scripts/settings.gd | 6 +++--- scripts/time_label.gd | 6 +++--- 5 files changed, 39 insertions(+), 13 deletions(-) diff --git a/scenes/menu.tscn b/scenes/menu.tscn index 0441446..92769ea 100644 --- a/scenes/menu.tscn +++ b/scenes/menu.tscn @@ -85,6 +85,8 @@ _data = { } [node name="MainMenu" type="Control"] +process_mode = 3 +top_level = true layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 diff --git a/scripts/galaxy.gd b/scripts/galaxy.gd index 338a273..1f69d20 100644 --- a/scripts/galaxy.gd +++ b/scripts/galaxy.gd @@ -2,10 +2,12 @@ extends Node2D @onready var StarScene = preload("res://scenes/Star.tscn") @onready var PlanetScene = preload("res://scenes/Planet.tscn") +@onready var MenuScene = preload("res://scenes/Menu.tscn") + func _ready(): if GameData.game_lunched == false: - _generate_galaxy(Settings.NUMBER_OF_SYSTEMS) # 5 gwiazd testowo + _generate_galaxy(Settings.NUMBER_OF_SYSTEMS) GameData.game_lunched = true @@ -52,3 +54,18 @@ func generate_planet_resources(planet): var exists = randi() % 100 < 50 # 50% szans na wystąpienie var amount = 0 planet.resources[res_name] = {"exist": exists, "amount": amount} + + +func _input(event): + if event.is_action_pressed("ui_cancel"): # np. klawisz ESC + show_menu() + +func show_menu(): + + var cam = $Camera2D + if cam: + cam.enabled = false + var menu_instance = MenuScene.instantiate() + add_child(menu_instance) + menu_instance.z_index = 100 # na wierzchu wszystkiego + get_tree().paused = true # pauzuje grę, jeśli chcesz diff --git a/scripts/menu.gd b/scripts/menu.gd index f8d3fa7..57a9be1 100644 --- a/scripts/menu.gd +++ b/scripts/menu.gd @@ -9,11 +9,11 @@ func _ready(): - #if Manager.game_lunched == true: - #back_button.visible = true - #else : - #MusicManager.play_music() - #back_button.visible = false + if GameData.game_lunched == true: + back_button.visible = true + else : + MusicManager.play_music() + back_button.visible = false @@ -31,5 +31,12 @@ func _on_exit_pressed(): get_tree().quit() func _on_back_pressed(): - get_tree().change_scene_to_file("res://scenes/galaxy.tscn") + var cam = get_parent().get_node_or_null("Camera2D") + if cam: + cam.enabled = true + cam.make_current() # ustawia kamerę jako aktywną + + get_tree().paused = false + queue_free() # usuwa menu z ekranu + diff --git a/scripts/settings.gd b/scripts/settings.gd index e75a4b0..19c4adf 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -3,13 +3,13 @@ const LANGUAGE = 'pl' var number_of_players = 1 # Liczba sektorów w galaktyce -var NUMBER_OF_SYSTEMS: int = 44 +var NUMBER_OF_SYSTEMS: int = 144 const RESOURCE_TYPES = ["Iron", "Uran", "Titan", "Water"] #pozycja systemów -var x = 4000 -var y = 4000 +var x = 8000 +var y = 8000 #Ilosc systemów var min_planet = 1 diff --git a/scripts/time_label.gd b/scripts/time_label.gd index 9462032..cb7e8cd 100644 --- a/scripts/time_label.gd +++ b/scripts/time_label.gd @@ -9,7 +9,7 @@ func _ready(): faster.pressed.connect(_on_faster_pressed) slower.pressed.connect(_on_slower_pressed) pause.pressed.connect(_on_pause_pressed) - $MenuButton.pressed.connect(_on_menu_button_pressed) + #$MenuButton.pressed.connect(_on_menu_button_pressed) func _process(delta): var total_days = int(GameData.game_time) @@ -35,5 +35,5 @@ func _on_slower_pressed(): func _on_pause_pressed(): Settings.TIME_SCALE = 0 -func _on_menu_button_pressed(): - get_tree().change_scene_to_file("res://scenes/menu.tscn") +#func _on_menu_button_pressed(): + #get_tree().change_scene_to_file("res://scenes/menu.tscn")