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

1

Browse Source
This commit is contained in:
aozhiwei 2020-05-26 15:10:24 +08:00
parent c929b3c78f
commit 6b8b41ae2d
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/gameserver/room.cc
View File

@ -1836,12 +1836,6 @@ void Room::ShuaAndroidTimerFunc()
MetaMgr::Instance()->level1room_shua_robot_max_num MetaMgr::Instance()->level1room_shua_robot_max_num
); );
} }
if (shua_time <= 0) {
return;
}
if (shua_num <= 0) {
return;
}
shua_android_timer = xtimer.AddDeadLineTimerAndAttach shua_android_timer = xtimer.AddDeadLineTimerAndAttach
(SERVER_FRAME_RATE * shua_time, (SERVER_FRAME_RATE * shua_time,
a8::XParams() a8::XParams()
@ -1858,8 +1852,10 @@ void Room::ShuaAndroidTimerFunc()
room->shua_android_timer = nullptr; room->shua_android_timer = nullptr;
} }
); );
if (shua_time > 0 && shua_num > 0) {
ProcShuaAndroid(shua_time, shua_num); ProcShuaAndroid(shua_time, shua_num);
} }
}
} }
void Room::DieAndroidTimerFunc() void Room::DieAndroidTimerFunc()
@ -1883,12 +1879,6 @@ void Room::DieAndroidTimerFunc()
MetaMgr::Instance()->level1room_die_robot_max_num MetaMgr::Instance()->level1room_die_robot_max_num
); );
} }
if (die_time <= 0) {
return;
}
if (die_num <= 0) {
return;
}
die_android_timer = xtimer.AddDeadLineTimerAndAttach die_android_timer = xtimer.AddDeadLineTimerAndAttach
(SERVER_FRAME_RATE * die_time, (SERVER_FRAME_RATE * die_time,
a8::XParams() a8::XParams()
@ -1905,8 +1895,10 @@ void Room::DieAndroidTimerFunc()
room->die_android_timer = nullptr; room->die_android_timer = nullptr;
} }
); );
if (die_time > 0 && die_num > 0) {
ProcDieAndroid(die_time, die_num); ProcDieAndroid(die_time, die_num);
} }
}
} }
void Room::ProcShuaAndroid(int shua_time, int shua_num) void Room::ProcShuaAndroid(int shua_time, int shua_num)