From e23fe79136a0ab8d939d8aba5e437a926c0403b4 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 Nov 2023 21:57:36 +0800 Subject: [PATCH] 1 --- server/robotserver/CMakeLists.txt | 4 +--- server/robotserver/playermgr.cc | 2 ++ server/robotserver/playermgr.h | 7 ------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/server/robotserver/CMakeLists.txt b/server/robotserver/CMakeLists.txt index b5a7e392..98f92a4b 100644 --- a/server/robotserver/CMakeLists.txt +++ b/server/robotserver/CMakeLists.txt @@ -90,8 +90,6 @@ execute_process( COMMAND touch -a ss_proto.pb.cc COMMAND touch -a ss_msgid.pb.h COMMAND touch -a ss_msgid.pb.cc - COMMAND touch -a navmesh.pb.h - COMMAND touch -a navmesh.pb.cc ) aux_source_directory(. SRC_LIST @@ -108,7 +106,7 @@ add_executable( add_custom_target(script_pb_protocol ALL) add_custom_command(TARGET script_pb_protocol PRE_BUILD - COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=cs_proto,cs_msgid,ss_proto,ss_msgid,navmesh --python_out=../tools/robot/virtualclient + COMMAND python ../../third_party/tools/scripts/construct/build_pb.py --cpp_out=. --pb_files=cs_proto,cs_msgid,ss_proto,ss_msgid --python_out=../tools/robot/virtualclient ) add_dependencies(robot${GAME_ID} script_pb_protocol) diff --git a/server/robotserver/playermgr.cc b/server/robotserver/playermgr.cc index 12d71464..24cbc999 100644 --- a/server/robotserver/playermgr.cc +++ b/server/robotserver/playermgr.cc @@ -40,6 +40,7 @@ void PlayerMgr::Update() } } +#if 0 void PlayerMgr::CoWebLogin(int idx, f8::Coroutine* co) { std::string account_id; @@ -116,6 +117,7 @@ void PlayerMgr::CoCreatePlayer(f8::Coroutine* co, account_id_hash_[hum->GetAccountId()] = hum; socket_id_hash_[hum->GetSocketId()] = hum; } +#endif std::shared_ptr PlayerMgr::GetPlayerByAccountId(const std::string& account_id) { diff --git a/server/robotserver/playermgr.h b/server/robotserver/playermgr.h index 97b648c6..57455098 100644 --- a/server/robotserver/playermgr.h +++ b/server/robotserver/playermgr.h @@ -20,13 +20,6 @@ class PlayerMgr : public a8::Singleton std::shared_ptr GetPlayerByAccountId(const std::string& account_id); std::shared_ptr GetPlayerBySocketHandle(int socket_handle); - private: - void CoWebLogin(int idx, f8::Coroutine* co); - void CoCreatePlayer(f8::Coroutine* co, - int idx, - const std::string& account_id, - const std::string& session_id); - private: std::map> socket_id_hash_; std::map> account_id_hash_;