This commit is contained in:
aozhiwei 2020-05-27 19:42:48 +08:00
parent 098b413ec5
commit 3788f03363

View File

@ -1681,9 +1681,10 @@ void Room::SecondRandPoint()
void Room::NotifyGameStart() void Room::NotifyGameStart()
{ {
if (room_type == RT_NewBrid) { if (room_type == RT_NewBrid || room_type == RT_MidBrid) {
for (auto& pair : human_hash_) { for (auto& pair : human_hash_) {
if (pair.second->entity_subtype == EST_Android && if (pair.second->IsAndroid() &&
pair.second->team_uuid.empty() &&
!a8::HasBitFlag(pair.second->status, HS_Disable)) { !a8::HasBitFlag(pair.second->status, HS_Disable)) {
DisableHuman(pair.second); DisableHuman(pair.second);
} }
@ -1731,7 +1732,9 @@ void Room::NotifyGameStart()
&xtimer_attacher_.timer_list_); &xtimer_attacher_.timer_list_);
} }
if (room_type == RT_MidBrid) { if (room_type == RT_MidBrid) {
#if 0
ShuaAndroidTimerFunc(); ShuaAndroidTimerFunc();
#endif
DieAndroidTimerFunc(); DieAndroidTimerFunc();
} }
} }