From 9401656a3bb5f66153a7b7cd6e203d8ba7f7aad2 Mon Sep 17 00:00:00 2001 From: MaD_CaT Date: Thu, 27 Mar 2025 14:47:05 +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=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=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B5=D0=B5=20=D1=86=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D1=83=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=D0=B8=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/save1.png.import | 6 +++--- scenes/настройки/настройки.gd | 4 +++- scenes/настройки/настройки.tscn | 2 +- scenes/эмс/эмс.tscn | 2 +- scripts/tcp5p28.gd | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/save1.png.import b/data/save1.png.import index 32b523c7..7e445061 100644 --- a/data/save1.png.import +++ b/data/save1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://csnts8f155sf7" -path="res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex" +path="res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://scenes/настройки/save1.png" -dest_files=["res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex"] +source_file="res://data/save1.png" +dest_files=["res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex"] [params] diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index 82bf49a0..dc1c2102 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -52,6 +52,8 @@ const SETTING_TABLE = [ ['уарэп-спт25-1', TableEdit, TableEdit ], ['уарэп-спт25-2', TableEdit, TableEdit ] ] + +const EXTERNAL_CU = 17 # Внешнее целееуказание const SUPPRESS = 18 # Строка - Подавление const KEYBORD = 19 # Строка - Виртуальная клавиатура const HIDE_EMS2 = 20 # Строка - Скрыть вкладку ЭМС 2 @@ -142,7 +144,7 @@ func setting_tab(): func button_settings(): - var extern_cu_node = $scroll_set/table.get_node2(1, SUPPRESS).get_children()[1] + var extern_cu_node = $scroll_set/table.get_node2(1, EXTERNAL_CU).get_children()[1] extern_cu_node.connect('pressed', on_external_cu_btn_pressed.bind(extern_cu_node)) $scroll_set/table.set_row_text(SUPPRESS,(['Кнопка «Подавление»'])) $scroll_set/table.set_row_text(KEYBORD,(['Виртуальная клавиатура'])) diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index 6fa43a2c..1d8ad663 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://scenes/настройки/настройки.gd" id="1_2l3rd"] [ext_resource type="Script" path="res://table/table.gd" id="2_6sx73"] -[ext_resource type="Texture2D" uid="uid://lkw8k7ouj42i" path="res://data/save1.png" id="3_dbpks"] +[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://data/save1.png" id="3_dbpks"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_pyq6h"] texture = ExtResource("3_dbpks") diff --git a/scenes/эмс/эмс.tscn b/scenes/эмс/эмс.tscn index ba2fb51f..0613f1a4 100644 --- a/scenes/эмс/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://scenes/эмс/эмс.gd" id="1_mk57x"] [ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="2_eju8r"] -[ext_resource type="Texture2D" uid="uid://lkw8k7ouj42i" path="res://data/save1.png" id="3_onafb"] +[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://data/save1.png" id="3_onafb"] [ext_resource type="Texture2D" uid="uid://o8mam0a060d8" path="res://data/load1.png" id="4_afjfs"] [ext_resource type="Texture2D" uid="uid://bdlbqs88bki8x" path="res://data/connect-a.png" id="5_2nrut"] [ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect-a.png" id="6_g3q7m"] diff --git a/scripts/tcp5p28.gd b/scripts/tcp5p28.gd index 339cd710..865ecb31 100644 --- a/scripts/tcp5p28.gd +++ b/scripts/tcp5p28.gd @@ -46,7 +46,7 @@ class TCP5P28 extends unit.Unit: var tx_stack: Array ## Массив пакетов для отправки. - func _to_string() -> String: return String('капсрпб: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]]) + func _to_string() -> String: return String('5П-28: "%s" %s ' % [self.name, ['отключен', 'на связи'][int(online)]]) func parse(data: PackedByteArray, tick: int): rx_tick = tick @@ -80,7 +80,7 @@ class TCP5P28 extends unit.Unit: var data_len = 4 + len(ths) * 80 # длинна блока данных в байтах var tick0 = Time.get_ticks_msec() data.resize(4) - data.encode_u16(0, 0) # Код ошибки + data.encode_u16(0, 0) # Код ошибки data.encode_u16(2, len(ths)) # Количество целей for th in ths.values(): data.append_array(get_threats_data(th, int(tick0)))