From e7d6056799cffe937add3fa36ce7e2ddb1f0d7ab Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Fri, 10 Jan 2025 14:17:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=BD=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D0=B8=D0=B7=20json.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/settings.gd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/settings.gd b/scripts/settings.gd index 8932b3d..35940e3 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -5,6 +5,8 @@ class_name rep_settings extends Node var settings_file = ProjectSettings.get_setting('application/config/settings_path', 'user://settings.json') # Путь к файлу с настройками +var settings_program: Dictionary + @export var UnitProfiles: = { \ # Название | Протокол | Адрес | Порт | Широковещательное | Привязывать к адресу | Комментарий 'уарэп-яу07-частный': ['yau07rx', '10.1.1.14', [50014], false, true, 'IP-адрес на котором принимают частные сообщения от ЯУ-07'], @@ -49,6 +51,7 @@ func _ready() -> void: var json_conv: = JSON.new() if Error.OK == json_conv.parse(read): var json_data = json_conv.get_data() + settings_program.merge(json_data) for key in UnitProfiles.keys(): if json_data.has(key): UnitProfiles[key][1] = json_data[key][0]