From 4760a0e898fb70edc7b4c320ea6dc8da896e0143 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 22 May 2025 14:30:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5.=20=D0=A0=D0=B5=D0=B3=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D1=81=D0=B8=D1=8F.=20=D0=9D=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=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/настройки/настройки.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index cc25d6d..e73dfc4 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -139,7 +139,7 @@ func load_settings(settings_data: Dictionary): file.close() var json_conv = JSON.new() if json_conv.parse(read) == OK: - settings_data = json_conv.get_data() + settings_data.merge(json_conv.get_data()) else: log.warning('Не удалось разобрать \"%s\", будут использованы настройки по умолчанию' % abs_path) else: