diff --git a/libs/events.js b/libs/events.js index 72d6eacd..5a688f59 100644 --- a/libs/events.js +++ b/libs/events.js @@ -919,7 +919,7 @@ events.prototype.doAction = function() { case "switch": // 条件选择 var key = core.calValue(data.condition) for (var i = 0; i < data.caseList.length; i++) { - if (data.caseList[i].case=="default" || core.calValue(data.caseList[i].case) == key) { + if (data.caseList[i]["case"]=="default" || core.calValue(data.caseList[i]["case"]) == key) { core.events.insertAction(data.caseList[i].action); break; } diff --git a/libs/ui.js b/libs/ui.js index a9ad53e9..ecf31465 100644 --- a/libs/ui.js +++ b/libs/ui.js @@ -534,17 +534,17 @@ ui.prototype.drawTextBox = function(content, showAll) { } // get next character - var char = content.charAt(index++); + var ch = content.charAt(index++); // \n, \\n - if (char == '\n' || (char=='\\' && content.charAt(index)=='n')) { + if (ch == '\n' || (ch=='\\' && content.charAt(index)=='n')) { offsetx = content_left; offsety += textfont+5; - if (char=='\\') index++; + if (ch=='\\') index++; return drawNext(); } // \r, \\r - if (char == '\r' || (char=='\\' && content.charAt(index)=='r')) { - if (char == '\\') index++; + if (ch == '\r' || (ch=='\\' && content.charAt(index)=='r')) { + if (ch == '\\') index++; changed = true; // 检查是不是 [] var index2; @@ -559,7 +559,7 @@ ui.prototype.drawTextBox = function(content, showAll) { return drawNext(); } // 检查是不是自动换行 - var charwidth = core.canvas.ui.measureText(char).width; + var charwidth = core.canvas.ui.measureText(ch).width; if (offsetx + charwidth > content_left + validWidth) { index--; offsetx = content_left; @@ -567,7 +567,7 @@ ui.prototype.drawTextBox = function(content, showAll) { return drawNext(); } // 输出 - core.fillText('ui', char, offsetx, offsety); + core.fillText('ui', ch, offsetx, offsety); offsetx += charwidth; return true; }; diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe index 318afa28..f0447910 100644 Binary files a/常用工具/JS代码压缩工具.exe and b/常用工具/JS代码压缩工具.exe differ