This commit is contained in:
voderl 2020-04-30 13:29:53 +08:00
parent eefd3ff9a4
commit 2fdefd28ca

View File

@ -374,23 +374,17 @@ enemys.prototype._getCurrentEnemys_sort = function (enemys) {
enemys.prototype.hasEnemyLeft = function (enemyId, floorId) { enemys.prototype.hasEnemyLeft = function (enemyId, floorId) {
if (floorId == null) floorId = core.status.floorId; if (floorId == null) floorId = core.status.floorId;
if (!(floorId instanceof Array)) floorId = [floorId]; if (!(floorId instanceof Array)) floorId = [floorId];
if (!(enemyId instanceof Array)) enemyId = [enemyId]; var enemyMap = {};
var list; if (enemyId instanceof Array) enemyId.forEach(function(v) { enemyMap[v] = true;});
else if (enemyId) enemyMap[enemyId] = true;
else enemyMap = null;
for (var i = 0; i < floorId.length; i++) { for (var i = 0; i < floorId.length; i++) {
list = {};
var mapBlocks = core.status.maps[floorId[i]].blocks; var mapBlocks = core.status.maps[floorId[i]].blocks;
for (var b = 0; b < mapBlocks.length; b++) { for (var b = 0; b < mapBlocks.length; b++) {
if (!mapBlocks[b].disable && mapBlocks[b].event.cls.indexOf('enemy') == 0) { if (!mapBlocks[b].disable && mapBlocks[b].event.cls.indexOf('enemy') === 0) {
list[mapBlocks[b].event.id] = true; if (enemyMap === null || enemyMap[mapBlocks[b].event.id]) return true;
} }
} }
for (var b = 0; b < enemyId.length; b++) {
if (enemyId[b] == null) {
if (Object.keys(list).length > 0) return true;
else return false;
}
if (list[enemyId[b]]) return true;
}
} }
return false; return false;
} }