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

1

Browse Source
This commit is contained in:
aozhiwei 2022-10-17 16:08:51 +08:00
parent f0419e05f6
commit 49e7876531
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/incubator.cc
View File

@ -412,7 +412,7 @@ void Incubator::NextWave()
[this] (Player* hum, a8::XParams& param)
{
cs::SMPvePassWave notify_msg;
notify_msg.set_new_wave(hum->room->pve_data.GetWave());
notify_msg.set_new_wave(hum->room->pve_data.GetWave() + 1);
notify_msg.set_pve_max_wave(room->pve_data.max_wave);
hum->SendNotifyMsg(notify_msg);
return true;

7
server/gameserver/shot.cc
View File

@ -391,8 +391,13 @@ void InternalShot(Creature* c,
bullet_info.keep_shot_animi_timer_ptr = keep_shot_animi_timer_ptr;
bullet_info.shot_animi_time = shot_animi_time;
if (skill_meta &&
#if 1
skill_meta->GetMagicId() == MAGIC_AXXF
#else
(skill_meta->GetMagicId() == MAGIC_AXXF ||
skill_meta->GetMagicId() == MAGIC_HJHX)) {
skill_meta->GetMagicId() == MAGIC_HJHX)
#endif
) {
bullet_info.trace_target_uniid = c->GetSkillTargetId();
}
if (weapon_meta->i->double_gun() &&

6
server/gameserver/trigger.cc
View File

@ -132,7 +132,13 @@ void Trigger::Shot(MetaData::Equip* weapon_meta)
void Trigger::Kill(Creature* target, int weapon_id)
{
if (owner_->IsHuman() && target->IsHuman()) {
#if 1
if (target->GetUniId() != owner_->GetUniId()) {
owner_->AsHuman()->stats.kills++;
}
#else
owner_->AsHuman()->stats.kills++;
#endif
owner_->AsHuman()->stats.last_kill_frameno = owner_->room->GetFrameNo();
owner_->AsHuman()->kill_humans.insert(target->AsHuman());
owner_->AsHuman()->SyncAroundPlayers(__FILE__, __LINE__, __func__);