diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index 61843d80..60ae43f7 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -298,6 +298,11 @@ bool Obstacle::DoInteraction(Human* sender) DoHideHouseInteraction(sender); } break; + case kObstacleTreasureBox: + { + DoTreasureBoxInteraction(sender); + } + break; default: { if (!IsDead(sender->room) && IsOpenInteraction()) { @@ -486,3 +491,8 @@ void Obstacle::SetRotate(float rotate) { rotate_ = rotate; } + +void Obstacle::DoTreasureBoxInteraction(Human* sender) +{ + +} diff --git a/server/gameserver/obstacle.h b/server/gameserver/obstacle.h index 41b6aeb4..fcbea910 100644 --- a/server/gameserver/obstacle.h +++ b/server/gameserver/obstacle.h @@ -50,6 +50,7 @@ class Obstacle : public Entity protected: Obstacle(); void DoHideHouseInteraction(Human* sender); + void DoTreasureBoxInteraction(Human* sender); std::tuple* GetInteractionData(Human* sender); void AddObstacleBuff(Creature* c); void ClearObstacleBuff(Creature* c); diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index 151702c1..340c90e8 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -704,6 +704,7 @@ void Human::FillMFObjectLess(Room* room, Human* hum, cs::MFPlayerFull* full_data p->set_hero_level(GetHeroLevel()); p->set_hero_exp(GetHeroExp()); p->set_hero_max_exp(GetHeroMaxExp()); + p->set_box_num(box_num); GetCurrWeapon()->ToPB(this, p->mutable_weapon()); PBUtils::Ability_FillMFAttrAdditionList(GetAbility().get(), this, p); if (GetCar()) { @@ -749,6 +750,7 @@ void Human::FillMFObjectFull(Room* room, Human* hum, cs::MFObjectFull* full_data p->set_max_energy_shield(max_energy_shield); p->set_armor_shield(armor_shield); p->set_max_armor_shield(max_armor_shield); + p->set_box_num(box_num); if (guild_id != 0) { p->set_guild_id(guild_id); }