From bede2fe6829a69d5953966cee6bdd8977c3aff69 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 20 Nov 2018 19:15:40 +0800
Subject: [PATCH] Fix Bg/Fg Bug & Add opacity

---
 _server/editor.js | 14 ++++++++++++++
 libs/maps.js      |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/_server/editor.js b/_server/editor.js
index 63ca9f47..ae74991b 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -1079,19 +1079,33 @@ editor.prototype.listen = function () {
         editor.brushMod=brushMod3.value;
     }
 
+    var bgc = document.getElementById('bg'), fgc = document.getElementById('fg'),
+        evc = document.getElementById('event'), ev2c = document.getElementById('event2');
+
     var layerMod=document.getElementById('layerMod');
     layerMod.onchange=function(){
         editor.layerMod=layerMod.value;
+        [bgc,fgc,evc,ev2c].forEach(function (x) {
+            x.style.opacity = 1;
+        });
     }
 
     var layerMod2=document.getElementById('layerMod2');
     if(layerMod2)layerMod2.onchange=function(){
         editor.layerMod=layerMod2.value;
+        [fgc,evc,ev2c].forEach(function (x) {
+            x.style.opacity = 0.3;
+        });
+        bgc.style.opacity = 1;
     }
 
     var layerMod3=document.getElementById('layerMod3');
     if(layerMod3)layerMod3.onchange=function(){
         editor.layerMod=layerMod3.value;
+        [bgc,evc,ev2c].forEach(function (x) {
+            x.style.opacity = 0.3;
+        });
+        fgc.style.opacity = 1;
     }
 
     var viewportButtons=document.getElementById('viewportButtons');
diff --git a/libs/maps.js b/libs/maps.js
index 5a4e2382..071f9dad 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -386,7 +386,7 @@ maps.prototype.getBgFgMapArray = function (floorId, name) {
     var width = core.floors[floorId].width || 13;
     var height = core.floors[floorId].height || 13;
 
-    if (core.isset(core.status[name+"maps"][floorId]))
+    if (main.mode!='editor' && core.isset(core.status[name+"maps"][floorId]))
         return core.status[name+"maps"][floorId];
 
     var arr = core.clone(core.floors[floorId][name+"map"] || []);