Merge branch 'hasAnimate' of https://gitea.mota.press/bdf1/tianta into hasAnimate

迁移样板导致的MT10回忆剧情显示BUG修复

_server/config.json

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

project/enemys.js

@@ -66,7 +66,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 =
 	"evilBat": {"name":"邪恶蝙蝠","hp":1000,"atk":1,"def":0,"money":0,"exp":0,"point":0,"special":[2,3]},
 	"M300": {"name":"墙妖","hp":50,"atk":420,"def":300,"money":100,"exp":10,"point":0,"special":3},
 	"M301": {"name":"汪洋","hp":10000,"atk":300,"def":0,"money":1000,"exp":100,"point":0,"special":0,"beforeBattle":[{"type":"animate","name":"hainazhijian","loc":[6,5]}],"afterBattle":[{"type":"setValue","name":"flag:255","value":"1"},{"type":"setValue","name":"flag:bofang","value":"0"},{"type":"trigger","loc":[0,1]}]},
-	"M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":null,"add":false,"vampire":0.34},
+	"M302": {"name":"毒尾","hp":1000,"atk":140,"def":30,"money":100,"exp":20,"point":0,"special":[11,12],"value":0.34,"add":false,"vampire":0.34},
 	"M303": {"name":"血尾雕像","hp":5000,"atk":100,"def":0,"money":200,"exp":10,"point":0,"special":[15,11],"value":null,"add":false,"zone":100,"vampire":0.34},
 	"E340": {"name":"戾鬼","hp":49999,"atk":18973,"def":1800,"money":5000,"exp":500,"point":0,"special":0},
 	"E341": {"name":"媚儿","hp":25000,"atk":250,"def":180,"money":2500,"exp":250,"point":0,"special":0},

project/floors/huxiao1.js

@@ -69,11 +69,6 @@ main.floors.huxiao1=
                 ],
                 "textfont": 20
             },
-            {
-                "type": "setGlobalAttribute",
-                "name": "borderColor",
-                "value": "null"
-            },
             "\r[#fb928b]从今天起,嗜骨,你就是我们妖社的中坚力量了。",
             "\r[#fb928b]你很好强,各方面素质都很不错。",
             "\r[#fb928b]我相信你能够胜任你的位置。",

project/floors/huxiao3.js

@@ -82,11 +82,6 @@ main.floors.huxiao3=
                 "name": "flag:Memories_grayscale",
                 "value": "false"
             },
-            {
-                "type": "setGlobalAttribute",
-                "name": "borderColor",
-                "value": "204,204,204,1"
-            },
             {
                 "type": "function",
                 "function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}"

project/functions.js

@@ -1661,12 +1661,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			core.ui.fillText(ctx, text, x, y, style);
 		};
 
-	//回忆画面
-	if (core.status.hero.flags.Memories_grayscale) {
-		core.drawImage('caidan', 'caidan_grayscale.png', -161, 0);
-		core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan_grayscale.png'], 0, 0)
-		return;
-	}
+
 	//手册和道具栏画面背景
 	if (core.status.event.id === 'book' || core.status.event.id === 'book-detail' || core.status.event.id === 'toolbox') {
 		core.dom.caidan1Ctx.drawImage(core.material.images.images['black.png'], 0, 0)
@@ -1751,9 +1746,8 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 			}
 			if (core.status.floorId == "nandu") {
 				core.ui.clearMap(ctx = core.dom.statusCanvasCtx);
-				core.dom.statusCanvas.style.zIndex=80;
-			}
-			else core.dom.statusCanvas.style.zIndex=50;
+				core.dom.statusCanvas.style.zIndex = 80;
+			} else core.dom.statusCanvas.style.zIndex = 50;
 		}
 	} else if (core.flags.hideLeftStatusBar && !core.domStyle.isVertical) { // 横屏且隐藏状态栏
 		if (!core.dymCanvas['status'])
@@ -1782,6 +1776,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 		fill(core.setTwoDigits(core.itemCount('blueKey')), 46 + offset, 267, '#AAAADD');
 		fill(core.setTwoDigits(core.itemCount('redKey')), 81 + offset, 267, '#FF8888');
 	}
+
+	//回忆画面
+	if (core.status.hero.flags.Memories_grayscale) {
+		core.drawImage('caidan', 'caidan_grayscale.png', -161, 0);
+		core.dom.caidan1Ctx.drawImage(core.material.images.images['caidan_grayscale.png'], 0, 0)
+		core.ui.clearMap(ctx = core.dom.statusCanvasCtx); // 清空状态栏
+	}
 },
         "drawStatistics": function () {
 			// 浏览地图时参与的统计项目