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

ok

Browse Source
This commit is contained in:
aozhiwei 2019-04-16 11:28:22 +08:00
parent d46e2597ee
commit 308a1e72f3
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/human.cc
View File

@ -109,6 +109,17 @@ void Human::FillMFPlayerStats(cs::MFPlayerStats* stats_pb)
stats_pb->set_account_id(account_id);
}
void Human::FillMFTeamData(cs::MFTeamData* team_data)
{
team_data->set_player_id(entity_uniid);
pos.ToPB(team_data->mutable_pos());
attack_dir.ToPB(team_data->mutable_dir());
team_data->set_health(health);
team_data->set_disconnected(false);
team_data->set_dead(dead);
team_data->set_downed(downed);
}
void Human::Shot(Vector2D& target_dir)
{
if (!curr_weapon->meta) {

1
server/gameserver/human.h
View File

@ -84,6 +84,7 @@ class Human : public Entity
virtual void FillMFObjectPart(cs::MFObjectPart* part_data) override;
virtual void FillMFObjectFull(cs::MFObjectFull* full_data) override;
virtual void FillMFPlayerStats(cs::MFPlayerStats* stats);
void FillMFTeamData(cs::MFTeamData* team_data);
void Shot(Vector2D& target_dir);
void RecalcSelfCollider();
bool IsCollision();

10
server/gameserver/player.cc
View File

@ -931,11 +931,13 @@ void Player::MakeUpdateMsg()
}
}
}
if (need_sync_team_data) {
need_sync_team_data = false;
if (need_sync_team_data && team_members) {
for (auto& itr : *team_members) {
if (itr != this) {
itr->FillMFTeamData(update_msg->add_team_data());
}
if (need_sync_teammate_data) {
need_sync_teammate_data = false;
}
need_sync_team_data = false;
}
if (send_update_msg_times == 0) {
room->FetchBuilding(this);

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

@ -614,8 +614,7 @@ message SMUpdate
optional int32 gas_progress = 16; //毒圈进度,表示缩进的像素数(只有当gas_data.mode == moving时才会发进度)
optional MFVector2D gas_pos_old = 30; //毒圈当前圆心坐标
optional MFGasData gas_data = 17; //毒圈数据
repeated MFTeamData team_data = 18; //活跃玩家队伍数据
optional MFTeammateInfo teammate_data = 19; //同队队友数据(自己的队友数据)
repeated MFTeamData team_data = 18; //队伍数据
repeated MFBullet bullets = 20; //子弹
repeated MFShot shots = 21; //射击
repeated MFExplosion explosions = 22; //爆炸