From 4ea8a4c254d4b42c1cdc13525d679e4ed26dc797 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 9 Dec 2025 12:16:02 +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=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20"=D0=9F=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/настройки/настройки.gd | 9 +++++++-- scenes/работа/работа.gd | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 8b6d2eb3..c02da6d7 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -244,11 +244,16 @@ func button_settings(): on_debag_control_pressed(debag_control) var color_btn_act = $scroll_set/table.get_node2(1, COLOR_BTN_ACT) color_btn_act.connect('popup_closed', on_color_closed.bind(color_btn_act)) + var json_col = ProjectSettings.get_setting('application/config/%s' % 'Цвет кнопки \"Подавление\"', '[1.0, 1.0, 1.0, 1.0]') + var arr_col = JSON.parse_string(json_col) + color_btn_act.color = Color(arr_col[0], arr_col[1], arr_col[2], arr_col[3]) if arr_col else Color.WHITE + color_btn_act.text = JSON.stringify(arr_col) func on_color_closed(color_btn_act: ColorPickerButton): - var col = [color_btn_act.color.r, color_btn_act.color.g, color_btn_act.color.b, 1.0] - ProjectSettings.set_setting('application/config/%s' % 'Цвет кнопки \"Подавление\"', col) + var col = [color_btn_act.color.r, color_btn_act.color.g, color_btn_act.color.b, color_btn_act.color.a] + color_btn_act.text = JSON.stringify(col) + ProjectSettings.set_setting('application/config/%s' % 'Цвет кнопки \"Подавление\"', color_btn_act.text) func _on_btn_save_settings_pressed(): diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index 4528bfca..ddec9e24 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -150,7 +150,9 @@ func on_settings_changed(): color_closed *= Color(1.0, 1.0, 1.0, 0.0) color_closed_emit *= Color(1.0, 1.0, 1.0, 1.0) - col_btn_act = ProjectSettings.get_setting('application/config/%s' % 'Цвет кнопки \"Подавление\"', Color.WHITE) + var json_col = ProjectSettings.get_setting('application/config/%s' % 'Цвет кнопки \"Подавление\"', '[1.0, 1.0, 1.0, 1.0]') + var arr_col = JSON.parse_string(json_col) + col_btn_act = Color(arr_col[0], arr_col[1], arr_col[2], arr_col[3]) if arr_col else Color.WHITE ## Обработчик сигнала изменения списка целей.