diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index 540d2de..8915b8e 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -29,6 +29,7 @@ void Android::Initialize() tank_meta_ = MetaMgr::Instance()->GetTank(TankId()); if (tank_meta_) { skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id()); + skill_lv_ = TankLv(); } GiveEquip(); MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId()); diff --git a/server/gameserver/buff.h b/server/gameserver/buff.h index 5516905..f8a0581 100644 --- a/server/gameserver/buff.h +++ b/server/gameserver/buff.h @@ -24,6 +24,7 @@ class Buff MetaData::Skill* skill_meta = nullptr; a8::XTimerAttacher xtimer_attacher; long long add_frameno = 0; + int skill_lv = 0; int GetLeftTime(); int GetLastingTime(); diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 50f381a..a99bb36 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -67,7 +67,7 @@ void Bullet::OnHit(std::set& objects) master->stats.damage_amount_out += finaly_dmg; hum->OnHit(); if (!hum->HasBuffEffect(BET_Invincible)) { - hum->OnSkillHit(skill_meta); + // hum->OnSkillHit(skill_meta); hum->DecHP(finaly_dmg, master->entity_uniid, master->name, meta->i->id()); } } diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index cbaed0e..8a8b3a4 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -1267,15 +1267,6 @@ void Human::OnHit() GrassTempShow(); } -void Human::OnSkillHit(MetaData::Skill* skill_meta) -{ - if (skill_meta) { - std::set target_list; - target_list.insert(this); - TriggerBuff(skill_meta, target_list, BTT_SkillHit); - } -} - void Human::OnEnterGrass() { if (a8::HasBitFlag(status, HS_InGrass)) { diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 87048a4..24b0fdf 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -186,7 +186,6 @@ class Human : public Entity void ProcBuffEffect(Buff* buff); void OnAttack(); void OnHit(); - void OnSkillHit(MetaData::Skill* skill_meta); void OnEnterGrass(); void OnLeaveGrass(); void CheckGrass(); @@ -233,6 +232,7 @@ protected: std::set observers_; Human* follow_target_ = nullptr; bool follow_synced_active_player_ = false; + int skill_lv_ = 0; MetaData::Player* meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr; diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 1e0d3eb..761d4fa 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -33,6 +33,7 @@ void Player::Initialize() tank_meta_ = MetaMgr::Instance()->GetTank(TankId()); if (tank_meta_) { skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id()); + skill_lv_ = TankLv(); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta_->i->bullet_id()); if (weapon_meta) { weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;