From 666d53638889534a7681993d8115106f7b23e301 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Sat, 25 Sep 2021 09:44:52 +0800
Subject: [PATCH] Fix 282

---
 libs/events.js | 2 +-
 libs/maps.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/events.js b/libs/events.js
index ccac7a3b..c4e9f7b2 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -3002,7 +3002,7 @@ events.prototype.setEnemyOnPoint = function (x, y, floorId, name, value, operato
     var enemy = core.material.enemys[block.event.id];
     if (enemy == null) return;
     if (typeof value === 'string' && name == 'name') value = value.replaceAll(/\r/g, '\\r');
-    value = this._updateValueByOperator(core.calValue(value, prefix), enemy[name], operator);
+    value = this._updateValueByOperator(core.calValue(value, prefix), core.getEnemyValue(enemy, name, x, y, floorId), operator);
     flags.enemyOnPoint = flags.enemyOnPoint || {};
     flags.enemyOnPoint[floorId] = flags.enemyOnPoint[floorId] || {}; 
     flags.enemyOnPoint[floorId][x+","+y] = flags.enemyOnPoint[floorId][x+","+y] || {};
diff --git a/libs/maps.js b/libs/maps.js
index 11e74997..3ec3c198 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -51,11 +51,11 @@ maps.prototype._setHDCanvasSize = function (ctx, width, height) {
 ////// 加载某个楼层（从剧本或存档中） //////
 maps.prototype.loadFloor = function (floorId, map) {
     var floor = core.floors[floorId];
-    if (!map) map = floor.map;
+    if (!map) map = core.cloneArray(floor.map);
     if (map instanceof Array) {
         map = {"map": map};
     }
-    if (!map.map) map.map = core.clone(floor.map);
+    if (!map.map) map.map = core.cloneArray(floor.map);
     var content = {};
     var notCopy = this._loadFloor_doNotCopy();
     for (var name in floor) {