Compare commits

..

No commits in common. "752bf188150a1c96d75062a8726854e6749c9813" and "8d8c2f827d3930700f615379f7051d0b5c5be888" have entirely different histories.

2 changed files with 18 additions and 5 deletions

File diff suppressed because one or more lines are too long

View File

@ -66,6 +66,7 @@ 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 {
@ -9742,6 +9743,7 @@ core.plugin.animate = {
const data = core.clone(core.status.event.data.current);
core.insertAction(data);
core.unlockControl();
core.doAction()
}
} catch (ee) {
@ -9773,6 +9775,7 @@ core.plugin.animate = {
const data = core.clone(core.status.event.data.current);
core.insertAction(data);
core.unlockControl();
core.doAction()
}
} catch (ee) {
@ -9836,6 +9839,7 @@ 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()
}
}
@ -9849,6 +9853,7 @@ 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))) { //存档
@ -9863,7 +9868,7 @@ core.plugin.animate = {
cg.style.display = "none"
const data = [{ 'type': 'callSave' }, current] //插入存档事件
core.insertAction(data)
core.unlockControl();
core.doAction();
} else {
@ -9880,6 +9885,7 @@ core.plugin.animate = {
data.text = data.text.replace(/(\\(z))(\[.*?])?/g, ""); //去除打字机暂停效果
data.sound = "";
core.insertAction(data);
core.unlockControl();
core.doAction();
return;
} else {
@ -9888,6 +9894,7 @@ core.plugin.animate = {
cg.style.display = "none"
core.ui._animateUI('hide', null, () => {
core.unlockControl();
core.doAction()
});
@ -9989,6 +9996,7 @@ 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)
@ -10001,7 +10009,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)
@ -10064,6 +10072,7 @@ core.plugin.animate = {
if (this.sound && auto && !this.WindowSkin && core.musicStatus.soundStatus) {
setTimeout(() => {
if (auto) {
core.unlockControl();
core.doAction()
}
}, 2000)
@ -10110,6 +10119,7 @@ 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, () => {
@ -10172,6 +10182,7 @@ this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor
if (globalAlpha <= 0) {
over.style.display = 'none'
core.unregisterAnimationFrame("overhide")
core.unlockControl();
core.doAction()
}
})
@ -10209,6 +10220,7 @@ this.over = function (image, time = 3000, hidetime = 100, sound = "", textColor
over.style.display = 'none'
core.unregisterAnimationFrame("overhide")
core.unlockControl();
core.doAction();
}
})