From c2cc967dbb4413dbad2f73b8b206e6c0d1791216 Mon Sep 17 00:00:00 2001 From: sasha80 Date: Wed, 12 Feb 2025 13:09:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A7=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/network.gd | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/scripts/network.gd b/scripts/network.gd index 0b3e022a..04d027ae 100644 --- a/scripts/network.gd +++ b/scripts/network.gd @@ -30,7 +30,6 @@ class Socket extends PacketPeerUDP: put_packet(data) - class SocketTCP extends TCPServer: const RX_TIMEOUT: int = 1000 ## Время сброса счётчика принятия части пакета. var peerstream: = PacketPeerStream.new() @@ -83,6 +82,7 @@ var unit_keys: Dictionary var sock_unicast: Socket var sock_capsrpb: Socket var logger_page: Node +var send_sockets: Dictionary # Таблица <имяустройста>: <сокет> для отправки сообщений func on_serial_data(data, unit): unit.parse(data, tick) @@ -141,6 +141,23 @@ func _ready() -> void: sock_unicast = poll_sockets[0] sock_capsrpb = poll_sockets[2] + send_sockets['уарэп-яу07-частный'] = sock_unicast + send_sockets['уарэп-яу07-общий'] = poll_sockets[1] + send_sockets['уарэп-капсрпб'] = sock_capsrpb + send_sockets['уарэп-эмс'] = sock_unicast + send_sockets['уарэп-яу07-2в'] = sock_unicast + send_sockets['уарэп-яу07-2н'] = sock_unicast + send_sockets['уарэп-яу07-2к'] = sock_unicast + send_sockets['уарэп-яу07-4в'] = sock_unicast + send_sockets['уарэп-яу07-4н'] = sock_unicast + send_sockets['уарэп-яу07-4к'] = sock_unicast + send_sockets['уарэп-яу07-1в'] = sock_unicast + send_sockets['уарэп-яу07-1н'] = sock_unicast + send_sockets['уарэп-яу07-1к'] = sock_unicast + send_sockets['уарэп-яу07-3в'] = sock_unicast + send_sockets['уарэп-яу07-3н'] = sock_unicast + send_sockets['уарэп-яу07-3к'] = sock_unicast + for unit_name in settings.UnitProfiles: var st = settings.UnitProfiles[unit_name] var proto = st[0] @@ -267,8 +284,11 @@ func _process(_delta: float) -> void: for addr in units_udp: var unit = units[addr] match unit.process(tick): - Error.OK: sock_unicast.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len)) - Error.FAILED: emit_signal('socket_error', [unit, sock_unicast]) + Error.OK: + var sock = send_sockets[unit.name] + sock.send_to([addr[0], dst_ports[addr]], unit.tx_data.slice(0, unit.tx_len)) + Error.FAILED: + emit_signal('socket_error', [unit, sock_unicast]) for key in units_serial: var unit_serial = units_serial[key] var serial = serials[key]