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 2020-07-08 10:47:13 +08:00
parent d4a8e500c9
commit e7fca225b6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/human.cc
View File

@ -238,15 +238,25 @@ void Human::FillMFTeamData(cs::MFTeamData* team_data)
room->frame_no - last_sync_teamdata_frameno_ > SERVER_FRAME_RATE * 2) { room->frame_no - last_sync_teamdata_frameno_ > SERVER_FRAME_RATE * 2) {
#endif #endif
last_sync_teamdata_frameno_ = room->frame_no; last_sync_teamdata_frameno_ = room->frame_no;
team_data->set_player_id(entity_uniid); team_data->set_player_id(entity_uniid);
if (room->gas_data.gas_mode == GasInactive) {
team_data->set_name(name); team_data->set_name(name);
}
if (room->gas_data.gas_mode != GasInactive &&
room->GetFrameNo() - room->GetBattleStartFrameNo() < 4) {
team_data->set_name(name);
team_data->set_disconnected(socket_handle == 0);
}
TypeConvert::ToPb(pos, team_data->mutable_pos()); TypeConvert::ToPb(pos, team_data->mutable_pos());
TypeConvert::ToPb(attack_dir, team_data->mutable_dir()); TypeConvert::ToPb(attack_dir, team_data->mutable_dir());
team_data->set_health(health); team_data->set_health(health);
team_data->set_max_health(GetMaxHP()); team_data->set_max_health(GetMaxHP());
team_data->set_disconnected(false);
team_data->set_dead(dead); team_data->set_dead(dead);
team_data->set_downed(downed); team_data->set_downed(downed);
#if 0
team_data->set_disconnected(false);
#endif
} }
} }

1
server/gameserver/room.h
View File

@ -57,6 +57,7 @@ public:
int GetPlayerNum(); int GetPlayerNum();
int AliveCount(); int AliveCount();
long long AliveCountChgFrameNo() { return alive_count_chged_frameno_; } long long AliveCountChgFrameNo() { return alive_count_chged_frameno_; }
long long GetBattleStartFrameNo() { return battle_start_frameno_;}
Player* GetPlayerByAccountId(const std::string& accountid); Player* GetPlayerByAccountId(const std::string& accountid);
Player* GetPlayerByUniId(int uniid); Player* GetPlayerByUniId(int uniid);
Entity* GetEntityByUniId(int uniid); Entity* GetEntityByUniId(int uniid);