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-05-26 17:18:48 +08:00
parent 81bb49b96a
commit ffc4772a97
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/constant_export.h
View File

@ -42,7 +42,7 @@ enum BuffEffectType_e
kBET_Jump = 25, //跳伞中
kBET_IntervalAddBuff = 26, //持续掉血
//kBET_LastAddHp = 27, //持续加血
//kBET_OnceAddHp = 28, //加血
kBET_OnceAddHp = 28, //加血
kBET_SummonHero = 29, //召唤英雄
//kBET_SummonHero = 30, //向前跳跃
kBET_Shield = 31, //护盾

18
server/gameserver/creature.cc
View File

@ -868,6 +868,11 @@ void Creature::ProcBuffEffect(Creature* caster, Buff* buff)
buff->ProcIntervalAddBuff(caster);
}
break;
case kBET_OnceAddHp:
{
AddHp(buff->meta->param1);
}
break;
case kBET_SummonHero:
{
SummonHero(buff,
@ -1766,3 +1771,16 @@ void Creature::GetHitEnemys(std::set<Creature*>& enemys)
}
});
}
void Creature::AddHp(float hp)
{
float old_health = GetHP();
ability.hp += hp;
ability.hp = std::min(GetHP(), GetMaxHP());
if (IsHuman()) {
Human* hum = (Human*)this;
hum->stats.heal_amount += GetHP() - old_health;
SyncAroundPlayers(__FILE__, __LINE__, __func__);
}
}

1
server/gameserver/creature.h
View File

@ -119,6 +119,7 @@ class Creature : public MoveableEntity
bool IsAndroid() const;
bool IsHuman() const;
virtual void DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) {};
void AddHp(float hp);
RaceType_e GetRace() { return race_; }
float GetAttrAbs(int attr_id);

9
server/gameserver/human.cc
View File

@ -3653,15 +3653,6 @@ void Human::GMAddItem(int item_id, int item_num)
SyncAroundPlayers(__FILE__, __LINE__, __func__);
}
void Human::AddHp(float hp)
{
float old_health = GetHP();
ability.hp += hp;
ability.hp = std::min(GetHP(), GetMaxHP());
stats.heal_amount += GetHP() - old_health;
SyncAroundPlayers(__FILE__, __LINE__, __func__);
}
void Human::OnBulletHit(Bullet* bullet)
{
if (IsInvincible()) {

1
server/gameserver/human.h
View File

@ -253,7 +253,6 @@ class Human : public Creature
virtual std::string GetName() override { return name;};
void UpdateViewObjects();
void GMAddItem(int item_id, int item_num);
void AddHp(float hp);
protected:
void _InternalUpdateMove(float speed);