add room roommgr

server/gameserver/constant.h

@@ -27,8 +27,9 @@ enum NetHandler_e
 {
     HID_Player,
     HID_PlayerMgr,
+    HID_Room,
+    HID_RoomMgr,
     HID_GGListener,
-    HID_Bag,
     HID_Storage,
     HID_DBEngine,
     HID_Mission,

server/gameserver/handlermgr.cc

@@ -7,6 +7,9 @@
 #include "GGListener.h"
 #include "metamgr.h"
 #include "app.h"
+#include "player.h"
+#include "roommgr.h"
+#include "cs_proto.pb.h"
 
 static void _GMOpsSelfChecking(f8::JsonHttpRequest* request)
 {
@@ -39,7 +42,14 @@ void HandlerMgr::UnInit()
 
 void HandlerMgr::RegisterNetMsgHandlers()
 {
-    //    RegisterNetMsgHandler(&ggmsghandler, &PlayerMgr::_SS_WSP_SocketDisconnect);
+    //RegisterNetMsgHandler(&ggmsghandler, &PlayerMgr::_SS_WSP_SocketDisconnect);
+    RegisterNetMsgHandler(&ggmsghandler, &RoomMgr::_CMJoin);
+
+    RegisterNetMsgHandler(&ggmsghandler, &Player::_CMMove);
+    RegisterNetMsgHandler(&ggmsghandler, &Player::_CMDropItem);
+    RegisterNetMsgHandler(&ggmsghandler, &Player::_CMEmote);
+    RegisterNetMsgHandler(&ggmsghandler, &Player::_CMSpectate);
+    RegisterNetMsgHandler(&ggmsghandler, &Player::_CMVoice);
 }
 
 void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,

server/gameserver/player.cc

@@ -0,0 +1,30 @@
+#include "precompile.h"
+
+#include "playermgr.h"
+#include "player.h"
+#include "cs_proto.pb.h"
+
+void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
+{
+
+}
+
+void Player::_CMDropItem(f8::MsgHdr& hdr, const cs::CMDropItem& msg)
+{
+
+}
+
+void Player::_CMEmote(f8::MsgHdr& hdr, const cs::CMEmote& msg)
+{
+
+}
+
+void Player::_CMSpectate(f8::MsgHdr& hdr, const cs::CMSpectate& msg)
+{
+
+}
+
+void Player::_CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg)
+{
+
+}

server/gameserver/player.h

@@ -0,0 +1,42 @@
+#pragma once
+
+namespace cs
+{
+    class CMMove;
+    class CMDropItem;
+    class CMEmote;
+    class CMSpectate;
+    class CMVoice;
+}
+
+class Player
+{
+ public:
+    enum { HID = HID_Player };
+
+ public:
+    int obj_uniid = 0;
+    float health = 0.0;
+
+    void _CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg);
+    void _CMDropItem(f8::MsgHdr& hdr, const cs::CMDropItem& msg);
+    void _CMEmote(f8::MsgHdr& hdr, const cs::CMEmote& msg);
+    void _CMSpectate(f8::MsgHdr& hdr, const cs::CMSpectate& msg);
+    void _CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg);
+
+private:
+    bool dead_ = false;
+    bool downed_ = false;
+    bool disconnected_ = false;
+    int anim_type_ = 0;
+    int anim_seq_ = 0;
+    int action_type_ = 0;
+    int skin_ = 0;
+    int helmet_ = 0;
+    int chest_ = 0;
+    int weapon_ = 0;
+    int energy_shield_ = 0;
+    int vip_ = 0;
+    int sdmg_ = 0;
+
+};

server/gameserver/playermgr.cc

@@ -0,0 +1,19 @@
+#include "precompile.h"
+
+#include "playermgr.h"
+#include "player.h"
+
+void PlayerMgr::Init()
+{
+
+}
+
+void PlayerMgr::UnInit()
+{
+
+}
+
+void PlayerMgr::Update()
+{
+
+}

server/gameserver/playermgr.h

@@ -0,0 +1,21 @@
+#pragma once
+
+class Player;
+class PlayerMgr : public a8::Singleton<PlayerMgr>
+{
+ public:
+    enum { HID = HID_PlayerMgr };
+
+ private:
+    PlayerMgr() {};
+    friend class a8::Singleton<PlayerMgr>;
+
+ public:
+    void Init();
+    void UnInit();
+    void Update();
+
+ private:
+    std::map<int, Player*> id_hash_;
+    std::map<int, Player*> socket_hash_;
+};

server/gameserver/room.h

@@ -0,0 +1,8 @@
+#pragma once
+
+class Room
+{
+ private:
+    long long room_id_ = 0;
+
+};

server/gameserver/roommgr.cc

@@ -0,0 +1,20 @@
+#include "precompile.h"
+
+#include "roommgr.h"
+#include "room.h"
+#include "cs_proto.pb.h"
+
+void RoomMgr::Init()
+{
+
+}
+
+void RoomMgr::UnInit()
+{
+
+}
+
+void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
+{
+
+}

server/gameserver/roommgr.h

@@ -0,0 +1,22 @@
+#pragma once
+
+namespace cs
+{
+    class CMJoin;
+}
+
+class RoomMgr : public a8::Singleton<RoomMgr>
+{
+ public:
+    enum { HID = HID_RoomMgr };
+
+ private:
+    RoomMgr() {};
+    friend class a8::Singleton<RoomMgr>;
+
+ public:
+    void Init();
+    void UnInit();
+
+    void _CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg);
+};

server/tools/protobuild/cs_proto.proto

@@ -448,10 +448,9 @@ message SMReConnect
 //加入
 message CMJoin
 {
-    optional int32 protocol = 1; //协议版本号
+    optional string team_uuid = 2; //队伍唯一id (没组队时为空字符串)
-    optional string team_uuid = 2; //队伍唯一id
     optional int32 team_mode = 3; //队伍模式
-    optional int32 player_count = 4; //玩家数
+    optional int32 player_count = 4; //玩家数(单人时为1)
     optional int32 auto_fill = 5; //是否自动填充玩家
     optional int32 bot = 6; //是否机器人
     optional string name = 7; //角色名