diff --git a/scenes/galaxy.tscn b/scenes/galaxy.tscn index 97026c1..4f79db5 100644 --- a/scenes/galaxy.tscn +++ b/scenes/galaxy.tscn @@ -18,12 +18,7 @@ position = Vector2(580.00006, 340.00003) scale = Vector2(0.30208334, 0.3148148) texture = ExtResource("1_n7ltq") -[node name="TimeDisplay" parent="CanvasLayer" instance=ExtResource("3_fmtwf")] -offset_left = 896.0 -offset_top = 8.0 -offset_bottom = -616.0 - -[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] +[node name="AudioStreamPlayer2D" type="AudioStreamPlayer" parent="."] stream = ExtResource("3_mlxib") autoplay = true @@ -31,3 +26,14 @@ autoplay = true position = Vector2(904, 512) zoom = Vector2(0.64, 0.64) script = ExtResource("4_5xxpo") + +[node name="CanvasLayer2" type="CanvasLayer" parent="."] +layer = 10 + +[node name="TimeDisplay" parent="CanvasLayer2" instance=ExtResource("3_fmtwf")] +top_level = true +z_index = 10 +z_as_relative = false +offset_left = 896.0 +offset_top = 8.0 +offset_bottom = -616.0 diff --git a/scripts/GameData.gd b/scripts/GameData.gd index 615bbfb..f6baf07 100644 --- a/scripts/GameData.gd +++ b/scripts/GameData.gd @@ -8,8 +8,8 @@ func _ready(): func _process(delta): - game_time += delta * Settings.TIME_SCALE + game_time += delta #* Settings.TIME_SCALE #print(game_time) - update_timer += delta * Settings.TIME_SCALE + update_timer += delta #* Settings.TIME_SCALE if update_timer >= Settings.UPDATE_INTERVAL: update_timer = 0.0 diff --git a/scripts/menu.gd b/scripts/menu.gd index 57a9be1..52f4ff0 100644 --- a/scripts/menu.gd +++ b/scripts/menu.gd @@ -12,7 +12,6 @@ func _ready(): if GameData.game_lunched == true: back_button.visible = true else : - MusicManager.play_music() back_button.visible = false diff --git a/scripts/planet.gd b/scripts/planet.gd index 7705b6d..854dae7 100644 --- a/scripts/planet.gd +++ b/scripts/planet.gd @@ -16,7 +16,7 @@ func _ready(): func _process(delta): - angle += orbit_speed * delta * Settings.TIME_SCALE # obrót w czasie + angle += orbit_speed * delta # obrót w czasie angle = fmod(angle, TAU) # utrzymanie kąta w 0..2π _update_position() diff --git a/scripts/time_label.gd b/scripts/time_label.gd index cb7e8cd..7d8ee04 100644 --- a/scripts/time_label.gd +++ b/scripts/time_label.gd @@ -27,13 +27,13 @@ func _process(delta): time_label.text = full_date func _on_faster_pressed(): - if Settings.TIME_SCALE < 10: - Settings.TIME_SCALE +=1 + if Engine.time_scale < 20: + Engine.time_scale +=2 func _on_slower_pressed(): - if Settings.TIME_SCALE > 0: - Settings.TIME_SCALE -=1 + if Engine.time_scale > 0: + Engine.time_scale -=2 func _on_pause_pressed(): - Settings.TIME_SCALE = 0 + Engine.time_scale = 0 #func _on_menu_button_pressed(): #get_tree().change_scene_to_file("res://scenes/menu.tscn")