Merge branch 'story' into story-laodeng

project/plugins.js

@@ -66,7 +66,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				core.ui.cgText.sound = data.sound || "";
 				core.ui.cgText.bodyList = core.clone(data.bodyList);
 				main.dom.cgText.style.display = 'block';
-				core.lockControl();
 				core.ui.cgText.update()
 
 			} else {
@@ -9743,7 +9742,6 @@ core.plugin.animate = {
 				const data = core.clone(core.status.event.data.current);
 
 				core.insertAction(data);
-				core.unlockControl();
 				core.doAction()
 			}
 		} catch (ee) {
@@ -9775,7 +9773,6 @@ core.plugin.animate = {
 				const data = core.clone(core.status.event.data.current);
 
 				core.insertAction(data);
-				core.unlockControl();
 				core.doAction()
 			}
 		} catch (ee) {
@@ -9839,7 +9836,6 @@ core.plugin.animate = {
 						if (core.status.event.id == 'action' && core.status.event.data.type == 'cgtext') {
 							core.setFlag("skip", true)
 							main.dom.cgText.style.display = "none"
-							core.unlockControl();
 							core.doAction()
 						}
 					}
@@ -9853,7 +9849,6 @@ core.plugin.animate = {
 				data.text = data.text.replace(/(\\(z))(\[.*?])?/g, ""); //去除打字机暂停效果
 				data.sound = ""
 				core.insertAction(data);
-				core.unlockControl();
 				core.doAction()
 
 			} else if ((core.domStyle.isVertical && inRect(pos, saveboxVertical) && !this.WindowSkin) || (!core.domStyle.isVertical && !this.WindowSkin && inRect(pos, savebox))) { //存档
@@ -9868,7 +9863,7 @@ core.plugin.animate = {
 				cg.style.display = "none"
 				const data = [{ 'type': 'callSave' }, current] //插入存档事件
 				core.insertAction(data)
-				core.unlockControl();
+
 				core.doAction();
 
 			} else {
@@ -9885,7 +9880,6 @@ core.plugin.animate = {
 					data.text = data.text.replace(/(\\(z))(\[.*?])?/g, ""); //去除打字机暂停效果
 					data.sound = "";
 					core.insertAction(data);
-					core.unlockControl();
 					core.doAction();
 					return;
 				} else {
@@ -9894,7 +9888,6 @@ core.plugin.animate = {
 
 				cg.style.display = "none"
 				core.ui._animateUI('hide', null, () => {
-					core.unlockControl();
 					core.doAction()
 				});
 
@@ -9996,7 +9989,6 @@ core.plugin.animate = {
 				if (auto && !this.WindowSkin && !core.ui.cgText.sound || (core.ui.cgText.sound && !core.musicStatus.soundStatus)) {
 					setTimeout(() => {
 						if (auto) {
-							core.unlockControl();
 							core.doAction()
 						}
 					}, 2000)
@@ -10009,7 +10001,7 @@ core.plugin.animate = {
 						core.status.event.interval = null;
 						if (auto && !this.WindowSkin && !core.ui.cgText.sound || (core.ui.cgText.sound && !core.musicStatus.soundStatus)) setTimeout(() => {
 							if (auto) {
-								core.unlockControl();
+	
 								core.doAction()
 							}
 						}, 2000)
@@ -10072,7 +10064,6 @@ core.plugin.animate = {
 					if (this.sound && auto && !this.WindowSkin && core.musicStatus.soundStatus) {
 						setTimeout(() => {
 							if (auto) {
-								core.unlockControl();
 								core.doAction()
 							}
 						}, 2000)
@@ -10102,7 +10093,7 @@ core.plugin.animate = {
 	}
 	core.ui.cgText = new cgText()
 },
-"旁白": function () {
+    "旁白": function () {
 // 在此增加新插件
 const over = document.createElement('canvas'); //over画布设置
 over.style.position = 'absolute';
@@ -10119,7 +10110,6 @@ main.dom.over = over;
 this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor = "#FFFFFF", boldColor = "#000000", font = "bold 48px Verdana", text = "") {
 	if (!core.isPlaying()) { return core.doAction() }
 	const img = core.material.images.images?.[image]
-	core.lockControl();
 	over.style.display = "block";
 	let globalAlpha = 0
 	core.registerAnimationFrame("overshow", true, () => {
@@ -10182,7 +10172,6 @@ this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor
 						if (globalAlpha <= 0) {
 							over.style.display = 'none'
 							core.unregisterAnimationFrame("overhide")
-							core.unlockControl();
 							core.doAction()
 						}
 					})
@@ -10220,7 +10209,6 @@ this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor
 
 							over.style.display = 'none'
 							core.unregisterAnimationFrame("overhide")
-							core.unlockControl();
 							core.doAction();
 						}
 					})
@@ -10232,7 +10220,7 @@ this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor
 
 }
 },
-"属性映射": function () {
+    "属性映射": function () {
 // 在此增加新插件
 this.statusEquip = function () {
 	const hero = core.status.hero;
@@ -10300,7 +10288,7 @@ this.updateStatus = function () {
 }
 
 },
-"回合制boss战": function () {
+    "回合制boss战": function () {
 // 在此增加新插件
 const boss = document.createElement('canvas'); //boss战画布设置
 boss.style.position = 'absolute';