diff --git a/libs/actions.js b/libs/actions.js index 7fd5951f..3814f333 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -718,6 +718,16 @@ actions.prototype._sys_onmousewheel = function (direct) { return; } + // wait事件 + if (core.status.lockControl && core.status.event.id == 'action' && core.status.event.data.type == 'wait') { + core.setFlag('type', 0); + var keycode = direct == 1 ? 33 : 34; + core.setFlag('keycode', keycode); + core.status.route.push("input:" + keycode); + core.doAction(); + return; + } + } ////// 长按Ctrl键时 ////// diff --git a/libs/ui.js b/libs/ui.js index 94c9bbdd..1961425e 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -1090,8 +1090,11 @@ ui.prototype._drawTextBox_drawImages = function (content) { core.drawImage('ui', img, parseFloat(ss[1]), parseFloat(ss[2])); else if (ss.length==5) core.drawImage('ui', img, 0, 0, img.width, img.height, parseFloat(ss[1]), parseFloat(ss[2]), parseFloat(ss[3]), parseFloat(ss[4])); - else if (ss.length==9) + else if (ss.length==9 || ss.length==10) { + if (ss.length==10) core.setAlpha('ui', parseFloat(ss[9])); core.drawImage('ui', img, parseFloat(ss[1]), parseFloat(ss[2]), parseFloat(ss[3]), parseFloat(ss[4]), parseFloat(ss[5]), parseFloat(ss[6]), parseFloat(ss[7]), parseFloat(ss[8])); + core.setAlpha('ui', 1); + } return ""; }); } diff --git a/libs/utils.js b/libs/utils.js index c3d9dd38..4378dca5 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -915,6 +915,7 @@ utils.prototype.myconfirm = function (hint, yesCallback, noCallback) { main.dom.inputMessage.innerHTML = hint.replace(/\n/g, '
'); main.dom.inputBox.style.display = 'none'; main.dom.inputYes.focus(); + core.status.holdingKeys = []; core.platform.successCallback = yesCallback; core.platform.errorCallback = noCallback; @@ -929,6 +930,7 @@ utils.prototype.myprompt = function (hint, value, callback) { setTimeout(function () { main.dom.inputBox.focus(); }); + core.status.holdingKeys = []; core.platform.successCallback = core.platform.errorCallback = callback; }