This commit is contained in:
aozhiwei 2020-07-23 17:21:42 +08:00
parent 7f6320ee49
commit 1aac6373a7
2 changed files with 8 additions and 0 deletions

View File

@ -61,6 +61,10 @@ void Bullet::OnHit(std::set<Entity*>& objects)
hum->HasBuffEffect(kBET_AdPlaying)) {
continue;
}
if (player->room->GetRoomMode() == kZombieMode &&
player->GetRace() == hum->GetRace()) {
continue;
}
if (!hum->dead && (IsBomb() || player->team_id != hum->team_id)) {
float dmg = GetAtk() * (1 + player->GetBuffAttrRate(kHAT_Atk)) +
player->GetBuffAttrAbs(kHAT_Atk);

View File

@ -344,3 +344,7 @@ const int MAX_ROOM_IDX = 2018;
const int VIEW_RANGE = 512;
const int MAX_AI_LEVEL = 8;
const int HUMAN_RACE_META_START_ID = 5001;
const int ZOMBIE_RACE_META_START_ID = 6001;