zhenyan121/SporeBG-Conid
1
0
Fork 0
mirror of https://github.com/zhenyan121/SporeBG-Conid.git synced 2026-04-10 06:14:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: read network config from JSON

Browse Source
This commit is contained in:
zhenyan121
2025-12-28 16:44:54 +08:00
parent 2d43b73e57
commit 19698996cd
6 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/NetworkManager.cpp
View File

@@ -1,10 +1,11 @@
#include "NetworkManager.h"
#include "utils/ConfigLoader.h"
#include <iostream>
NetworkManager::NetworkManager()
: m_workguard(asio::make_work_guard(m_ioContext))
{
std::cout << "NetworkManager constructor called\n";
m_config = ConfigLoader::load("assets/config.json");
}
NetworkManager::~NetworkManager() {
@@ -63,7 +64,7 @@ void NetworkManager::startServer() {
if (!m_gameServer) {
std::cerr << "gameServer is not esist\n";
}
m_gameServer->startServer(52025);
m_gameServer->startServer(m_config.network.port);
std::cout << "start server success\n";
//m_ioContext.run();
@@ -92,10 +93,10 @@ void NetworkManager::startClient() {
}
);
if (m_netType == NetType::HOST) {
m_client->connect("127.0.0.1", 52025, true);
m_client->connect("127.0.0.1", m_config.network.port, true);
}
if (m_netType == NetType::CLIENT) {
m_client->connect("127.0.0.1", 52025, false);
m_client->connect(m_config.network.serverIP, m_config.network.port, false);
//m_ioContext.run();
}
std::cout << "start client success\n";

4
src/network/NetworkManager.h
View File

@@ -2,7 +2,7 @@
#include "network/client/Client.h"
#include "network/server/GameServer.h"
#include "utils/Config.h"
class NetworkManager {
public:
using ClickEventCallback = std::function<void(int logicalX, int logicalY)>;
@@ -40,7 +40,7 @@ private:
ClickEventCallback m_clickEventCallback;
StartGameCallback m_startGameCallback;
Config m_config;
bool m_isMyTurn = false; // 新增：当前是否是我的回合
void startServer();