1
This commit is contained in:
parent
42e3011811
commit
2f6d753f2f
@ -331,9 +331,6 @@ void Room::AddPlayer(Player* hum, std::shared_ptr<BornPoint> init_born_point, bo
|
||||
if (!no_matchteam) {
|
||||
MatchTeam(hum);
|
||||
}
|
||||
#ifdef MYDEBUG
|
||||
hum->side = a8::RandEx(1, 2);
|
||||
#endif
|
||||
hum->PushJoinRoomMsg();
|
||||
++alive_count_;
|
||||
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 (IsMobaModeRoom()) {
|
||||
hum->side = a8::RandEx(1, 2);
|
||||
CreateAndroid(7);
|
||||
std::vector<Human*> humans;
|
||||
for (auto& pair : human_hash_) {
|
||||
@ -2409,7 +2407,7 @@ long long Room::GetGasInactiveTime()
|
||||
}
|
||||
#endif
|
||||
if (IsMobaModeRoom()) {
|
||||
inactive_time = 12;
|
||||
inactive_time = 7;
|
||||
}
|
||||
inactive_time = std::max((long long)0, inactive_time - acc_inactive_time_);
|
||||
if (IsNewerMap()) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user