This commit is contained in:
aozhiwei 2021-04-12 16:52:52 +08:00
parent ef7b5d5417
commit b007732bea
2 changed files with 9 additions and 2 deletions

View File

@ -169,6 +169,7 @@ enum BuffEffectType_e
kBET_InWater = 57, //在水里 kBET_InWater = 57, //在水里
kBET_InIce = 58, //在冰里 kBET_InIce = 58, //在冰里
kBET_BatchAddBuff = 60, //批量添加buff kBET_BatchAddBuff = 60, //批量添加buff
kBET_BeRecycle = 61, //待回收
kBET_End kBET_End
}; };
@ -467,5 +468,5 @@ const int kRecoilBuffId = 7005;
const int kInGrassBuffId = 7006; const int kInGrassBuffId = 7006;
const int kInWaterBuffId = 7007; const int kInWaterBuffId = 7007;
const int kInIceBuffId = 7008; const int kInIceBuffId = 7008;
const int kBeRecycleBuffId = 7009;
const float DEFAULT_FLY_DISTANCE = 5.0f; const float DEFAULT_FLY_DISTANCE = 5.0f;

View File

@ -1054,6 +1054,9 @@ void Human::DoJump()
MustBeAddBuff(this, JUMP_BUFFID); MustBeAddBuff(this, JUMP_BUFFID);
jump_frameno_ = room->GetFrameNo(); jump_frameno_ = room->GetFrameNo();
SyncAroundPlayers(__FILE__, __LINE__, __func__); SyncAroundPlayers(__FILE__, __LINE__, __func__);
if (IsAndroid() && team_uuid.empty()) {
MustBeAddBuff(this, kBeRecycleBuffId);
}
} }
} }
@ -2631,7 +2634,9 @@ Skin* Human::GetSkinByIdx(int idx)
void Human::AddBuffPostProc(Creature* caster, Buff* buff) void Human::AddBuffPostProc(Creature* caster, Buff* buff)
{ {
room->frame_event.AddBuff(this, buff); if (!buff->meta->i->only_server()) {
room->frame_event.AddBuff(this, buff);
}
} }
int Human::GetItemNum(int item_id) int Human::GetItemNum(int item_id)
@ -3389,3 +3394,4 @@ void Human::GetHitAabbBox(AabbCollider& aabb_box)
aabb_box._max.y = GetHitRadius(); aabb_box._max.y = GetHitRadius();
} }
} }