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

1

Browse Source
This commit is contained in:
aozhiwei 2023-11-14 13:40:41 +08:00
parent eeba9e17df
commit 6971503e32
5 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/gameserver/hero_agent.cc
View File

@ -1298,12 +1298,25 @@ behaviac::EBTStatus HeroAgent::Pickup()
if (owner_->dead) {
return behaviac::BT_FAILURE;
}
if (owner_->HasBuffEffect(kBET_Vertigo)) {
return behaviac::BT_FAILURE;
}
if (!PickupObjIsValid()) {
return behaviac::BT_FAILURE;
}
if (!owner_->IsHuman()) {
return behaviac::BT_RUNNING;
}
if ((GetRoom()->GetFrameNo() - context->frameno) * FRAME_RATE_MS < pickup_time) {
return behaviac::BT_RUNNING;
}
if (curr_pickup_obj_.Get()->IsLoot()) {
Loot* loot = curr_pickup_obj_.Get()->AsLoot();
owner_->AsHuman()->LootInteraction(loot);
} else if (curr_pickup_obj_.Get()->IsRoomObstacle()) {
RoomObstacle* ob = curr_pickup_obj_.Get()->AsRoomObstacle();
owner_->AsHuman()->ObstacleInteraction(ob);
}
return behaviac::BT_SUCCESS;
};
return StartCoroutine(co);

5
server/gameserver/human.cc
View File

@ -2920,6 +2920,11 @@ void Human::LootInteraction(Loot* entity)
}
}
void Human::ObstacleInteraction(Obstacle* entity)
{
entity->DoInteraction(this);
}
void Human::ProcAddItemDto(AddItemDTO& dto)
{
if (!dto.item_meta) {

3
server/gameserver/human.h
View File

@ -266,6 +266,8 @@ class Human : public Creature
void ShiledBreak();
std::shared_ptr<Guide> GetGuide() { return guide_; };
void SendNewBieEnd();
void LootInteraction(Loot* entity);
void ObstacleInteraction(Obstacle* entity);
protected:
void ProcLootWeapon(AddItemDTO& dto);
@ -285,7 +287,6 @@ protected:
void ProcLoveItem(AddItemDTO& dto);
void CancelRevive();
Weapon* TakeonWeapon(const mt::Equip* equip_meta);
void LootInteraction(Loot* entity);
void ProcAddItemDto(AddItemDTO& dto);
void DropWeapon(int weapon_idx, int num);

5
server/gameserver/player.cc
View File

@ -819,11 +819,6 @@ void Player::ProcInteraction()
}
}
void Player::ObstacleInteraction(Obstacle* entity)
{
entity->DoInteraction(this);
}
void Player::HumanInteraction(Human* hum)
{
if (downed) {

1
server/gameserver/player.h
View File

@ -116,7 +116,6 @@ class Player : public Human
void UpdateThrowBomb();
void Shot();
void ProcInteraction();
void ObstacleInteraction(Obstacle* entity);
void HumanInteraction(Human* hum);
void ProcPreSettlementInfo(const std::string& pre_settlement_info);
void ProcSkillList();