From 4315f68fcaa4d45c524842a8aca81d09b2693ace Mon Sep 17 00:00:00 2001 From: Maxim Name Date: Tue, 15 Jul 2025 04:54:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=BE=D1=89=D0=BD=D0=BE=D1=81=D1=82=D1=8C=D1=8E=20=D1=84?= =?UTF-8?q?=D1=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-prd-k/pribor_prd_k.gd | 2 +- scenes/pribor-prd-v/pribor_prd_v.gd | 4 +++- scripts/interfer.gd | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/scenes/pribor-prd-k/pribor_prd_k.gd b/scenes/pribor-prd-k/pribor_prd_k.gd index 67e711b9..f67bde34 100644 --- a/scenes/pribor-prd-k/pribor_prd_k.gd +++ b/scenes/pribor-prd-k/pribor_prd_k.gd @@ -296,7 +296,7 @@ func _on_control_fs(mode: bool) -> void: else: interfer_name = 'off' fs_arr = [[90.0, 2450.0, 1500.0, 23]] - signaller.emit_signal('interfer_init', interfer_name, fs_arr, 100.0) + signaller.emit_signal('interfer_init', interfer_name, fs_arr, 50.0) func on_stop_control() -> void: diff --git a/scenes/pribor-prd-v/pribor_prd_v.gd b/scenes/pribor-prd-v/pribor_prd_v.gd index ecdbcd44..d6caf86e 100644 --- a/scenes/pribor-prd-v/pribor_prd_v.gd +++ b/scenes/pribor-prd-v/pribor_prd_v.gd @@ -68,6 +68,8 @@ func setup_timer() -> void: func _enter_tree() -> void: $control_result.text = '' signaller.connect('режим_работа', Callable(self, 'on_mode_changed').bind(false)) + signaller.emit_signal('interfer_off_all') + await get_tree().create_timer(2.0).timeout _on_control_fs(true) @@ -269,7 +271,7 @@ func _on_control_fs(mode: bool) -> void: else: interfer_name = 'off' fs_arr = [[90.0, 2450.0, 1500.0, 23]] - signaller.emit_signal('interfer_init', interfer_name, fs_arr, 100.0) + signaller.emit_signal('interfer_init', interfer_name, fs_arr, 10.0) func on_stop_control() -> void: diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 878472c6..7140f78f 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -63,7 +63,6 @@ class Interfer: data_to_json['params'] = params data_to_json['get'] = get_params var pac = JSON.stringify(data_to_json).to_utf8_buffer() - print_debug(powp) return pac func set_from_dic(dic: Dictionary): @@ -199,7 +198,7 @@ func on_interfer_create(interfer_name, sel_threats, fs_arr, power, u, ecms) -> v param['width'] = settings.WIDTH_MIN elif (param['width'] > settings.WIDTH_MAX): param['width'] = settings.WIDTH_MAX - interfer_create(u, interfer_name, ecms, param, kni, id, thrs, SOURCE_INTERFER[0], POW_DEFAULT) + interfer_create(u, interfer_name, ecms, param, kni, id, thrs, SOURCE_INTERFER[0], power) for item in fs_arr: var param: Dictionary = {} @@ -211,7 +210,7 @@ func on_interfer_create(interfer_name, sel_threats, fs_arr, power, u, ecms) -> v param['width'] = settings.WIDTH_MIN elif (param['width'] > settings.WIDTH_MAX): param['width'] = settings.WIDTH_MAX - interfer_create(u, interfer_name, ecms, param, kni, id, fs, SOURCE_INTERFER[1], POW_DEFAULT) + interfer_create(u, interfer_name, ecms, param, kni, id, fs, SOURCE_INTERFER[1], power) func on_interfer_rcv(interfer_params: Array, unit0, ecms) -> void: