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

1

Browse Source
This commit is contained in:
aozhiwei 2021-08-02 06:48:18 +00:00
parent b819435e53
commit dafb449779
3 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
server/gameserver/bullet.cc
View File

@ -305,7 +305,18 @@ void Bullet::MapServiceUpdate()
return;
}
if (sender.Get()) {
SetPos(GetPos() + dir * gun_meta->i->bullet_speed() / (float)SERVER_FRAME_RATE);
float move_length = gun_meta->i->bullet_speed() / (float)SERVER_FRAME_RATE;
do {
float step_len = move_length - MetaMgr::Instance()->bullet_planck_step_length;
if (step_len <= 0.001f) {
if (move_length > 0.1f) {
step_len = move_length;
} else {
break;
}
}
move_length -= step_len;
SetPos(GetPos() + dir * step_len);
float distance = (GetPos() - born_pos).Norm();
if (room->OverBorder(GetPos(), gun_meta->i->bullet_rad())) {
if (IsBomb()) {
@ -321,6 +332,7 @@ void Bullet::MapServiceUpdate()
room->grid_service->MoveBullet(this);
Check(distance);
}
} while(!later_removed_ && move_length >= 0.0001f);
} else {
room->RemoveObjectLater(this);
later_removed_ = true;
@ -356,6 +368,34 @@ void Bullet::Check(float distance)
int c_hit_num = 0;
int t_hit_num = 0;
std::set<Entity*> objects;
{
std::set<ColliderComponent*> colliders;
room->map_service->GetColliders(room, GetX(), GetY(), colliders);
for (ColliderComponent* collider : colliders) {
if (collider->owner->IsEntityType(ET_Dummy)) {
if (TestCollision(room, collider)) {
objects.insert(collider->owner);
}
} else if (collider->owner->IsEntityType(ET_Obstacle)) {
Obstacle* obstacle = (Obstacle*)collider->owner;
if (gun_meta->i->is_penetrate_thing() &&
hit_objects_.find(obstacle->GetUniId()) != hit_objects_.end()) {
//穿物件
continue;
}
if (!obstacle->CanThroughable(this)) {
if (TestCollision(room, collider)) {
objects.insert(collider->owner);
if (gun_meta->i->is_penetrate_thing()) {
++t_hit_num;
hit_objects_.insert(collider->owner->GetUniId());
}
}
}
}
}
}
if (t_hit_num <= 0) {
room->grid_service->TraverseCreatures
(room->GetRoomIdx(),
GetGridList(),
@ -391,32 +431,6 @@ void Bullet::Check(float distance)
}
}
});
{
std::set<ColliderComponent*> colliders;
room->map_service->GetColliders(room, GetX(), GetY(), colliders);
for (ColliderComponent* collider : colliders) {
if (collider->owner->IsEntityType(ET_Dummy)) {
if (TestCollision(room, collider)) {
objects.insert(collider->owner);
}
} else if (collider->owner->IsEntityType(ET_Obstacle)) {
Obstacle* obstacle = (Obstacle*)collider->owner;
if (gun_meta->i->is_penetrate_thing() &&
hit_objects_.find(obstacle->GetUniId()) != hit_objects_.end()) {
//穿物件
continue;
}
if (!obstacle->CanThroughable(this)) {
if (TestCollision(room, collider)) {
objects.insert(collider->owner);
if (gun_meta->i->is_penetrate_thing()) {
++t_hit_num;
hit_objects_.insert(collider->owner->GetUniId());
}
}
}
}
}
}
float bullet_range = gun_meta->i->range();
if (gun_upgrade_meta && gun_upgrade_meta->GetAttrValue(gun_lv, kHAT_ShotRange) > 0) {

1
server/gameserver/metamgr.cc
View File

@ -203,6 +203,7 @@ public:
MetaMgr::Instance()->newbie_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("newbie_fill_interval", 5000);
MetaMgr::Instance()->other_fill_interval = MetaMgr::Instance()->GetSysParamAsInt("other_fill_interval", 2000);
MetaMgr::Instance()->map_cell_width = MetaMgr::Instance()->GetSysParamAsInt("map_cell_width", 64 * 8);
MetaMgr::Instance()->bullet_planck_step_length = std::max(15, MetaMgr::Instance()->GetSysParamAsInt("bullet_planck_step_length", 15));
METAMGR_READ(zbmode_gas_inactive_time, 25);
METAMGR_READ(zbmode_game_duration, 300);
METAMGR_READ(zbmode_player_num, 15);

1
server/gameserver/metamgr.h
View File

@ -170,6 +170,7 @@ class MetaMgr : public a8::Singleton<MetaMgr>
float android_pursuit_range = 0;
float android_patrol_range = 0;
int map_cell_width = 64 * 8;
int bullet_planck_step_length = 15;
MetaData::Player* human_meta = nullptr;
MetaData::Player* android_meta = nullptr;
MetaData::Player* terminator_meta = nullptr;