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 2023-12-29 16:32:32 +08:00
commit b1d2275ad9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/gameserver/room.cc
View File

@ -331,9 +331,6 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
if (!no_matchteam) { if (!no_matchteam) {
MatchTeam(hum); MatchTeam(hum);
} }
#ifdef MYDEBUG
hum->side = a8::RandEx(1, 2);
#endif
hum->PushJoinRoomMsg(); hum->PushJoinRoomMsg();
++alive_count_; ++alive_count_;
alive_count_chged_frameno_ = GetFrameNo(); alive_count_chged_frameno_ = GetFrameNo();
@ -354,6 +351,7 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
} }
#if 1 #if 1
if (IsMobaModeRoom()) { if (IsMobaModeRoom()) {
hum->side = a8::RandEx(1, 2);
CreateAndroid(7); CreateAndroid(7);
std::vector<Human*> humans; std::vector<Human*> humans;
for (auto& pair : human_hash_) { for (auto& pair : human_hash_) {
@ -2418,6 +2416,9 @@ long long Room::GetGasInactiveTime()
inactive_time = 12; inactive_time = 12;
} }
#endif #endif
if (IsMobaModeRoom()) {
inactive_time = 7;
}
inactive_time = std::max((long long)0, inactive_time - acc_inactive_time_); inactive_time = std::max((long long)0, inactive_time - acc_inactive_time_);
if (IsNewerMap()) { if (IsNewerMap()) {
inactive_time = 10; inactive_time = 10;

2
server/gameserver/roommgr.cc
View File

@ -834,7 +834,7 @@ void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
{ {
msg->set_force_enter_newbie_room(false); msg->set_force_enter_newbie_room(false);
msg->set_pve_instance_id(0); msg->set_pve_instance_id(0);
#ifdef MYDEBUG #if 1
const mt::Map* map_meta = mt::Map::GetById(msg->mapid()); const mt::Map* map_meta = mt::Map::GetById(msg->mapid());
if (map_meta && map_meta->is_moba()) { if (map_meta && map_meta->is_moba()) {
msg->set_room_mode(kMobaMode); msg->set_room_mode(kMobaMode);