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-20 17:43:02 +08:00
parent 7ea450c80c
commit 47917094fd
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/bullet.h
View File

@ -16,6 +16,7 @@ class Bullet : public Entity
MetaData::Equip* gun_meta = nullptr; MetaData::Equip* gun_meta = nullptr;
MetaData::Equip* meta = nullptr; MetaData::Equip* meta = nullptr;
Human* player = nullptr; Human* player = nullptr;
Vector2D dir;
Vector2D born_pos; Vector2D born_pos;
Vector2D born_dir; Vector2D born_dir;

1
server/gameserver/entity.h
View File

@ -40,7 +40,6 @@ class Entity
EntitySubType_e entity_subtype = EST_None; EntitySubType_e entity_subtype = EST_None;
Room* room = nullptr; Room* room = nullptr;
Vector2D pos; Vector2D pos;
Vector2D dir;
int updated_times = 0; int updated_times = 0;
MovementComponent* movement = nullptr; MovementComponent* movement = nullptr;
std::list<ColliderComponent*> colliders; std::list<ColliderComponent*> colliders;

4
server/gameserver/human.cc
View File

@ -42,7 +42,7 @@ void Human::FillMFObjectPart(cs::MFObjectPart* part_data)
cs::MFPlayerPart* p = part_data->mutable_union_obj_1(); cs::MFPlayerPart* p = part_data->mutable_union_obj_1();
p->set_obj_uniid(entity_uniid); p->set_obj_uniid(entity_uniid);
pos.ToPB(p->mutable_pos()); pos.ToPB(p->mutable_pos());
dir.ToPB(p->mutable_dir()); attack_dir.ToPB(p->mutable_dir());
} }
void Human::FillMFObjectFull(cs::MFObjectFull* full_data) void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
@ -51,7 +51,7 @@ void Human::FillMFObjectFull(cs::MFObjectFull* full_data)
cs::MFPlayerFull* p = full_data->mutable_union_obj_1(); cs::MFPlayerFull* p = full_data->mutable_union_obj_1();
p->set_obj_uniid(entity_uniid); p->set_obj_uniid(entity_uniid);
pos.ToPB(p->mutable_pos()); pos.ToPB(p->mutable_pos());
dir.ToPB(p->mutable_dir()); attack_dir.ToPB(p->mutable_dir());
p->set_health(health); p->set_health(health);
p->set_dead(dead); p->set_dead(dead);

4
server/gameserver/human.h
View File

@ -26,6 +26,9 @@ class Human : public Entity
MetaData::Equip* chest_meta = nullptr; MetaData::Equip* chest_meta = nullptr;
MetaData::Equip* weapon_meta = nullptr; MetaData::Equip* weapon_meta = nullptr;
Vector2D move_dir;
Vector2D attack_dir;
std::string name; std::string name;
float health = 0.0; float health = 0.0;
bool dead = false; bool dead = false;
@ -45,7 +48,6 @@ class Human : public Entity
HumanFrameData frame_data; HumanFrameData frame_data;
bool moving = false; bool moving = false;
Vector2D move_dir;
std::set<Human*> my_seen_players; std::set<Human*> my_seen_players;
std::set<Human*> seen_me_players; std::set<Human*> seen_me_players;