jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

awesomplete replaceName

Browse Source
This commit is contained in:
ckcz123 2019-10-26 18:01:53 +08:00
parent c212991275
commit 6612db117c
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_server/MotaAction.g4
View File

@ -2569,7 +2569,7 @@ idString_1_e
colour : this.idstring_eColor
default : [null,"自定义flag"]
//todo 将其output改成'idString_e'
var code = Id_List_0+':'+IdText_0;
var code = MotaActionFunctions.replaceFromName(MotaActionFunctions.replaceToName(Id_List_0+':'+IdText_0));
return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/;
@ -3842,8 +3842,8 @@ MotaActionFunctions.replaceToName = function (str) {
map[v[0]] = v[1]; list.push(v[0]);
});
str = str.replace(new RegExp("item:(" + list.join("|") + ")", "g"), function (a, b) {
return map[b] ? ("道具：" + map[b]) : b;
}).replace(/item:/g, "道具：");
return map[b] ? ("物品：" + map[b]) : b;
}).replace(/item:/g, "物品：");
str = str.replace(/flag:/g, "变量：").replace(/switch:/g, "独立开关：").replace(/global:/g, "全局存储：");
return str;
}
@ -3861,9 +3861,9 @@ MotaActionFunctions.replaceFromName = function (str) {
MotaActionFunctions.pattern.replaceItemList.forEach(function (v) {
map[v[1]] = v[0]; list.push(v[1]);
});
str = str.replace(new RegExp("道具[:：](" + list.join("|") + ")", "g"), function (a, b) {
str = str.replace(new RegExp("物品[:：](" + list.join("|") + ")", "g"), function (a, b) {
return map[b] ? ("item:" + map[b]) : b;
}).replace(/道具[:：]/g, "item:");
}).replace(/物品[:：]/g, "item:");
str = str.replace(/变量[:：]/g, "flag:").replace(/独立开关[:：]/g, "switch:").replace(/全局存储[:：]/g, "global:");
return str;
}

33
_server/editor_blockly.js
View File

@ -100,10 +100,10 @@ editor_blockly = function () {
],
'数据相关':[
MotaActionBlocks['setValue_s'].xmlText([
MotaActionBlocks['idString_1_e'].xmlText(['status','hp'])
MotaActionBlocks['idString_1_e'].xmlText(['status','生命'])
]),
MotaActionBlocks['addValue_s'].xmlText([
MotaActionBlocks['idString_1_e'].xmlText(['status','hp'])
MotaActionBlocks['idString_1_e'].xmlText(['status','生命'])
]),
MotaActionBlocks['setFloor_s'].xmlText(),
MotaActionBlocks['setGlobalAttribute_s'].xmlText(),
@ -878,22 +878,35 @@ function omitedcheckUpdateFunction(event) {
editor_blockly.getAutoCompletions = function (content) {
// --- content为当前框中输入内容；将返回一个列表，为后续所有可补全内容
// 检查 flag:xxx，item:xxx和flag:xxx
var index = content.lastIndexOf(":");
// 检查 status:xxx，item:xxx和flag:xxx
var index = Math.max(content.lastIndexOf(":"), content.lastIndexOf("："));
if (index >= 0) {
var ch = content.charAt(index);
var before = content.substring(0, index), token = content.substring(index+1);
if (/^[a-zA-Z0-9_\u4E00-\u9FCC]*$/.test(token)) {
if (before.endsWith("status")) {
return Object.keys(core.status.hero).filter(function (one) {
if (before.endsWith("状态") || (ch == ':' && before.endsWith("status"))) {
var list = Object.keys(core.status.hero);
if (before.endsWith("状态") && MotaActionFunctions) {
list = MotaActionFunctions.pattern.replaceStatusList.map(function (v) {
return v[1];
}).concat(list);
}
return list.filter(function (one) {
return one != token && one.startsWith(token);
}).sort();
}
else if (before.endsWith("item")) {
return Object.keys(core.material.items).filter(function (one) {
else if (before.endsWith("道具") || (ch == ':' && before.endsWith("item"))) {
var list = Object.keys(core.status.items);
if (before.endsWith("道具") && MotaActionFunctions) {
list = MotaActionFunctions.pattern.replaceItemList.map(function (v) {
return v[1];
}).concat(list);
}
return list.filter(function (one) {
return one != token && one.startsWith(token);
}).sort();
}
else if (before.endsWith("flag")) {
else if (before.endsWith("变量") || (ch == ':' && before.endsWith("flag"))) {
return Object.keys(editor.used_flags || {}).filter(function (one) {
return one != token && one.startsWith(token);
}).sort();
@ -1026,7 +1039,7 @@ Blockly.FieldTextInput.prototype.showInlineEditor_ = function(quietInput) {
// --- awesomplete
var awesomplete = new Awesomplete(htmlInput, {
minChars: 4,
minChars: 2,
maxItems: 12,
autoFirst: true,
replace: function (text) {