From 37ca1aced6fe99c5fc8d4a8ae5cdd1eb7d1723b6 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Mon, 29 Sep 2025 13:22:41 +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=D1=8F.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D1=83?= =?UTF-8?q?=D0=B3=D0=BB=D0=B0=20=D0=BC=D0=B5=D1=81=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/button-flat/button-flat.tscn | 1 - scenes/frame-ecm-list/frm-ecm-list.tscn | 10 +++++----- scenes/работа/работа.tscn | 8 ++++---- scenes/эмс/эмс.tscn | 4 ++-- scripts/interfer.gd | 2 ++ scripts/prd.gd | 9 +++++---- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/scenes/button-flat/button-flat.tscn b/scenes/button-flat/button-flat.tscn index b5e777f7..a35c4c31 100644 --- a/scenes/button-flat/button-flat.tscn +++ b/scenes/button-flat/button-flat.tscn @@ -56,7 +56,6 @@ offset_right = 20.0 offset_bottom = 20.0 theme_override_styles/panel = SubResource("1") script = ExtResource("1_ui6sg") -font_size = null [node name="back" type="Sprite2D" parent="."] material = SubResource("ShaderMaterial_hhdyc") diff --git a/scenes/frame-ecm-list/frm-ecm-list.tscn b/scenes/frame-ecm-list/frm-ecm-list.tscn index b1c524e6..6508d419 100644 --- a/scenes/frame-ecm-list/frm-ecm-list.tscn +++ b/scenes/frame-ecm-list/frm-ecm-list.tscn @@ -57,7 +57,7 @@ size_flags_vertical = 3 tooltip_text = "Включает принудительную помеху" strips_rotation = 15.0 text = "СРН" -font_size = null +font_size = 1 metadata/rfi_name = "srn" [node name="btn_jtids" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] @@ -67,7 +67,7 @@ size_flags_horizontal = 3 size_flags_vertical = 3 strips_rotation = 15.0 text = "СПРС" -font_size = null +font_size = 1 metadata/rfi_name = "sprs" [node name="btn_kupd" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] @@ -77,7 +77,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД" strips_rotation = 15.0 text = "КУПД" -font_size = null +font_size = 1 metadata/rfi_name = "kupd" [node name="btn_panika" parent="grd_forced" groups=["группа-принудительно"] instance=ExtResource("4_7ys3c")] @@ -87,7 +87,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для принудительного включения группы секторов в режим КУПД" strips_rotation = 15.0 text = "Паника" -font_size = null +font_size = 1 metadata/rfi_name = "" [node name="btn_cancel" parent="grd_forced" groups=["прин-секторы-срн"] instance=ExtResource("4_7ys3c")] @@ -96,5 +96,5 @@ size_flags_horizontal = 3 size_flags_vertical = 3 strips_rotation = 15.0 text = "Очистить" -font_size = null +font_size = 1 metadata/rfi_name = "" diff --git a/scenes/работа/работа.tscn b/scenes/работа/работа.tscn index 9e1abc88..692683ec 100644 --- a/scenes/работа/работа.tscn +++ b/scenes/работа/работа.tscn @@ -174,7 +174,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" strips_rotation = 25.0 text = "Строб" -font_size = null +font_size = 1 metadata/state = 0 [node name="btn_threats" parent="btns_select" groups=["группа-режим-выбора"] instance=ExtResource("8_k0iv2")] @@ -184,7 +184,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" strips_rotation = 25.0 text = "Цель" -font_size = null +font_size = 1 metadata/state = 1 [node name="btn_fs_sector" parent="btns_select" groups=["группа-режим-выбора"] instance=ExtResource("8_k0iv2")] @@ -194,7 +194,7 @@ size_flags_vertical = 3 tooltip_text = "Кнопка для выбора сектора при помощи клика мышкой" strips_rotation = 25.0 text = "Сектор" -font_size = null +font_size = 1 metadata/state = 2 [node name="chk_auto" type="CheckBox" parent="."] @@ -308,6 +308,6 @@ text = "Масштаб:" [connection signal="drag_continue" from="." to="." method="_on_drag_continue"] [connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"] [connection signal="toggled" from="chk_auto" to="." method="on_value_changed"] -[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"] +[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"] [connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"] diff --git a/scenes/эмс/эмс.tscn b/scenes/эмс/эмс.tscn index 9198fcfc..18894bd8 100644 --- a/scenes/эмс/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -81,7 +81,7 @@ offset_right = 1583.0 offset_bottom = 85.0 strips_rotation = 10.0 text = "Прочитать" -font_size = null +font_size = 1 [node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")] layout_mode = 0 @@ -91,7 +91,7 @@ offset_right = 1583.0 offset_bottom = 129.0 strips_rotation = 10.0 text = "Записать" -font_size = null +font_size = 1 [node name="btn_save" type="Button" parent="."] layout_mode = 0 diff --git a/scripts/interfer.gd b/scripts/interfer.gd index 42b02b45..3221cf9c 100644 --- a/scripts/interfer.gd +++ b/scripts/interfer.gd @@ -402,6 +402,8 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf func send_ecm(ecm, unit0) -> void: if ecm.krp != INTERFER_OFF: if not emit_enable: + ecm.svk = 0 + call_deferred('emit_signal', 'interfer_update', ecm) return msg6_num += 1 var json_data = ecm.get_msg6_data(msg6_num) diff --git a/scripts/prd.gd b/scripts/prd.gd index 30cfe54f..43086525 100644 --- a/scripts/prd.gd +++ b/scripts/prd.gd @@ -93,11 +93,11 @@ var fs_caps_id: Dictionary ## Словарь соответствия номе class Fs: const UM_PORTS: Dictionary = { 1 : 0x106, - 2 : 0x10A, + 2 : 0x108, 3 : 0x106, - 4 : 0x10A, + 4 : 0x108, 5 : 0x106, - 6 : 0x10A } + 6 : 0x108 } const CODE_UM: Array = [ [-5, 0], @@ -145,7 +145,7 @@ class Fs: if UM_PORTS.has(index/4): var val = um_code_tx if u.isa_ports.has(um_port): - val = tools.set_bits(u.isa_ports[um_port], um_code_tx, 0x0003) + val = tools.set_bits(u.isa_ports[um_port], um_code_tx, 0x0007) data_arr.append(um_port) data_arr.append(val) @@ -225,6 +225,7 @@ class PRD: func execute_cmd(): if not len(cmd_array): return + if unit_yau07.cmd_state != unit_yau07.CmdState.DONE: return var cmd: Array = cmd_array.pop_front() unit_yau07.send_isa(cmd[0], cmd[1])