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-11 16:17:07 +08:00
parent 9ac84073b1
commit ddbb749689
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/frameevent.cc
View File

@ -57,7 +57,7 @@ void FrameEvent::AddShot(Human* hum)
} }
} }
void FrameEvent::AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fly_distance) void FrameEvent::AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fly_distance, int hit_time)
{ {
{ {
auto& tuple = a8::FastAppend(bullets_); auto& tuple = a8::FastAppend(bullets_);
@ -74,6 +74,9 @@ void FrameEvent::AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fl
p.set_gun_id(hum->curr_weapon->meta->i->id()); p.set_gun_id(hum->curr_weapon->meta->i->id());
p.set_gun_lv(hum->curr_weapon->weapon_lv); p.set_gun_lv(hum->curr_weapon->weapon_lv);
p.set_fly_distance(fly_distance); p.set_fly_distance(fly_distance);
if (hit_time != 0) {
p.set_hit_time(hit_time);
}
} }
{ {
int bullet_idx = bullets_.size() - 1; int bullet_idx = bullets_.size() - 1;

2
server/gameserver/frameevent.h
View File

@ -15,7 +15,7 @@ public:
void AddAirDrop(int appear_time, int box_id, a8::Vec2 box_pos); void AddAirDrop(int appear_time, int box_id, a8::Vec2 box_pos);
void AddEmote(Human* hum, int emote_id); void AddEmote(Human* hum, int emote_id);
void AddShot(Human* hum); void AddShot(Human* hum);
void AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fly_distance); void AddBullet(Human* hum, a8::Vec2 born_pos, a8::Vec2 dir, float fly_distance, int hit_time);
void AddExplosion(int item_id, a8::Vec2 bomb_pos, int effect); void AddExplosion(int item_id, a8::Vec2 bomb_pos, int effect);
void AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos); void AddSmoke(Bullet* bullet, int item_id, a8::Vec2 pos);
void AddDead(Human* hum); void AddDead(Human* hum);

3
server/gameserver/human.cc
View File

@ -236,7 +236,8 @@ void Human::DirectShot(MetaData::Equip* bullet_meta)
} }
} }
bullet_dir.Rotate(bullet_angle / 180.0f); bullet_dir.Rotate(bullet_angle / 180.0f);
room->frame_event.AddBullet(this, bullet_born_pos, attack_dir, fly_distance); int hit_time = 0;
room->frame_event.AddBullet(this, bullet_born_pos, attack_dir, fly_distance, hit_time);
if (room->BattleStarted()) { if (room->BattleStarted()) {
room->CreateBullet(this, bullet_meta, bullet_born_pos, bullet_dir, fly_distance); room->CreateBullet(this, bullet_meta, bullet_born_pos, bullet_dir, fly_distance);
} }