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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-20 14:14:45 +08:00
parent ff092cdc10
commit 4719508948
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/gameserver/human.cc
View File

@ -832,8 +832,8 @@ void Human::SendUpdateMsg()
} }
cs::SMUpdate* msg = room->frame_maker.MakeUpdateMsg(this); cs::SMUpdate* msg = room->frame_maker.MakeUpdateMsg(this);
if (send_msg_times == 0 || last_sync_gas_frameno < room->gas_data.gas_start_frameno) { if (send_msg_times == 0 || last_sync_gas_frameno_ < room->gas_data.gas_start_frameno) {
last_sync_gas_frameno = room->gas_data.gas_start_frameno; last_sync_gas_frameno_ = room->gas_data.gas_start_frameno;
FillMFGasData(msg->mutable_gas_data()); FillMFGasData(msg->mutable_gas_data());
} }
bool refreshed_view = false; bool refreshed_view = false;
@ -847,7 +847,7 @@ void Human::SendUpdateMsg()
} }
} }
} }
if (observer != this && !observer->follow_synced_active_player) { if (observer != this && !observer->follow_synced_active_player_) {
msg->set_active_player_id(entity_uniid); msg->set_active_player_id(entity_uniid);
FillMFActivePlayerData(msg->mutable_active_player_data()); FillMFActivePlayerData(msg->mutable_active_player_data());
if (!refreshed_view) { if (!refreshed_view) {
@ -878,7 +878,7 @@ void Human::SendUpdateMsg()
} }
refreshed_view = true; refreshed_view = true;
} }
observer->follow_synced_active_player = true; observer->follow_synced_active_player_ = true;
} else { } else {
if (active_player_data_pb) { if (active_player_data_pb) {
msg->set_active_player_id(entity_uniid); msg->set_active_player_id(entity_uniid);
@ -910,7 +910,7 @@ void Human::FollowTarget(Human* target)
} }
target->AddObserver(this); target->AddObserver(this);
follow_target_ = target; follow_target_ = target;
follow_synced_active_player = false; follow_synced_active_player_ = false;
} }
void Human::SendDebugMsg(const std::string& debug_msg) void Human::SendDebugMsg(const std::string& debug_msg)

4
server/gameserver/human.h
View File

@ -232,7 +232,7 @@ protected:
std::set<Human*> property_chged_humans_; std::set<Human*> property_chged_humans_;
std::set<Human*> observers_; std::set<Human*> observers_;
Human* follow_target_ = nullptr; Human* follow_target_ = nullptr;
bool follow_synced_active_player = false; bool follow_synced_active_player_ = false;
MetaData::Player* meta_ = nullptr; MetaData::Player* meta_ = nullptr;
MetaData::Skill* skill_meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr;
@ -241,7 +241,7 @@ protected:
private: private:
CircleCollider* self_collider_ = nullptr; CircleCollider* self_collider_ = nullptr;
long long last_sync_gas_frameno = 0; long long last_sync_gas_frameno_ = 0;
std::list<Buff> buff_list_; std::list<Buff> buff_list_;
std::array<Buff*, BET_End> buff_effect_ = {}; std::array<Buff*, BET_End> buff_effect_ = {};