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

修复打自己问题和子弹速度

Browse Source
This commit is contained in:
aozhiwei 2019-05-08 11:04:10 +08:00
parent 3e8e4f23d9
commit 067f582f28
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bullet.cc
View File

@ -151,7 +151,7 @@ void Bullet::ProcBomb()
for (auto& grid : grid_list) { for (auto& grid : grid_list) {
for (Human* hum: grid->human_list) { for (Human* hum: grid->human_list) {
#if 1 #if 1
if (hum != player) { {
#else #else
if (hum != player && if (hum != player &&
(hum->team_id == 0 || player->team_id != hum->team_id)) { (hum->team_id == 0 || player->team_id != hum->team_id)) {

4
server/gameserver/player.cc
View File

@ -154,12 +154,12 @@ void Player::UpdateShot()
++series_shot_frames; ++series_shot_frames;
if (last_shot_frameno_ == 0 || if (last_shot_frameno_ == 0 ||
( (
(room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) > (room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) >=
curr_weapon->meta->i->fire_rate() curr_weapon->meta->i->fire_rate()
) { ) {
Shot(); Shot();
} }
if (series_shot_frames > 4) { if (series_shot_frames > 8) {
shot_hold = false; shot_hold = false;
series_shot_frames = 0; series_shot_frames = 0;
} }