From 80a5d6491842e49826f4fc333855a4611149763d Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Sat, 16 May 2020 12:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4blockly=E4=B8=ADidString?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _server/MotaAction.g4     | 39 ++++++++++++++++++---------------------
 _server/editor_blockly.js | 12 ++++++------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index ef872b1f..c92c3f26 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -2507,9 +2507,11 @@ expression
     :   expression Arithmetic_List expression
     |   negate_e
     |   bool_e
+    |   idFixedList_e
+    |   idFlag_e
+    |   idTemp_e
+    |   idIdList_e
     |   idString_e
-    |   evFlag_e
-    |   evTemp_e
     |   enemyattr_e
     |   blockId_e
     |   blockCls_e
@@ -2575,27 +2577,23 @@ var code = IdString_0;
 return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
 
-//这一条不会被antlr识别,总是会被归到idString_e
-idString_1_e
+idIdList_e
     :   Id_List ':' IdText
     
 
-/* idString_1_e
+/* idIdList_e
 colour : this.idstring_eColor
 default : [null,"自定义flag"]
-//todo 将其output改成'idString_e'
 var code = MotaActionFunctions.replaceFromName(MotaActionFunctions.replaceToName(Id_List_0+':'+IdText_0));
 return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
 
-//这一条不会被antlr识别,总是会被归到idString_e
-idString_2_e
+idFixedList_e
     :   FixedId_List
     
 
-/* idString_2_e
+/* idFixedList_e
 colour : this.idstring_eColor
-//todo 将其output改成'idString_e'
 var code = FixedId_List_0;
 return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
@@ -2607,7 +2605,6 @@ enemyattr_e
 
 /* enemyattr_e
 default : ['greenSlime',"攻击"]
-//todo 将其output改成'idString_e'
 var code = 'enemy:'+IdString_0+':'+EnemyId_List_0;
 return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
@@ -2646,11 +2643,11 @@ return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
 
 
-evFlag_e
+idFlag_e
     :   '独立开关' Letter_List
 
 
-/* evFlag_e
+/* idFlag_e
 colour : this.idstring_eColor
 default : ["A"]
 var code = "switch:"+Letter_List_0;
@@ -2658,11 +2655,11 @@ return [code, Blockly.JavaScript.ORDER_ATOMIC];
 */;
 
 
-evTemp_e
+idTemp_e
     :   '临时变量' Letter_List
 
 
-/* evTemp_e
+/* idTemp_e
 colour : this.idstring_eColor
 default : ["A"]
 var code = "temp:"+Letter_List_0;
@@ -2895,10 +2892,10 @@ this.evisitor.mapColor=175;
 
 /* Function_1
 delete(this.block('negate_e').inputsInline);
-this.block('idString_1_e').output='idString_e';
-this.block('idString_2_e').output='idString_e';
-this.block('evFlag_e').output='idString_e';
-this.block('evTemp_e').output='idString_e';
+this.block('idIdList_e').output='idString_e';
+this.block('idFixedList_e').output='idString_e';
+this.block('idFlag_e').output='idString_e';
+this.block('idTemp_e').output='idString_e';
 */
 
 /* Functions
@@ -3822,12 +3819,12 @@ ActionParser.prototype.tryToUseEvFlag_e = function(defaultType, args, isShadow,
   var match=/^switch:([A-Z])$/.exec(args[0])
   if(match){
     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])
   if(match){
     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);
 }
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index f47ca6d2..75754601 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -97,7 +97,7 @@ editor_blockly = function () {
     ],
     '数据相关':[
       MotaActionBlocks['setValue_s'].xmlText([
-        MotaActionBlocks['idString_1_e'].xmlText(['status','生命']), '=', '', false
+        MotaActionBlocks['idIdList_e'].xmlText(['status','生命']), '=', '', false
       ]),
       MotaActionBlocks['setEnemy_s'].xmlText(),
       MotaActionBlocks['setFloor_s'].xmlText(),
@@ -217,16 +217,16 @@ editor_blockly = function () {
     ],
     '值块':[
       MotaActionBlocks['setValue_s'].xmlText([
-        MotaActionBlocks['idString_1_e'].xmlText(['status','生命']), '=', '', false
+        MotaActionBlocks['idIdList_e'].xmlText(['status','生命']), '=', '', false
       ]),
       MotaActionBlocks['expression_arithmetic_0'].xmlText(),
-      MotaActionBlocks['evFlag_e'].xmlText(),
-      MotaActionBlocks['evTemp_e'].xmlText(),
+      MotaActionBlocks['idFlag_e'].xmlText(),
+      MotaActionBlocks['idTemp_e'].xmlText(),
       MotaActionBlocks['negate_e'].xmlText(),
       MotaActionBlocks['bool_e'].xmlText(),
       MotaActionBlocks['idString_e'].xmlText(),
-      MotaActionBlocks['idString_1_e'].xmlText(),
-      MotaActionBlocks['idString_2_e'].xmlText(),
+      MotaActionBlocks['idIdList_e'].xmlText(),
+      MotaActionBlocks['idFixedList_e'].xmlText(),
       MotaActionBlocks['enemyattr_e'].xmlText(),
       MotaActionBlocks['blockId_e'].xmlText(),
       MotaActionBlocks['blockCls_e'].xmlText(),