Merge branch 'noAnimate' into hasAnimate

project/floors/MT5.js

@@ -506,6 +506,7 @@ main.floors.MT5=
                         ],
                         "time": 500,
                         "keep": true,
+                        "async": true,
                         "steps": [
                             "left:1"
                         ]
@@ -518,10 +519,14 @@ main.floors.MT5=
                         ],
                         "time": 500,
                         "keep": true,
+                        "async": true,
                         "steps": [
                             "left:1"
                         ]
                     },
+                    {
+                        "type": "waitAsync"
+                    },
                     {
                         "type": "showImage2",
                         "code": 1,
@@ -851,34 +856,19 @@ main.floors.MT5=
                         "time": 0
                     },
                     {
-                        "type": "move",
+                        "type": "function",
-                        "loc": [
+                        "function": "function(){\ncore.moveHidingBlock(4,3,[\"down:7\"],100,0);\n}"
-                            4,
-                            3
-                        ],
-                        "time": 100,
-                        "steps": [
-                            "down:8"
-                        ]
                     },
                     {
-                        "type": "move",
+                        "type": "function",
-                        "loc": [
+                        "function": "function(){\ncore.moveHidingBlock(5,3,[\"left:1\", \"down:6\"],100,0);\n}"
-                            5,
-                            3
-                        ],
-                        "time": 100,
-                        "steps": [
-                            "left:1",
-                            "down:8"
-                        ]
                     },
                     {
                         "type": "setVolume",
                         "value": 0,
                         "time": 1000
                     },
-                    "\t[？？？]救命啊！！！TxT",
+                    "\t[？？？]\\c[14]救命呀~~~~~TxT、、、",
                     {
                         "type": "playBgm",
                         "name": "xingkong.mp3"

project/floors/huxiao1.js

@@ -56,11 +56,15 @@ main.floors.huxiao1=
                 "type": "comment",
                 "text": "卷轴灰度"
             },
+            {
+                "type": "function",
+                "function": "function(){\nflags.textOffset=-69;\n}"
+            },
             {
                 "type": "setText",
                 "position": "down",
                 "offset": -24,
-                "align": "left",
+                "align": "center",
                 "background": [
                     0,
                     0,
@@ -77,7 +81,7 @@ main.floors.huxiao1=
             "\r[#f49af1]就绝对不允许联盟和外人对我们妖社不利!",
             "\r[#f49af1].........",
             "\r[#fb928b]........但愿吧。",
-            "\r[#fb928b]嗜骨........你知道我们为什么要暗地与联盟作时吗",
+            "\r[#fb928b]嗜骨......你知道我们为什么要暗地与联盟作时吗",
             "\r[#f49af1]....这.......因为他们是........",
             "\r[#fb928b]不........天塔本身就不是为了我们魔物而建造的。",
             "\r[#fb928b]建造天塔的本性在于封印【那个人】",
@@ -90,9 +94,9 @@ main.floors.huxiao1=
             "\r[#f49af1].....您在说...谁?她.....是谁?",
             "\r[#fb928b]她是个善良的人.......我不想让她卷入这场纷争。",
             "\r[#f49af1]...........",
-            "\r[#fb928b]如果没有她..........恐怕现在天塔就不会是这个样子......",
+            "\r[#fb928b]如果没有她......恐怕现在天塔就不会是这个样子",
             "\r[#fb928b]..........",
-            "\r[#fb928b]你现在知道我们妖社为什么要暗地与联盟做对了吧?",
+            "\r[#fb928b]你现在知道我们妖社为什么要暗地与联盟做对了吧",
             "\r[#f49af1].........",
             "\r[#f49af1]......因为我们魔物也要生存.........",
             "\r[#f49af1]我们必须有足够抗衡联盟的力量才行.......",

project/floors/huxiao2.js

@@ -23,17 +23,22 @@ main.floors.huxiao2=
                 "time": 500
             },
             "\r[#f49af1]毒尾..........你怎么又背着我喝那种东西........",
-            "\r[#87e291]没事的嗜骨......只有喝下这个.......才能让自己的毒性更强啊........",
+            "\r[#87e291]没事的嗜骨......只有喝下这个......",
+            "\r[#87e291] ......才能让自己的毒性更强啊.........",
             "\r[#f49af1]你给我.........不要喝了......",
             "\r[#f49af1]你难道不知道你的是你的寿命......",
             "\r[#f49af1]喝的是你的时间吗！！！？",
             "\r[#f49af1]你难道就不为了你身边的人想想?",
             "\r[#f49af1]血尾呢？你们关系不是最好了吗？",
-            "\r[#87e291]别说了嗜骨，我的寿命与妖社的利益来讲根本不值一提..........",
+            "\r[#87e291]别说了嗜骨...........",
-            "\r[#87e291]我这条命都是魔龙大人给的......我还有什么遗憾呢?",
+            "\r[#87e291]我的寿命与妖社的利益来讲根本不值一提......",
-            "\r[#f49af1]我呢?我呢？",
+            "\r[#87e291]我这条命都是魔龙大人给的....我还有什么遗憾呢",
-            "\r[#f49af1]不是还有我吗!!!",
+            "\r[#f49af1]我呢我呢.............",
-            "\r[#f49af1]每天陪你的人,每天能和你在一起你说话，能每天一起玩闹解闷的人，不是还有我吗..",
+            "\r[#f49af1]不是还有我吗！！！！",
+            "\r[#f49af1]每天陪你的人......",
+            "\r[#f49af1] ......每天能和你在一起陪你说话......",
+            "\r[#f49af1]......每天一起玩闹解闷的人.........",
+            "\r[#f49af1]......不是还有我吗.........",
             "\r[#f49af1]你为什么一点都不为我想想呢.......？",
             "\r[#87e291].........对不起嗜骨........",
             "\r[#87e291]我.........我不是不了解你的意思.......",

project/floors/huxiao3.js

@@ -49,7 +49,7 @@ main.floors.huxiao3=
             "\r[#87e291]海骑士大人求求您救救血尾........",
             "\r[#87e291]救救她.....求你了.........",
             "\r[#f49af1](毒尾.....你又何必去求他呢........)",
-            "\r[#f49af1](你平时不是最恨他了吗...........最讨厌他了吗...........)",
+            "\r[#f49af1](你平时不是最恨他了吗.......最讨厌他了吗...)",
             "\r[#f49af1](你明明知道他不可能帮你.........)",
             "\r[#f49af1](.........你还要去求你最恨的人..........)",
             "\r[#f49af1](为什么.....)",
@@ -86,6 +86,10 @@ main.floors.huxiao3=
                 "type": "function",
                 "function": "function(){\ncore.maskFliter(500,'013-Square01.png')\n}"
             },
+            {
+                "type": "function",
+                "function": "function(){\nflags.textOffset=-27\n}"
+            },
             {
                 "type": "trigger",
                 "loc": [

project/functions.js

@@ -389,6 +389,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	}
 
 	//等待动画执行完毕
+	if (core.getFlag("isPause"))
 		core.push(todo, [{ "type": "waitAsync" }]);
 	// 战后事件
 	if (core.status.floorId != null) {

project/plugins.js

@@ -471,6 +471,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			"零伤白色： " + (core.getFlag("isZeroWhite") ? "[ON]" : "[OFF]"),
 			"道具打怪不提示： " + (core.getFlag("isNoTip") ? "[ON]" : "[OFF]"),
 			"手册显示普通： " + (core.getFlag("isCommon") ? "[ON]" : "[OFF]"),
+			"战斗停顿： " + (core.getFlag("isPause") ? "[ON]" : "[OFF]"),
 			"返回主菜单"
 		]);
 	}
@@ -946,6 +947,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				core.ui._drawRM();
 				break;
 			case 5:
+				core.setFlag("isPause", !core.getFlag("isPause"));
+				core.ui._drawRM();
+				break;
+			case 6:
 				core.status.event.selection = 9;
 				core.playSound('取消');
 				core.ui._drawSettings();
@@ -4456,6 +4461,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 			ctx.save();
 			ctx.textAlign = 'center';
 			ctx.textBaseline = 'middle';
+
 			core.fillText(ctx, titleInfo.title, hPos.left + (width + 30) / 2 - 5, vPos.top - (titlefont + 12) / 2 - 5, titleStyle, tf);
 			ctx.restore();
 		}
@@ -4489,11 +4495,59 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 		return config;
 	}
 
+	ui.prototype._drawTextBox_getHorizontalPosition = function (content, titleInfo, posInfo) {
+		var ctx = posInfo.ctx || 'ui';
+		var realContent = this._getRealContent(content);
+		var paddingLeft = 25,
+			paddingRight = 12;
+		if ((posInfo.px != null && posInfo.py != null) || posInfo.pos) paddingLeft = 20;
+		if (titleInfo.icon != null) paddingLeft = 62; // 15 + 32 + 15
+		else if (titleInfo.image) paddingLeft = 90; // 10 + 70 + 10
+		var left = 7 + 3 * (core._HALF_WIDTH_ - 6),
+			right = core._PX_ - left,
+			width = right - left;
+		if (flags.Memories_grayscale)
+			width = core._PX_;
+		var validWidth = width - paddingLeft - paddingRight;
+
+
+		// 对话框效果：改为动态计算
+		if ((posInfo.px != null && posInfo.py != null) || posInfo.pos) {
+			var min_width = 220 - paddingLeft,
+				max_width = validWidth;
+			// 无行走图或头像，则可以适当缩小min_width
+			if (titleInfo.image == null) min_width = 160;
+			if (titleInfo.title) {
+				min_width = core.clamp(core.calWidth(ctx, titleInfo.title, this._buildFont(core.status.textAttribute.titlefont, true)), min_width, max_width);
+			}
+			if (posInfo.pos) {
+				left = core.calValue(posInfo.pos[0]) || 0;
+				max_width = Math.max(min_width, right - left - paddingLeft - paddingRight);
+			} else left = null;
+			if (posInfo.pos && posInfo.pos[2] != null) {
+				width = core.calValue(posInfo.pos[2]) || 0;
+				min_width = validWidth = width - paddingLeft - paddingRight;
+			} else validWidth = 0;
+			if (validWidth < min_width) {
+				validWidth = this._calTextBoxWidth('ui', realContent, min_width, max_width, this._buildFont());
+				width = validWidth + paddingLeft + paddingRight;
+			}
+			if (left == null) left = core.clamp(32 * posInfo.px + 16 - width / 2 - core.bigmap.offsetX, left, right - width);
+			right = left + width;
+		}
+		return { left: left, right: right, width: width, validWidth: validWidth, xoffset: 11, content_left: left + paddingLeft };
+	}
+
+
+
 	const _doa = core.events.doAction;
 	core.events.doAction = function () {
 		core.relocateCanvas('ui', 0, 0);
 		_doa.call(core.events);
 	}
+
+
+
 },
     "怪物受击发亮": function () {
 	// 在此增加新插件