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

调整blockly中idString类别的id

Browse Source
This commit is contained in:
YouWei Zhao 2020-05-16 12:41:52 +08:00
parent f264ba9e53
commit 80a5d64918
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
_server/MotaAction.g4
View File

@ -2507,9 +2507,11 @@ expression
: expression Arithmetic_List expression : expression Arithmetic_List expression
| negate_e | negate_e
| bool_e | bool_e
| idFixedList_e
| idFlag_e
| idTemp_e
| idIdList_e
| idString_e | idString_e
| evFlag_e
| evTemp_e
| enemyattr_e | enemyattr_e
| blockId_e | blockId_e
| blockCls_e | blockCls_e
@ -2575,27 +2577,23 @@ var code = IdString_0;
return [code, Blockly.JavaScript.ORDER_ATOMIC]; return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
//这一条不会被antlr识别,总是会被归到idString_e idIdList_e
idString_1_e
: Id_List ':' IdText : Id_List ':' IdText
/* idString_1_e /* idIdList_e
colour : this.idstring_eColor colour : this.idstring_eColor
default : [null,"自定义flag"] default : [null,"自定义flag"]
//todo 将其output改成'idString_e'
var code = MotaActionFunctions.replaceFromName(MotaActionFunctions.replaceToName(Id_List_0+':'+IdText_0)); var code = MotaActionFunctions.replaceFromName(MotaActionFunctions.replaceToName(Id_List_0+':'+IdText_0));
return [code, Blockly.JavaScript.ORDER_ATOMIC]; return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
//这一条不会被antlr识别,总是会被归到idString_e idFixedList_e
idString_2_e
: FixedId_List : FixedId_List
/* idString_2_e /* idFixedList_e
colour : this.idstring_eColor colour : this.idstring_eColor
//todo 将其output改成'idString_e'
var code = FixedId_List_0; var code = FixedId_List_0;
return [code, Blockly.JavaScript.ORDER_ATOMIC]; return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
@ -2607,7 +2605,6 @@ enemyattr_e
/* enemyattr_e /* enemyattr_e
default : ['greenSlime',"攻击"] default : ['greenSlime',"攻击"]
//todo 将其output改成'idString_e'
var code = 'enemy:'+IdString_0+':'+EnemyId_List_0; var code = 'enemy:'+IdString_0+':'+EnemyId_List_0;
return [code, Blockly.JavaScript.ORDER_ATOMIC]; return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
@ -2646,11 +2643,11 @@ return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
evFlag_e idFlag_e
: '独立开关' Letter_List : '独立开关' Letter_List
/* evFlag_e /* idFlag_e
colour : this.idstring_eColor colour : this.idstring_eColor
default : ["A"] default : ["A"]
var code = "switch:"+Letter_List_0; var code = "switch:"+Letter_List_0;
@ -2658,11 +2655,11 @@ return [code, Blockly.JavaScript.ORDER_ATOMIC];
*/; */;
evTemp_e idTemp_e
: '临时变量' Letter_List : '临时变量' Letter_List
/* evTemp_e /* idTemp_e
colour : this.idstring_eColor colour : this.idstring_eColor
default : ["A"] default : ["A"]
var code = "temp:"+Letter_List_0; var code = "temp:"+Letter_List_0;
@ -2895,10 +2892,10 @@ this.evisitor.mapColor=175;
/* Function_1 /* Function_1
delete(this.block('negate_e').inputsInline); delete(this.block('negate_e').inputsInline);
this.block('idString_1_e').output='idString_e'; this.block('idIdList_e').output='idString_e';
this.block('idString_2_e').output='idString_e'; this.block('idFixedList_e').output='idString_e';
this.block('evFlag_e').output='idString_e'; this.block('idFlag_e').output='idString_e';
this.block('evTemp_e').output='idString_e'; this.block('idTemp_e').output='idString_e';
*/ */
/* Functions /* Functions
@ -3822,12 +3819,12 @@ ActionParser.prototype.tryToUseEvFlag_e = function(defaultType, args, isShadow,
var match=/^switch:([A-Z])$/.exec(args[0]) var match=/^switch:([A-Z])$/.exec(args[0])
if(match){ if(match){
args[0]=match[1] args[0]=match[1]
return MotaActionBlocks['evFlag_e'].xmlText(args, isShadow, comment); return MotaActionBlocks['idFlag_e'].xmlText(args, isShadow, comment);
} }
match=/^temp:([A-Z])$/.exec(args[0]) match=/^temp:([A-Z])$/.exec(args[0])
if(match){ if(match){
args[0]=match[1] args[0]=match[1]
return MotaActionBlocks['evTemp_e'].xmlText(args, isShadow, comment); return MotaActionBlocks['idTemp_e'].xmlText(args, isShadow, comment);
} }
return MotaActionBlocks[defaultType||'evalString_e'].xmlText(args, isShadow, comment); return MotaActionBlocks[defaultType||'evalString_e'].xmlText(args, isShadow, comment);
} }

12
_server/editor_blockly.js
View File

@ -97,7 +97,7 @@ editor_blockly = function () {
], ],
'数据相关':[ '数据相关':[
MotaActionBlocks['setValue_s'].xmlText([ MotaActionBlocks['setValue_s'].xmlText([
MotaActionBlocks['idString_1_e'].xmlText(['status','生命']), '=', '', false MotaActionBlocks['idIdList_e'].xmlText(['status','生命']), '=', '', false
]), ]),
MotaActionBlocks['setEnemy_s'].xmlText(), MotaActionBlocks['setEnemy_s'].xmlText(),
MotaActionBlocks['setFloor_s'].xmlText(), MotaActionBlocks['setFloor_s'].xmlText(),
@ -217,16 +217,16 @@ editor_blockly = function () {
], ],
'值块':[ '值块':[
MotaActionBlocks['setValue_s'].xmlText([ MotaActionBlocks['setValue_s'].xmlText([
MotaActionBlocks['idString_1_e'].xmlText(['status','生命']), '=', '', false MotaActionBlocks['idIdList_e'].xmlText(['status','生命']), '=', '', false
]), ]),
MotaActionBlocks['expression_arithmetic_0'].xmlText(), MotaActionBlocks['expression_arithmetic_0'].xmlText(),
MotaActionBlocks['evFlag_e'].xmlText(), MotaActionBlocks['idFlag_e'].xmlText(),
MotaActionBlocks['evTemp_e'].xmlText(), MotaActionBlocks['idTemp_e'].xmlText(),
MotaActionBlocks['negate_e'].xmlText(), MotaActionBlocks['negate_e'].xmlText(),
MotaActionBlocks['bool_e'].xmlText(), MotaActionBlocks['bool_e'].xmlText(),
MotaActionBlocks['idString_e'].xmlText(), MotaActionBlocks['idString_e'].xmlText(),
MotaActionBlocks['idString_1_e'].xmlText(), MotaActionBlocks['idIdList_e'].xmlText(),
MotaActionBlocks['idString_2_e'].xmlText(), MotaActionBlocks['idFixedList_e'].xmlText(),
MotaActionBlocks['enemyattr_e'].xmlText(), MotaActionBlocks['enemyattr_e'].xmlText(),
MotaActionBlocks['blockId_e'].xmlText(), MotaActionBlocks['blockId_e'].xmlText(),
MotaActionBlocks['blockCls_e'].xmlText(), MotaActionBlocks['blockCls_e'].xmlText(),