Merge branch 'noAnimate' into hasAnimate

_server/config.json

@@ -1 +1 @@
-{"viewportLoc":[0,0],"editorLastFloorId":"guantong"}
+{"viewportLoc":[0,0],"editorLastFloorId":"mishi"}

project/floors/MT0.js

@@ -43,15 +43,22 @@ main.floors.MT0=
     "events": {
         "10,10": [
             {
-                "type": "showImage",
+                "type": "showImage2",
                 "code": 1,
                 "image": "shaohusikao.png",
+                "sloc": [
+                    0,
+                    0,
+                    null
+                ],
                 "loc": [
-                    70,
-                    20
+                    80,
+                    50,
+                    291,
+                    466
                 ],
                 "opacity": 1,
-                "time": 0
+                "time": 500
             },
             {
                 "type": "showGif",
@@ -61,10 +68,12 @@ main.floors.MT0=
                     10
                 ]
             },
-            "\t[邵虎]梅花为底,淡蓝色的屏障",
-            "\t[邵虎]这是《古代密要》中的【梅障结界】",
-            "\t[邵虎]看来天塔里面不是那么简单啊",
-            "\t[邵虎]以我现在的能力怕是无法破解这层屏障了，还是先不要管它为好",
+            "\t[邵虎]............",
+            "\t[邵虎]（梅花为底，淡蓝色的屏障）......",
+            "\t[邵虎]............",
+            "\t[邵虎]（这是《古代密要》中的“梅障结界”）....",
+            "\t[邵虎]（看来天塔里面不是那么简单啊）....",
+            "\t[邵虎]（以我现在的能力怕是无法破解这层障壁了......还是先不要管它为好。）",
             {
                 "type": "hideImage",
                 "code": 1,

project/floors/MUDI.js

@@ -483,7 +483,7 @@ main.floors.MUDI=
             },
             {
                 "type": "function",
-                "function": "function(){\nvar time = 500;\ntime /= Math.max(core.status.replay.speed, 1)\nvar per_time = 50,\n\tstep = 0,\n\tsteps = parseInt(time / per_time);\nvar animate = core.isReplaying() ? 0 : setInterval(function () {\n\tstep++;\n\tcore.dom.wholeCtx.globalAlpha = 1;\n\tcore.dom.wholeCtx.fillRect(0, 0, core.dom.whole.width, core.dom.whole.height);\n\tcore.dom.wholeCtx.globalAlpha = 1 - step / steps;\n\tcore.drawImage(core.dom.wholeCtx, core.material.images.images['mudi.jpg'], 0, 0);\n\tif (step == steps) {\n\t\tclearInterval(animate);\n\t}\n}, per_time);\n}"
+                "function": "function(){\nvar time = 500;\ntime /= Math.max(core.status.replay.speed, 1)\nvar per_time = 50,\n\tstep = 0,\n\tsteps = parseInt(time / per_time);\nvar animate = core.isReplaying() ? 0 : setInterval(function () {\n\tstep++;\n\tcore.dom.wholeCtx.globalAlpha = 1;\n\tcore.dom.wholeCtx.fillRect(0, 0, core.dom.whole.width, core.dom.whole.height);\n\tcore.dom.wholeCtx.globalAlpha = 1 - step / steps;\n\tcore.drawImage(core.dom.wholeCtx, core.material.images.images['mudi.jpg'], 0, step / steps * 50);\n\tif (step == steps) {\n\t\tclearInterval(animate);\n\t}\n}, per_time);\n}"
             },
             {
                 "type": "sleep",

project/floors/QISHI.js

@@ -456,12 +456,7 @@ main.floors.QISHI=
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0],
     [  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0]
 ],
-    "color": [
-        0,
-        0,
-        0,
-        1
-    ],
+    "color": null,
     "bgmap": [
 
 ],

project/functions.js

@@ -1088,6 +1088,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 				core.removeFlag('__fromLoad__');
 				if (callback) callback();
 			});
+			core.plugin.donghuas();
 		},
 		"getStatusLabel": function (name) {
 			// 返回某个状态英文名的对应中文标签，如atk -> 攻击，def -> 防御等。