From a6c602f4e2454726edf1dd41a3860588c2868fbc Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Mon, 27 Aug 2018 17:02:26 +0800
Subject: [PATCH] editor : blockly

response to feedback
---
 _server/blockly/MotaAction.g4 |  8 ++++----
 _server/editor_blockly.js     | 23 +++++++++++++++--------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4
index 3a19e2ac..7cca7805 100644
--- a/_server/blockly/MotaAction.g4
+++ b/_server/blockly/MotaAction.g4
@@ -1307,12 +1307,12 @@ IdString
     ;
 
 FixedId_List
-    :   'item:blueKey'|'status:hp'|'status:atk'|'status:def'|'item:yellowKey'
-    ;
+    :   '生命'|'攻击'|'防御'|'魔防'|'黄钥匙'|'蓝钥匙'|'红钥匙'|'金币'|'经验'
+    /*FixedId_List ['status:hp','status:atk','status:def','status:mdef','item:yellowKey','item:blueKey','item:redKey','status:money','status:experience']*/;
 
 Id_List
-    :   'flag' | 'status' | 'item'
-    ;
+    :   '变量' | '状态' | '物品'
+    /*Id_List ['flag','status','item']*/;
 
 //转blockly后不保留需要加"
 EvalString
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index b35decf8..12805b87 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -53,8 +53,7 @@ editor_blockly = function () {
       MotaActionBlocks['afterOpenDoor_m'].xmlText(),
       MotaActionBlocks['firstArrive_m'].xmlText(),
     ],
-    '语句块':[
-      '<label text="显示文字"></label>',
+    '显示文字':[
       MotaActionBlocks['text_0_s'].xmlText(),
       MotaActionBlocks['text_1_s'].xmlText(),
       MotaActionFunctions.actionParser.parseList({"type": "choices", "text": "是否跳过剧情", "choices": [
@@ -83,8 +82,11 @@ editor_blockly = function () {
           ])
         ])
       ]),
-      '<label text="数据相关"></label>',
-      MotaActionBlocks['setValue_s'].xmlText(),
+    ],
+    '数据相关':[
+      MotaActionBlocks['setValue_s'].xmlText([
+        MotaActionBlocks['idString_1_e'].xmlText(['status','hp'])
+      ]),
       MotaActionBlocks['input_s'].xmlText(),
       MotaActionBlocks['update_s'].xmlText(),
       MotaActionBlocks['updateEnemys_s'].xmlText(),
@@ -100,7 +102,8 @@ editor_blockly = function () {
       MotaActionBlocks['setHeroIcon_s'].xmlText(),
       MotaActionBlocks['follow_s'].xmlText(),
       MotaActionBlocks['unfollow_s'].xmlText(),
-      '<label text="事件控制"></label>',
+    ],
+    '事件控制':[
       MotaActionBlocks['if_s'].xmlText(),
       MotaActionBlocks['while_s'].xmlText(),
       MotaActionBlocks['break_s'].xmlText(),
@@ -113,7 +116,8 @@ editor_blockly = function () {
       MotaActionBlocks['move_s'].xmlText(),
       MotaActionBlocks['jump_s'].xmlText(),
       MotaActionBlocks['disableShop_s'].xmlText(),
-      '<label text="特效/声音"></label>',
+    ],
+    '特效/声音':[
       MotaActionBlocks['sleep_s'].xmlText(),
       MotaActionBlocks['wait_s'].xmlText(),
       MotaActionBlocks['viberate_s'].xmlText(),
@@ -126,11 +130,14 @@ editor_blockly = function () {
       MotaActionBlocks['resumeBgm_s'].xmlText(),
       MotaActionBlocks['playSound_s'].xmlText(),
       MotaActionBlocks['setVolume_s'].xmlText(),
-      '<label text="其他"></label>',
+    ],
+    '原生脚本':[
       MotaActionBlocks['function_s'].xmlText(),
     ],
     '值块':[
-      MotaActionBlocks['setValue_s'].xmlText(),
+      MotaActionBlocks['setValue_s'].xmlText([
+        MotaActionBlocks['idString_1_e'].xmlText(['status','hp'])
+      ]),
       MotaActionBlocks['expression_arithmetic_0'].xmlText(),
       MotaActionBlocks['negate_e'].xmlText(),
       MotaActionBlocks['bool_e'].xmlText(),