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

2

Browse Source
This commit is contained in:
aozhiwei 2020-12-23 13:16:55 +08:00
parent ff5438b568
commit 583fc94230
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/human.cc
View File

@ -564,6 +564,9 @@ bool Human::IsCollisionInMapService()
if (room->OverBorder(GetPos(), meta->i->radius())){ if (room->OverBorder(GetPos(), meta->i->radius())){
return true; return true;
} }
if (HasBuffEffect(kBET_ThroughWall)) {
return false;
}
std::set<ColliderComponent*> colliders; std::set<ColliderComponent*> colliders;
room->map_service->GetColliders(room, GetX(), GetY(), colliders); room->map_service->GetColliders(room, GetX(), GetY(), colliders);

2
server/gameserver/metadata.cc
View File

@ -40,7 +40,7 @@ namespace MetaData
} }
{ {
std::vector<std::string> strings; std::vector<std::string> strings;
a8::Split(i->game_start_buff_list(), strings, '|'); a8::Split(i->game_start_buff_list(), strings, ':');
for (auto& str : strings) { for (auto& str : strings) {
buff_list.push_back(a8::XValue(str).GetInt()); buff_list.push_back(a8::XValue(str).GetInt());
} }

4
server/gameserver/room.h
View File

@ -62,7 +62,11 @@ public:
int GetRoomIdx() { return room_idx_; } int GetRoomIdx() { return room_idx_; }
std::string GetMapTplName() { return map_tpl_name_; } std::string GetMapTplName() { return map_tpl_name_; }
const MetaData::Map* GetMapMeta() { return map_meta_; } const MetaData::Map* GetMapMeta() { return map_meta_; }
#if 1
bool IsWaitingStart() { return false; }
#else
bool IsWaitingStart() { return waiting_start_; } bool IsWaitingStart() { return waiting_start_; }
#endif
int GetPlayerNum(); int GetPlayerNum();
int AliveCount(); int AliveCount();

3
server/gameserver/roommgr.cc
View File

@ -138,6 +138,9 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
#endif #endif
int game_times = 0; int game_times = 0;
RoomType_e self_room_type = GetHumanRoomType(msg, game_times); RoomType_e self_room_type = GetHumanRoomType(msg, game_times);
if (self_room_type < RT_OldBrid1) {
self_room_type = RT_OldBrid1;
}
time_t register_time = f8::ExtractRegisterTimeFromSessionId(msg.session_id()); time_t register_time = f8::ExtractRegisterTimeFromSessionId(msg.session_id());
int proto_version = msg.proto_version(); int proto_version = msg.proto_version();
int channel = f8::ExtractChannelIdFromAccountId(msg.account_id()); int channel = f8::ExtractChannelIdFromAccountId(msg.account_id());