1
This commit is contained in:
parent
11ec0e68ca
commit
b94ed56e88
@ -224,15 +224,23 @@ void Human::GetAabbBox(AabbCollider& aabb_box)
|
|||||||
|
|
||||||
void Human::FillMFTeamData(cs::MFTeamData* team_data)
|
void Human::FillMFTeamData(cs::MFTeamData* team_data)
|
||||||
{
|
{
|
||||||
team_data->set_player_id(entity_uniid);
|
#if 1
|
||||||
team_data->set_name(name);
|
{
|
||||||
TypeConvert::ToPb(pos, team_data->mutable_pos());
|
#else
|
||||||
TypeConvert::ToPb(attack_dir, team_data->mutable_dir());
|
if (room->gas_data.gas_mode == GasJump ||
|
||||||
team_data->set_health(health);
|
room->frame_no - last_sync_teamdata_frameno_ > SERVER_FRAME_RATE * 2) {
|
||||||
team_data->set_max_health(GetMaxHP());
|
#endif
|
||||||
team_data->set_disconnected(false);
|
last_sync_teamdata_frameno_ = room->frame_no;
|
||||||
team_data->set_dead(dead);
|
team_data->set_player_id(entity_uniid);
|
||||||
team_data->set_downed(downed);
|
team_data->set_name(name);
|
||||||
|
TypeConvert::ToPb(pos, team_data->mutable_pos());
|
||||||
|
TypeConvert::ToPb(attack_dir, team_data->mutable_dir());
|
||||||
|
team_data->set_health(health);
|
||||||
|
team_data->set_max_health(GetMaxHP());
|
||||||
|
team_data->set_disconnected(false);
|
||||||
|
team_data->set_dead(dead);
|
||||||
|
team_data->set_downed(downed);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Human::Shot(a8::Vec2& target_dir)
|
void Human::Shot(a8::Vec2& target_dir)
|
||||||
|
@ -241,6 +241,7 @@ protected:
|
|||||||
long long recover_hp_frameno_ = 0;
|
long long recover_hp_frameno_ = 0;
|
||||||
long long reflect_damage_frameno_ = 0;
|
long long reflect_damage_frameno_ = 0;
|
||||||
long long summon_hero_frameno_ = 0;
|
long long summon_hero_frameno_ = 0;
|
||||||
|
long long last_sync_teamdata_frameno_ = 0;
|
||||||
a8::XTimerAttacher skill_xtimer_attacher_;
|
a8::XTimerAttacher skill_xtimer_attacher_;
|
||||||
bool leave_ = false;
|
bool leave_ = false;
|
||||||
long long leave_frameno_ = 0;
|
long long leave_frameno_ = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user