From 54441558e931cb91ba1cd176c4237149fdea9e50 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Tue, 3 Jun 2025 15:31:47 +0300 Subject: [PATCH 1/3] Godot4.4 --- scenes/tilemap/mark.tscn | 1 - 1 file changed, 1 deletion(-) diff --git a/scenes/tilemap/mark.tscn b/scenes/tilemap/mark.tscn index 3eb0386..8fc00fe 100644 --- a/scenes/tilemap/mark.tscn +++ b/scenes/tilemap/mark.tscn @@ -3,7 +3,6 @@ [ext_resource type="Texture2D" uid="uid://cgqo5gucd2be0" path="res://scenes/tilemap/dot.png" id="2_rq0y0"] [node name="rect" type="TextureRect"] -anchors_preset = -1 offset_left = -16.0 offset_top = -16.0 offset_right = 16.0 From 03a91989db15be949d2da2fbe41d3df8afe23131 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Fri, 6 Jun 2025 16:24:50 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/работа/работа.gd | 23 ++++------------------- scripts/network.gd | 6 +++--- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/scenes/работа/работа.gd b/scenes/работа/работа.gd index ea8f936..b772432 100644 --- a/scenes/работа/работа.gd +++ b/scenes/работа/работа.gd @@ -51,11 +51,11 @@ enum DragFSM { OFF ## Выключено. } -## Состояние перетаскивания. +## Режим выбора enum BtnSel { - SECTOR, ## В процессе. - THREAT, ## Не активно, ожидание. - FS ## Выключено. + SECTOR, ## Выбор сектора. + THREAT, ## Выбор цели. + FS ## Выбор стробом. } @@ -286,21 +286,6 @@ func on_button_strobe_pressed() -> void: $canvas.set_strob_visible(drag_fsm == DragFSM.IDLE) -func _on_sld_selmode_value_changed(val: float) -> void: - var ival: = int(val) - if ival == 2: - drag_fsm = DragFSM.IDLE - $canvas.set_strob_visible(true) - else: - drag_fsm = DragFSM.OFF - $canvas.set_strob_visible(false) - btn_select = 2 - ival - on_button_strobe_pressed() - signaller.emit_signal('rto_threat_unsel_all') - unsel_fs_all(true) - set_ecm_btns_state(true) - - ## Поведение радиокнопок в группе. Управляет состоянием кнопок выбора целей. func on_button_select(btn_this, btn_others) -> void: for btn_other in btn_others: btn_other.set_pressed(btn_this == btn_other) diff --git a/scripts/network.gd b/scripts/network.gd index a69b6f7..c349ac9 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -233,9 +233,9 @@ func poll_receive_udp(sock: Socket) -> bool: units[addr_port].parse(data, tick) continue if unit_keys.has(port): - var key = unit_keys[port] - if units.has(key): - units[key].parse(data, tick) + var key1 = unit_keys[port] + if units.has(key1): + units[key1].parse(data, tick) continue port = sock.get_local_port() var key = ['*', port] From 7b8e2a01c801af540ae9de72ccef6dc414facc39 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Mon, 30 Jun 2025 09:07:44 +0300 Subject: [PATCH 3/3] =?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`https`=20=D0=B1=D0=B5=D0=B7=20=D0=98=D0=BD?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=BD=D0=B5=D1=82=D0=B0=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6562d51..f73f4dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ссылки на составные части -- [Исполняемые файлы для шаблонов экспорта и редактора](https://gitea.srez.local:3000/sasha80/godot-bin) +- [Исполняемые файлы для шаблонов экспорта и редактора](http://gitea.srez.local:3000/sasha80/godot-bin) - [Проброс последовательных портов через Ethernet](http://gitea.srez.local:3000/sasha80/uart-forwarder) - [Сборка Godot из исходников](http://gitea.srez.local:3000/sasha80/godot-build) - [Сервер карт](http://gitea.srez.local:3000/sasha80/map-tiles)