merge

2026-02-26 21:02:16 +03:00 · 2026-02-26 21:02:16 +03:00 · f8642efa23
commit f8642efa23
parent 74c2f786a1
10 changed files with 20 additions and 20 deletions
--- a/resources/multiplayer_menu/AvailableServers.png
+++ b/resources/multiplayer_menu/AvailableServers.png
--- a/resources/multiplayer_menu/Backbutton.png
+++ b/resources/multiplayer_menu/Backbutton.png
--- a/resources/multiplayer_menu/Button.png
+++ b/resources/multiplayer_menu/Button.png
--- a/resources/multiplayer_menu/Button2.png
+++ b/resources/multiplayer_menu/Button2.png
--- a/resources/multiplayer_menu/Button3.png
+++ b/resources/multiplayer_menu/Button3.png
--- a/resources/multiplayer_menu/Filledbuttons.png
+++ b/resources/multiplayer_menu/Filledbuttons.png
--- a/resources/multiplayer_menu/JoinServer.png
+++ b/resources/multiplayer_menu/JoinServer.png
--- a/resources/multiplayer_menu/ServerName.png
+++ b/resources/multiplayer_menu/ServerName.png
--- a/resources/multiplayer_menu/title.png
+++ b/resources/multiplayer_menu/title.png
--- a/src/network/WebSocketClientEmscripten.cpp
+++ b/src/network/WebSocketClientEmscripten.cpp
@ -7,8 +7,8 @@
 namespace ZL {
    void WebSocketClientEmscripten::Connect(const std::string& host, uint16_t port) {
        // Формируем URL. Обратите внимание, что в Web часто лучше использовать ws://localhost
-        //std::string url = "ws://" + host + ":" + std::to_string(port);
-        std::string url = "wss://api.spacegame.fishrungames.com";
+        std::string url = "ws://" + host + ":" + std::to_string(port);
+        //std::string url = "wss://api.spacegame.fishrungames.com";

        EmscriptenWebSocketCreateAttributes attr = {
            url.c_str(),