diff --git a/server/gameserver/constant_export.h b/server/gameserver/constant_export.h index 973ce2d6..5799e19b 100644 --- a/server/gameserver/constant_export.h +++ b/server/gameserver/constant_export.h @@ -19,6 +19,7 @@ const int kVertigoBuffId = 7018; const int kPeaceModeBuffId = 7019; const int kPullToWalkableBuffId = 8003; const int kDiveBuffId = 8054; +const int kInvincibleBuffId = 1005; enum BuffEffectType_e { diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index baaffb06..a8169974 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -220,6 +220,11 @@ void InternalShot(Creature* c, bullet_info.recoil_force = std::get<4>(tuple); bullet_info.invincible_buff_uniid = invincible_buff_uniid; InternalCreateBullet(bullet_info); + #ifdef DEBUG + if (c->IsPlayer()) { + printf("delay_time:%d\n", bullet_info.delay_time); + } + #endif } } c->GetTrigger()->Shot(weapon_meta); diff --git a/server/gameserver/frameevent.cc b/server/gameserver/frameevent.cc index 96deb742..8267ae8f 100644 --- a/server/gameserver/frameevent.cc +++ b/server/gameserver/frameevent.cc @@ -83,6 +83,11 @@ void FrameEvent::AddBullet(int bullet_uniid, a8::Vec2 dir, float fly_distance) { + #if DEBUG + if (sender.Get()->IsPlayer()) { + + } + #endif { auto& tuple = a8::FastAppend(bullets_); std::get<0>(tuple) = sender; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 843083d8..87e1dcbc 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -1087,14 +1087,12 @@ void Player::_CMRevive(f8::MsgHdr& hdr, const cs::CMRevive& msg) hum->GetPos().y }); #endif - #if 0 { - MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(kREVIVE_BUFF_ID); - if (buff_meta) { - AddBuff(this, buff_meta, 1); + int buff_uniid = TryAddBuff(this, kInvincibleBuffId); + if (buff_uniid) { + Buff* buff = GetBuffByUniId(buff_uniid); } } - #endif } }