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 2024-08-24 07:10:49 +08:00
parent d5c9c4f65e
commit 7d716e26ab
7 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/CMakeLists.txt
View File

@ -31,9 +31,9 @@ include_directories(
/usr/include/glm
../../third_party
../../third_party/behaviac/inc
../../third_party/recastnavigation/Recast/Include
../../third_party/recastnavigation/Detour/Include
../../third_party/recastnavigation/DetourTileCache/Include
../../third_party/recastnavigation_v1.6.0/Recast/Include
../../third_party/recastnavigation_v1.6.0/Detour/Include
../../third_party/recastnavigation_v1.6.0/DetourTileCache/Include
behaviac_generated/types
behaviac_generated/types/internal
.
@ -53,15 +53,15 @@ aux_source_directory(../../third_party/f8/f8
SRC_LIST
)
aux_source_directory(../../third_party/recastnavigation/Recast/Source
aux_source_directory(../../third_party/recastnavigation_v1.6.0/Recast/Source
SRC_LIST
)
aux_source_directory(../../third_party/recastnavigation/Detour/Source
aux_source_directory(../../third_party/recastnavigation_v1.6.0/Detour/Source
SRC_LIST
)
aux_source_directory(../../third_party/recastnavigation/DetourTileCache/Source
aux_source_directory(../../third_party/recastnavigation_v1.6.0/DetourTileCache/Source
SRC_LIST
)

3
server/gameserver/buff/callfunc.cc
View File

@ -998,6 +998,9 @@ void CallFuncBuff::ClearSummonHero()
{
int hero_id = meta->_int_buff_param2;
float hero_num = meta->GetBuffParam3(this);
if (hero_id == 9011) {
a8::XPrintf("ClearSummonHero 9011\n", {});
}
owner->RemoveSurplusHero(hero_id, hero_num);
}

9
server/gameserver/hero.cc
View File

@ -32,6 +32,10 @@
#include "mt/Map.h"
#include "mt/MobaRoom.h"
#define BOOST_STACKTRACE_USE_ADDR2LINE
#include <boost/stacktrace.hpp>
#include <iostream>
Hero::Hero():Creature()
{
++PerfMonitor::Instance()->entity_num[ET_Hero];
@ -44,6 +48,11 @@ Hero::Hero():Creature()
Hero::~Hero()
{
if (GetHeroMeta()->id() == 9011) {
a8::XPrintf("DestoryHero 9011\n", {});
std::cout << boost::stacktrace::stacktrace();
int i = 0;
}
SetDestorying();
DetachFromMaster();
if (agent_) {

8
server/gameserver/mapinstance.cc
View File

@ -481,7 +481,11 @@ bool MapInstance::Raycast(const glm::vec3& start, const glm::vec3& end,
float t = 0;
int npolys;
memset(hit_normal_, 0, sizeof(hit_normal_));
#if 1
status = navmesh_query_->newRaycast(666, startRef, spos, epos, &filter, &t, hit_normal_, polys_, &npolys, MAX_POLYS);
#else
status = navmesh_query_->raycast(startRef, spos, epos, &filter, &t, hit_normal_, polys_, &npolys, MAX_POLYS);
#endif
if (!dtStatusSucceed(status)) {
#ifdef MYDEBUG
abort();
@ -773,7 +777,11 @@ bool MapInstance::RaycastEx(const glm::vec3& start, const glm::vec3& end,
float t = 0;
int npolys;
memset(hit_normal_, 0, sizeof(hit_normal_));
#if 1
status = navmesh_query_->newRaycast(666, startRef, spos, epos, &filter, &t, hit_normal_, polys_, &npolys, MAX_POLYS);
#else
status = navmesh_query_->raycast(startRef, spos, epos, &filter, &t, hit_normal_, polys_, &npolys, MAX_POLYS);
#endif
if (!dtStatusSucceed(status)) {
#ifdef MYDEBUG
abort();

11
server/gameserver/movement.cc
View File

@ -124,6 +124,17 @@ void Movement::CalcTargetPos(float distance)
glm::vec3 hit_point;
owner_->room->map_instance->Scale(start);
owner_->room->map_instance->Scale(end);
#if 0
if (owner_->IsPlayer()) {
start.x = 302.209595;
start.y = 6.18993711;
start.z = 49.6232567;
end.x = 308.426758;
end.y = 6.18993711;
end.z = 44.5886955;
}
#endif
bool ret = owner_->room->map_instance->RaycastEx(start, end, hit_point, hit_result,
point.same_polys_flags, point.spec_polys, exclude_flags);
if (ret) {

4
server/gameserver/room.cc
View File

@ -897,6 +897,10 @@ Hero* Room::CreateHero(Creature* master,
int team_id,
int obj_uniid)
{
if (meta->id() == 9011) {
a8::XPrintf("CreateHero 9011\n", {});
int i = 0;
}
if (obj_uniid > 0) {
if (GetEntityByUniId(obj_uniid)) {
abort();

2
server/robotserver/playermgr.cc
View File

@ -32,7 +32,7 @@ void PlayerMgr::Init()
account_id_hash_[hum->GetAccountId()] = hum;
socket_id_hash_[hum->GetSocketId()] = hum;
++count;
if (count >= 3) {
if (count >= 300) {
f8::Timer::Instance()->DeleteCurrentTimer();
}
}