From 0d6e388f3b7e292399f9dd296bb634b22b082337 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 21 Oct 2023 18:51:29 +0800 Subject: [PATCH] 1 --- server/gameserver/base_agent.cc | 10 ++++++++++ server/gameserver/base_agent.h | 2 ++ server/gameserver/hero_agent.cc | 8 -------- server/gameserver/hero_agent.h | 1 - server/gameserver/room_agent.cc | 6 ------ server/gameserver/room_agent.h | 2 -- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/server/gameserver/base_agent.cc b/server/gameserver/base_agent.cc index ae1ab799..198f86c1 100644 --- a/server/gameserver/base_agent.cc +++ b/server/gameserver/base_agent.cc @@ -2,6 +2,8 @@ #include "base_agent.h" +#include + #include "room.h" BaseAgent::BaseAgent():behaviac::Agent() @@ -48,6 +50,14 @@ float BaseAgent::RandRangeAsFloat(float min_val, float max_val) return RandRange(min_val, max_val); } +void BaseAgent::Exec() +{ + behaviac::EBTStatus status = f8::BtMgr::Instance()->BtExec(this); + if (status == behaviac::BT_RUNNING) { + CheckCoroutineEvent(); + } +} + behaviac::EBTStatus BaseAgent::StartCoroutine(std::shared_ptr co) { coroutines_hash_[co->GetId()] = co; diff --git a/server/gameserver/base_agent.h b/server/gameserver/base_agent.h index 981766aa..69877de8 100644 --- a/server/gameserver/base_agent.h +++ b/server/gameserver/base_agent.h @@ -43,6 +43,8 @@ public: BEHAVIAC_DECLARE_AGENTTYPE(BaseAgent, behaviac::Agent) + void Exec(); + bool IsGameOver(); int GetTickCount(); int RandRange(int min_val, int max_val); diff --git a/server/gameserver/hero_agent.cc b/server/gameserver/hero_agent.cc index cd6ba9ad..9d5c6a64 100644 --- a/server/gameserver/hero_agent.cc +++ b/server/gameserver/hero_agent.cc @@ -47,14 +47,6 @@ HeroAgent::~HeroAgent() } } -void HeroAgent::Exec() -{ - behaviac::EBTStatus status = f8::BtMgr::Instance()->BtExec(this); - if (status == behaviac::BT_RUNNING) { - CheckCoroutineEvent(); - } -} - void HeroAgent::SetOwner(Creature* owner) { owner_ = owner; diff --git a/server/gameserver/hero_agent.h b/server/gameserver/hero_agent.h index 5485806b..1c10db9e 100644 --- a/server/gameserver/hero_agent.h +++ b/server/gameserver/hero_agent.h @@ -25,7 +25,6 @@ public: BEHAVIAC_DECLARE_AGENTTYPE(HeroAgent, BaseAgent) - void Exec(); void SetOwner(Creature* owner); int GetUniId(); diff --git a/server/gameserver/room_agent.cc b/server/gameserver/room_agent.cc index 1904a854..652f771e 100644 --- a/server/gameserver/room_agent.cc +++ b/server/gameserver/room_agent.cc @@ -15,11 +15,6 @@ RoomAgent::~RoomAgent() { } -void RoomAgent::Exec() -{ - behaviac::EBTStatus status = f8::BtMgr::Instance()->BtExec(this); -} - int RoomAgent::GetMapId() { return room_->GetMapMeta()->map_id(); @@ -55,7 +50,6 @@ int RoomAgent::GetAliveTeamNum() return room_->GetAliveTeamNum(); } - HeroAgent* RoomAgent::FindHero(int hero_uniid) { return nullptr; diff --git a/server/gameserver/room_agent.h b/server/gameserver/room_agent.h index 9850af76..1f025538 100644 --- a/server/gameserver/room_agent.h +++ b/server/gameserver/room_agent.h @@ -13,8 +13,6 @@ public: BEHAVIAC_DECLARE_AGENTTYPE(RoomAgent, BaseAgent) - void Exec(); - int GetMapId(); int GetHumanNum(); int GetAliveHumanNum();