From c029388e30b2b060afeecf448601bbb3399f459e Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Sat, 1 Dec 2018 19:38:20 +0800
Subject: [PATCH] Fix setFg Bug

---
 libs/control.js      | 7 +++----
 libs/events.js       | 7 ++-----
 project/functions.js | 2 --
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/libs/control.js b/libs/control.js
index 1f040ec4..c1f03d4b 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1467,10 +1467,8 @@ control.prototype.setFg = function(color, time, callback) {
 
     if (!core.isset(color))
         color = [0,0,0,0];
-    if (color.length==3)
-        color.push(1);
-    if (color[3]<0) color[3]=0;
-    if (color[3]>1) color[3]=1;
+    if (!core.isset(color[3])) color[3] = 1;
+    color[3] = core.clamp(color[3],0,1);
 
     if (time==0) {
         // 直接变色
@@ -2524,6 +2522,7 @@ control.prototype.getLvName = function () {
 
 ////// 设置某个自定义变量或flag //////
 control.prototype.setFlag = function(flag, value) {
+    if (!core.isset(value)) return this.removeFlag(flag);
     if (!core.isset(core.status.hero)) return;
     core.status.hero.flags[flag]=value;
 }
diff --git a/libs/events.js b/libs/events.js
index 653c4548..a02099bd 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1414,13 +1414,10 @@ events.prototype.changeFloor = function (floorId, stair, heroLoc, time, callback
             if (core.isset(color)) {
                 // 直接变色
                 core.clearMap('curtain');
-                core.fillRect('curtain',0,0,416,core.arrayToRGBA(color));
+                core.fillRect('curtain',0,0,416,416,core.arrayToRGBA(color));
                 core.status.curtainColor = color;
             }
-            else {
-                core.clearMap('curtain');
-                core.setAlpha('curtain', 0);
-            }
+            else core.clearMap('curtain');
 
             // 更改天气
             var weather = core.getFlag('__weather__', null);
diff --git a/project/functions.js b/project/functions.js
index eff92bba..c6ee7084 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -1121,8 +1121,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		ctx.msImageSmoothingEnabled = false;
 		ctx.imageSmoothingEnabled = false;
 		core.clearMap('curtain');
-		core.setOpacity('curtain', 1);
-		core.setAlpha('curtain', 1);
 
 		// 绘制色调层，默认不透明度
 		if (!core.isset(color)) color = 0.9;