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 2022-12-06 15:13:31 +08:00
parent 906c0a1127
commit 38c447505f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/gameserver/android.cc
View File

@ -18,6 +18,8 @@ Android::Android():Human()
abort(); abort();
} }
agent_->SetOwner(this); agent_->SetOwner(this);
f8::BtMgr::Instance()->BtLoad(agent_, "android_pvp");
f8::BtMgr::Instance()->BtSetCurrent(agent_, "android_pvp");
} }
Android::~Android() Android::~Android()
@ -86,7 +88,12 @@ void Android::InternalUpdate(int delta_time)
room->grid_service->MoveCreature(this); room->grid_service->MoveCreature(this);
return; 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() void Android::GiveEquip()

2
server/gameserver/room.cc
View File

@ -2512,6 +2512,7 @@ ObstacleData* Room::GetPermanentObstacleData(int obstacle_uniid)
long long Room::GetGasInactiveTime() long long Room::GetGasInactiveTime()
{ {
#ifdef DEBUG #ifdef DEBUG
return 1024;
return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ? return App::Instance()->debug_params.find(1) != App::Instance()->debug_params.end() ?
App::Instance()->debug_params[1] : 10; App::Instance()->debug_params[1] : 10;
#endif #endif
@ -3700,6 +3701,7 @@ int Room::GetOnlinePlayerNum()
size_t Room::GetRoomMaxPlayerNum() size_t Room::GetRoomMaxPlayerNum()
{ {
#ifdef MAP3D #ifdef MAP3D
return 2;
return map_meta_->i->player(); return map_meta_->i->player();
//return 2; //return 2;
#else #else