server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2019-03-23 13:46:36 +08:00
parent b4004df698
commit 609ae95ad1
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/player.cc
View File

@ -213,7 +213,7 @@ void Player::_CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg)
send_func); send_func);
} }
void Player::FillMFPlayerData(cs::MFPlayerData* player_data) void Player::FillMFPlayerData(cs::MFActivePlayerData* player_data)
{ {
player_data->set_has_action(false); player_data->set_has_action(false);
} }

4
server/gameserver/player.h
View File

@ -10,7 +10,7 @@ namespace cs
class CMEmote; class CMEmote;
class CMSpectate; class CMSpectate;
class CMVoice; class CMVoice;
class MFPlayerData; class MFActivePlayerData;
} }
class Room; class Room;
@ -55,7 +55,7 @@ class Player : public Human
void _CMSpectate(f8::MsgHdr& hdr, const cs::CMSpectate& msg); void _CMSpectate(f8::MsgHdr& hdr, const cs::CMSpectate& msg);
void _CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg); void _CMVoice(f8::MsgHdr& hdr, const cs::CMVoice& msg);
void FillMFPlayerData(cs::MFPlayerData* player_data); void FillMFPlayerData(cs::MFActivePlayerData* player_data);
private: private:
cs::SMUpdate* update_msg = nullptr; cs::SMUpdate* update_msg = nullptr;

19
server/tools/protobuild/cs_proto.proto
View File

@ -228,7 +228,7 @@ message MFLootFull
optional int32 obj_uniid = 1; //唯一id optional int32 obj_uniid = 1; //唯一id
optional MFVector2D pos = 2; //位置 optional MFVector2D pos = 2; //位置
optional string name = 6; optional int32 item_id = 6;
optional int32 count = 7; optional int32 count = 7;
optional int32 age_ms = 8; optional int32 age_ms = 8;
} }
@ -331,8 +331,8 @@ message MFObjectFull
optional MFSmokeFull union_obj_9 = 10; optional MFSmokeFull union_obj_9 = 10;
} }
//玩家数据 //活跃玩家数据(当前)
message MFPlayerData message MFActivePlayerData
{ {
optional float boost = 1; optional float boost = 1;
@ -352,6 +352,7 @@ message MFPlayerData
optional int32 spectator_count = 20; optional int32 spectator_count = 20;
} }
//毒气数据
message MFGasData message MFGasData
{ {
optional int32 mode = 1; //0:inactive 1:waiting 2:moveing optional int32 mode = 1; //0:inactive 1:waiting 2:moveing
@ -373,12 +374,14 @@ message MFTeamData
optional bool downed = 7; optional bool downed = 7;
} }
message MFTeamInfo //同队队友数据
message MFTeammateInfo
{ {
optional int32 team_id = 1; optional int32 team_id = 1;
repeated int32 player_ids = 2; repeated int32 player_ids = 2;
} }
//子弹
message MFBullet message MFBullet
{ {
optional int32 player_id = 1; //玩家id optional int32 player_id = 1; //玩家id
@ -571,12 +574,12 @@ message SMUpdate
repeated MFObjectFull full_objects = 3; //对象-全量(出现在视野) repeated MFObjectFull full_objects = 3; //对象-全量(出现在视野)
repeated MFObjectPart part_objects = 4; //对象-部分(用于插值更新) repeated MFObjectPart part_objects = 4; //对象-部分(用于插值更新)
optional int32 active_player_id = 5; //当前活跃玩家id(如果玩家死亡后是观战对象的id) optional int32 active_player_id = 5; //当前活跃玩家id(如果玩家死亡后是观战对象的id)
optional MFPlayerData active_player_data = 6; //活跃玩家数据(如果玩家死亡后是观战对象的数据) optional MFActivePlayerData active_player_data = 6; //活跃玩家数据(如果玩家死亡后是观战对象的数据)
optional int32 alive_count = 15; //存活数量 optional int32 alive_count = 15; //存活数量
optional int32 gasT = 16; optional int32 gasT = 16; //毒气
optional MFGasData gas_data = 17; optional MFGasData gas_data = 17; //毒气数据
repeated MFTeamData team_data = 18; repeated MFTeamData team_data = 18;
repeated MFTeamInfo teams = 19; repeated MFTeammateInfo teams = 19; //同队队友数据
repeated MFBullet bullets = 20; //子弹 repeated MFBullet bullets = 20; //子弹
repeated MFShot shots = 21; //射击 repeated MFShot shots = 21; //射击
repeated MFExplosion explosions = 22; //爆炸 repeated MFExplosion explosions = 22; //爆炸