From a89e397a407fda5706883f055d586d9c7312257f Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Wed, 20 Mar 2019 15:15:59 +0800
Subject: [PATCH] fix setFg

---
 libs/actions.js           | 2 ++
 libs/control.js           | 6 +++---
 project/floors/sample1.js | 6 ++----
 project/functions.js      | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index db2a9c06..f40ed879 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -2075,6 +2075,8 @@ actions.prototype._clickStorageRemove = function (x, y) {
 actions.prototype._clickStorageRemove_all = function () {
     core.myconfirm("你确定要清除【全部塔】的所有本地存档？\n此行为不可逆！！！", function () {
         var done = function () {
+            core.saves.autosave.data = null;
+            core.saves.autosave.updated = false;
             core.ui.closePanel();
             core.drawText("\t[操作成功]你的所有存档已被清空。");
             core.saves.saveIndex = 1;
diff --git a/libs/control.js b/libs/control.js
index 06fd679a..1181a098 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1964,10 +1964,10 @@ control.prototype.setFg = function(color, time, callback) {
         return;
     }
 
-    this._setFg_animate(core.status.curtainColor, color, callback);
+    this._setFg_animate(core.status.curtainColor, color, time, callback);
 }
 
-control.prototype._setFg_animate = function (nowColor, color, callback) {
+control.prototype._setFg_animate = function (nowColor, color, time, callback) {
     var per_time = 10, step = parseInt(time / per_time);
     var animate = setInterval(function() {
         nowColor = [
@@ -1980,7 +1980,7 @@ control.prototype._setFg_animate = function (nowColor, color, callback) {
         core.fillRect('curtain', 0, 0, core.__PIXELS__, core.__PIXELS__, core.arrayToRGBA(nowColor));
         step--;
         if (step <= 0) {
-            delete core.animate.asyncId[animate];
+            delete core.animateFrame.asyncId[animate];
             clearInterval(animate);
             core.status.curtainColor = color;
             if (core.isset(callback)) callback();
diff --git a/project/floors/sample1.js b/project/floors/sample1.js
index f30bb8c8..a7d256df 100644
--- a/project/floors/sample1.js
+++ b/project/floors/sample1.js
@@ -205,10 +205,8 @@ main.floors.sample1=
             "type": "move",
             "time": 750,
             "steps": [
-                {
-                    "direction": "right",
-                    "value": 2
-                },
+                "right",
+                "right",
                 "down"
             ]
         },
diff --git a/project/functions.js b/project/functions.js
index e323d68c..64fc7537 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -142,7 +142,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		color = core.status.maps[floorId].color;
 	core.clearMap('curtain');
 	core.status.curtainColor = color;
-	if (color) core.fillRect('curtain', 0, 0, core.__SIZE__, core.__SIZE__, core.arrayToRGBA(color));
+	if (color) core.fillRect('curtain', 0, 0, core.__PIXELS__, core.__PIXELS__, core.arrayToRGBA(color));
 	// 更改天气
 	var weather = core.getFlag('__weather__', null);
 	if (!weather && core.status.maps[floorId].weather)