diff --git a/proj-web/space-game001plain.html b/proj-web/space-game001plain.html index aae27f4..8470238 100644 --- a/proj-web/space-game001plain.html +++ b/proj-web/space-game001plain.html @@ -30,13 +30,52 @@ border-radius: 5px; } #status { color: white; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); } + + /* Nick modal */ + #nickOverlay { + position: absolute; + inset: 0; + display: flex; + align-items: center; + justify-content: center; + background: rgba(0,0,0,0.85); + z-index: 9999; + } + #nickBox { + background: #111; + border: 1px solid #444; + padding: 24px; + width: 320px; + box-shadow: 0 8px 24px rgba(0,0,0,0.6); + text-align: center; + } + #nickBox h2 { margin: 0 0 12px 0; font-size: 18px; color: #eee; } + #nickBox input[type="text"] { + width: 100%; + padding: 10px; + font-size: 16px; + box-sizing: border-box; + margin-bottom: 12px; + border: 1px solid #333; + background: #000; + color: #fff; + } + #nickBox button { + padding: 10px 16px; + font-size: 16px; + background: #2a9fd6; + border: none; + color: #fff; + cursor: pointer; + } + #nickSkip { margin-left: 8px; background: #666; }
Downloading...
- + + + + + + \ No newline at end of file diff --git a/src/MenuManager.cpp b/src/MenuManager.cpp index 3f82f1d..d5ffda1 100644 --- a/src/MenuManager.cpp +++ b/src/MenuManager.cpp @@ -1,6 +1,11 @@ #include "MenuManager.h" #include +#ifdef EMSCRIPTEN +#include +#include +#endif + namespace ZL { extern bool inverseVertical; @@ -55,15 +60,39 @@ namespace ZL { state = GameState::ShipSelectionSingle; uiManager.replaceRoot(shipSelectionRoot); - uiManager.setButtonCallback("spaceshipButton", [this](const std::string&) { + std::string initialNick; +#ifdef EMSCRIPTEN + char* savedNickC = emscripten_run_script_string("localStorage.getItem('spacegame_nick') || ''"); + if (savedNickC) { + initialNick = savedNickC; + free(savedNickC); + } +#endif + + auto tf = uiManager.findTextField("nicknameInput"); + if (tf) { + if (!initialNick.empty()) tf->text = initialNick; + +#ifdef EMSCRIPTEN + uiManager.setTextFieldCallback("nicknameInput", [](const std::string&, const std::string& value) { + EM_ASM_({ + try { localStorage.setItem('spacegame_nick', UTF8ToString($0)); } catch(e) {} + }, value.c_str()); + }); +#endif + } + + uiManager.setButtonCallback("spaceshipButton", [this, initialNick](const std::string&) { std::string nick = uiManager.getTextFieldValue("nicknameInput"); + if (nick.empty()) nick = initialNick; if (nick.empty()) nick = "Player"; enterGameplay(); if (onSingleplayerPressed) onSingleplayerPressed(nick, 0); }); - uiManager.setButtonCallback("cargoshipButton", [this](const std::string&) { + uiManager.setButtonCallback("cargoshipButton", [this, initialNick](const std::string&) { std::string nick = uiManager.getTextFieldValue("nicknameInput"); + if (nick.empty()) nick = initialNick; if (nick.empty()) nick = "Player"; enterGameplay(); if (onSingleplayerPressed) onSingleplayerPressed(nick, 1); @@ -81,8 +110,31 @@ namespace ZL { state = GameState::ShipSelectionMulti; uiManager.replaceRoot(shipSelectionRoot); - uiManager.setButtonCallback("spaceshipButton", [this](const std::string&) { + std::string initialNick; +#ifdef EMSCRIPTEN + char* savedNickC = emscripten_run_script_string("localStorage.getItem('spacegame_nick') || ''"); + if (savedNickC) { + initialNick = savedNickC; + free(savedNickC); + } +#endif + + auto tf = uiManager.findTextField("nicknameInput"); + if (tf) { + if (!initialNick.empty()) tf->text = initialNick; + +#ifdef EMSCRIPTEN + uiManager.setTextFieldCallback("nicknameInput", [](const std::string&, const std::string& value) { + EM_ASM_({ + try { localStorage.setItem('spacegame_nick', UTF8ToString($0)); } catch(e) {} + }, value.c_str()); + }); +#endif + } + + uiManager.setButtonCallback("spaceshipButton", [this, initialNick](const std::string&) { std::string nick = uiManager.getTextFieldValue("nicknameInput"); + if (nick.empty()) nick = initialNick; if (nick.empty()) nick = "Player"; pendingMultiNick = nick; pendingMultiShipType = 0; @@ -90,8 +142,9 @@ namespace ZL { if (onMultiplayerPressed) onMultiplayerPressed(nick, 0); }); - uiManager.setButtonCallback("cargoshipButton", [this](const std::string&) { + uiManager.setButtonCallback("cargoshipButton", [this, initialNick](const std::string&) { std::string nick = uiManager.getTextFieldValue("nicknameInput"); + if (nick.empty()) nick = initialNick; if (nick.empty()) nick = "Player"; pendingMultiNick = nick; pendingMultiShipType = 1; diff --git a/src/network/WebSocketClientEmscripten.cpp b/src/network/WebSocketClientEmscripten.cpp index 1cb8e96..083b748 100644 --- a/src/network/WebSocketClientEmscripten.cpp +++ b/src/network/WebSocketClientEmscripten.cpp @@ -9,7 +9,7 @@ namespace ZL { // Формируем 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://localhost:8081"; EmscriptenWebSocketCreateAttributes attr = { url.c_str(), nullptr,