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-12-31 09:23:42 +08:00
parent dfd0ac51fa
commit 3f143334f4
3 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
server/gameserver/bullet.cc
View File

@ -832,50 +832,13 @@ void Bullet::GetHitCreatures(BulletCheckResult& result)
if (c->HasBuffEffect(kBET_BulletThrough)) { if (c->HasBuffEffect(kBET_BulletThrough)) {
return; return;
} }
{ if (c->HasBuffEffect(kBET_HoldShield)) {
Buff* hold_shield_buff = c->GetBuffByEffectId(kBET_HoldShield); c->CheckBulletHitHoldShield(this, result.eat);
if (hold_shield_buff && !IsBomb() && !c->dead && c != sender.Get()) { if (result.eat) {
// 999 stop = true;
#if 0 return;
//param2是距离 param4是宽度
a8::Vec2 shield_pos = c->GetPos() + c->GetAttackDir() * hold_shield_buff->meta->param2;
bool ret = Check2dRotationRectangle(GetPos().x,
GetPos().y,
//10,
gun_meta->bullet_rad(),
shield_pos.x,
shield_pos.y,
hold_shield_buff->meta->param4,
MetaMgr::Instance()->bullet_planck_step_length,
c->GetAttackDirRotate() * 180.0f
);
if (ret) {
float finaly_dmg = c->GetBattleContext()->CalcDmg(c, this);
c->shield_hp_ = std::max(0.0f, c->shield_hp_ - finaly_dmg);
#ifdef DEBUG
a8::XPrintf("命中盾牌 finally_dmg:%f shield_hp:%f\n",
{
finaly_dmg,
c->shield_hp_
});
#endif
room->frame_event.AddPropChg(c->GetWeakPtrRef(),
kPropShieldHp,
c->shield_max_hp_,
c->shield_hp_);
if (c->shield_hp_ <= 0) {
#ifdef DEBUG
a8::XPrintf("shiled destory\n", {});
#endif
c->GetTrigger()->ShieldDestory();
c->RemoveBuffByUniId(hold_shield_buff->buff_uniid);
}
eat = true;
stop = true;
return;
}
#endif
} }
return;
} }
AabbCollider aabb_box; AabbCollider aabb_box;
c->GetHitAabbBox(aabb_box); c->GetHitAabbBox(aabb_box);

48
server/gameserver/creature.cc
View File

@ -3033,3 +3033,51 @@ void Creature::OnLand()
} }
} }
} }
void Creature::CheckBulletHitHoldShield(IBullet* bullet, bool& eat)
{
Buff* hold_shield_buff = GetBuffByEffectId(kBET_HoldShield);
if (hold_shield_buff && !bullet->IsBomb() && !dead && this != bullet->GetSender().Get()) {
// 999
#if 0
//param2是距离 param4是宽度
a8::Vec2 shield_pos = c->GetPos() + c->GetAttackDir() * hold_shield_buff->meta->param2;
bool ret = Check2dRotationRectangle(GetPos().x,
GetPos().y,
//10,
gun_meta->bullet_rad(),
shield_pos.x,
shield_pos.y,
hold_shield_buff->meta->param4,
MetaMgr::Instance()->bullet_planck_step_length,
c->GetAttackDirRotate() * 180.0f
);
if (ret) {
float finaly_dmg = c->GetBattleContext()->CalcDmg(c, this);
c->shield_hp_ = std::max(0.0f, c->shield_hp_ - finaly_dmg);
#ifdef DEBUG
a8::XPrintf("命中盾牌 finally_dmg:%f shield_hp:%f\n",
{
finaly_dmg,
c->shield_hp_
});
#endif
room->frame_event.AddPropChg(c->GetWeakPtrRef(),
kPropShieldHp,
c->shield_max_hp_,
c->shield_hp_);
if (c->shield_hp_ <= 0) {
#ifdef DEBUG
a8::XPrintf("shiled destory\n", {});
#endif
c->GetTrigger()->ShieldDestory();
c->RemoveBuffByUniId(hold_shield_buff->buff_uniid);
}
eat = true;
stop = true;
return;
}
#endif
}
}

1
server/gameserver/creature.h
View File

@ -293,6 +293,7 @@ class Creature : public MoveableEntity
void LockAttackDir(int time); void LockAttackDir(int time);
void PullTarget(const glm::vec3& target_pos); void PullTarget(const glm::vec3& target_pos);
void MarkSyncActivePlayer(const char* file, int line, const char* func); void MarkSyncActivePlayer(const char* file, int line, const char* func);
void CheckBulletHitHoldShield(IBullet* bullet, bool& eat);
protected: protected:
virtual void OnBuffRemove(Buff& buff); virtual void OnBuffRemove(Buff& buff);