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-25 11:08:19 +08:00
parent 0d3caaa61e
commit b384450fb1
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/human.cc
View File

@ -1119,6 +1119,9 @@ void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
if (target->entity_type != kET_Player) { if (target->entity_type != kET_Player) {
return; return;
} }
if (target->dead) {
return;
}
Human* hum = (Human*)target; Human* hum = (Human*)target;
auto itr = skill_meta_->trigger_type_buffs.find(trigger_type); auto itr = skill_meta_->trigger_type_buffs.find(trigger_type);
if (itr != skill_meta_->trigger_type_buffs.end()) { if (itr != skill_meta_->trigger_type_buffs.end()) {
@ -1597,7 +1600,7 @@ void Human::_UpdateMove(int speed)
void Human::_UpdateAssaultMove() void Human::_UpdateAssaultMove()
{ {
Buff* buff = GetBuffByEffectId(kBET_Assault); Buff* buff = GetBuffByEffectId(kBET_Assault);
if (!buff || (room->frameno - buff->add_frameno) * kFRAME_RATE_MS < buff->meta->param1) { if (!buff) {
return; return;
} }
bool move_end = false; bool move_end = false;
@ -1755,6 +1758,8 @@ void Human::Revive()
{ {
dead = false; dead = false;
ability.hp = GetMaxHP(); ability.hp = GetMaxHP();
status = 0;
ClearBuffList();
{ {
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(1003); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(1003);
if (buff_meta) { if (buff_meta) {

1
server/tools/protobuild/cs_proto.proto
View File

@ -179,6 +179,7 @@ message MFPlayerFull
optional int32 max_energy_shield = 22; //最大能量护盾 optional int32 max_energy_shield = 22; //最大能量护盾
repeated MFBuff buff_list = 24; //buff列表 repeated MFBuff buff_list = 24; //buff列表
optional MFSkin tankskin = 25; //坦克皮肤 optional MFSkin tankskin = 25; //坦克皮肤
optional float shot_range = 26; //射程加成(添加到子弹)
} }
//阻挡物-部分 //阻挡物-部分