From 8d3d2958ccc826abbcb324fc8bb19e0b1648cd83 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 14 Oct 2025 23:16:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B3=D1=80=D0=B5=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D1=8F.=20=D0=9D=D0=B5=20=D0=B2=D1=81=D0=B5=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D1=8E=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/настройки/настройки.tscn | 3 +-- scripts/settings.gd | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index 7384e82..e757390 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -175,7 +175,7 @@ func setting_tab(): var child = node_values[0] if child is CheckButton: child.connect('pressed', Callable(self, 'on_checkbutton_pressed').bind(i)) - var val = settings_data[param_name] if settings_data.has(param_name) else false + var val = ProjectSettings.get_setting('application/config/%s' % param_name) child.set_pressed(val) else: if settings_data.has(param_name): @@ -216,7 +216,6 @@ func button_settings(): var trassa_node = $scroll_set/table.get_node2(1, TRASSA).get_children() trassa_node = trassa_node[0] trassa_node.connect('pressed', on_trassa_btn_pressed.bind(trassa_node)) - on_trassa_btn_pressed(trassa_node) var vk_node = $scroll_set/table.get_node2(1, KEYBOARD).get_children()[0] vk_node.connect('pressed', on_vk_pressed.bind(vk_node)) var ems2_hide_node = $scroll_set/table.get_node2(1, HIDE_EMS2).get_children()[0] diff --git a/scripts/settings.gd b/scripts/settings.gd index 0628fcd..fe308b9 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -79,7 +79,7 @@ func _ready() -> void: log.warning('Будут использованы настройики по умолчанию.') return var json_data = json_conv.get_data() - settings_program.merge(json_data) + settings_program.merge(json_data, true) for key in settings_program: ProjectSettings.set_setting('application/config/%s' % key, settings_program[key]) for key: StringName in UnitProfiles.keys():