This commit is contained in:
voderl 2020-03-20 17:58:00 +08:00
parent 6b92ae192b
commit f4c5669094

View File

@ -372,15 +372,21 @@ 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; floorId = floorId || core.status.floorId;
if (floorId instanceof Array) { if (!(floorId instanceof Array)) floorId = [floorId];
for (var i = 0; i < floorId.length; ++i) { if (!(enemyId instanceof Array)) enemyId = [enemyId];
if (core.hasEnemyLeft(enemyId, floorId[i])) var list;
return true; for (var i = 0; i < floorId.length; ++i) {
list = {};
var mapBlocks = core.status.maps[floorId[i]].blocks;
for (var b = 0; b < mapBlocks.length; b++) {
if (!mapBlocks[b].disable && mapBlocks[b].event.cls.indexOf('enemy') == 0) {
list[mapBlocks[b].event.id] = true;
}
}
for (var b = 0; b < enemyId.length; b++) {
if (list[enemyId[b]] === true) return true;
} }
return false;
} }
return core.getCurrentEnemys(floorId).filter(function (enemy) { return false;
return enemyId == null || enemy.id == enemyId;
}).length > 0;
} }