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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-20 15:15:12 +08:00
parent 8e66fe2b1d
commit 70b296e21f
6 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/android.cc
View File

@ -29,6 +29,7 @@ void Android::Initialize()
tank_meta_ = MetaMgr::Instance()->GetTank(TankId()); tank_meta_ = MetaMgr::Instance()->GetTank(TankId());
if (tank_meta_) { if (tank_meta_) {
skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id()); skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id());
skill_lv_ = TankLv();
} }
GiveEquip(); GiveEquip();
MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId()); MetaData::TankSkin* tank_tank_meta = MetaMgr::Instance()->GetTankSkin(TankId());

1
server/gameserver/buff.h
View File

@ -24,6 +24,7 @@ class Buff
MetaData::Skill* skill_meta = nullptr; MetaData::Skill* skill_meta = nullptr;
a8::XTimerAttacher xtimer_attacher; a8::XTimerAttacher xtimer_attacher;
long long add_frameno = 0; long long add_frameno = 0;
int skill_lv = 0;
int GetLeftTime(); int GetLeftTime();
int GetLastingTime(); int GetLastingTime();

2
server/gameserver/bullet.cc
View File

@ -67,7 +67,7 @@ void Bullet::OnHit(std::set<Entity*>& objects)
master->stats.damage_amount_out += finaly_dmg; master->stats.damage_amount_out += finaly_dmg;
hum->OnHit(); hum->OnHit();
if (!hum->HasBuffEffect(BET_Invincible)) { 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()); hum->DecHP(finaly_dmg, master->entity_uniid, master->name, meta->i->id());
} }
} }

9
server/gameserver/human.cc
View File

@ -1267,15 +1267,6 @@ void Human::OnHit()
GrassTempShow(); GrassTempShow();
} }
void Human::OnSkillHit(MetaData::Skill* skill_meta)
{
if (skill_meta) {
std::set<Entity*> target_list;
target_list.insert(this);
TriggerBuff(skill_meta, target_list, BTT_SkillHit);
}
}
void Human::OnEnterGrass() void Human::OnEnterGrass()
{ {
if (a8::HasBitFlag(status, HS_InGrass)) { if (a8::HasBitFlag(status, HS_InGrass)) {

2
server/gameserver/human.h
View File

@ -186,7 +186,6 @@ class Human : public Entity
void ProcBuffEffect(Buff* buff); void ProcBuffEffect(Buff* buff);
void OnAttack(); void OnAttack();
void OnHit(); void OnHit();
void OnSkillHit(MetaData::Skill* skill_meta);
void OnEnterGrass(); void OnEnterGrass();
void OnLeaveGrass(); void OnLeaveGrass();
void CheckGrass(); void CheckGrass();
@ -233,6 +232,7 @@ protected:
std::set<Human*> observers_; std::set<Human*> observers_;
Human* follow_target_ = nullptr; Human* follow_target_ = nullptr;
bool follow_synced_active_player_ = false; bool follow_synced_active_player_ = false;
int skill_lv_ = 0;
MetaData::Player* meta_ = nullptr; MetaData::Player* meta_ = nullptr;
MetaData::Skill* skill_meta_ = nullptr; MetaData::Skill* skill_meta_ = nullptr;

1
server/gameserver/player.cc
View File

@ -33,6 +33,7 @@ void Player::Initialize()
tank_meta_ = MetaMgr::Instance()->GetTank(TankId()); tank_meta_ = MetaMgr::Instance()->GetTank(TankId());
if (tank_meta_) { if (tank_meta_) {
skill_meta_ = MetaMgr::Instance()->GetSkill(tank_meta_->i->skill_id()); 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()); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(tank_meta_->i->bullet_id());
if (weapon_meta) { if (weapon_meta) {
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1; weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;