From 38c447505f5a03ef3d0b6325cae087531fdb9711 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 6 Dec 2022 15:13:31 +0800 Subject: [PATCH] 1 --- server/gameserver/android.cc | 9 ++++++++- server/gameserver/room.cc | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/gameserver/android.cc b/server/gameserver/android.cc index b8bf2311..54c7db86 100644 --- a/server/gameserver/android.cc +++ b/server/gameserver/android.cc @@ -18,6 +18,8 @@ Android::Android():Human() abort(); } agent_->SetOwner(this); + f8::BtMgr::Instance()->BtLoad(agent_, "android_pvp"); + f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp"); } Android::~Android() @@ -86,7 +88,12 @@ void Android::InternalUpdate(int delta_time) room->grid_service->MoveCreature(this); return; } - f8::BtMgr::Instance()->BtExec(agent_); + behaviac::EBTStatus status = f8::BtMgr::Instance()->BtExec(agent_); +#if 0 + if (status != behaviac::BT_RUNNING) { + abort(); + } +#endif } void Android::GiveEquip() diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index b05f9932..2b05254e 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -2512,6 +2512,7 @@ ObstacleData* Room::GetPermanentObstacleData(int obstacle_uniid) long long Room::GetGasInactiveTime() { #ifdef DEBUG + return 1024; return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ? App::Instance()->debug_params[1] : 10; #endif @@ -3700,6 +3701,7 @@ int Room::GetOnlinePlayerNum() size_t Room::GetRoomMaxPlayerNum() { #ifdef MAP3D + return 2; return map_meta_->i->player(); //return 2; #else