Merge pull request #44 from zhaouv/dev-2.0-blockly-20180214

Dev 2.0 blockly

_server/css/editor_mode.css

@@ -43,6 +43,13 @@
   width: 440px;
 }
 
+#left6 {
+  left: 5px;
+  top: 1930px;
+  width: 1335px;
+  height: 780px;
+}
+
 .etable table,
 .etable table td {
   color: #000;

_server/editor.js

@@ -11,8 +11,8 @@ editor.prototype.init = function(callback){
     
     editor.reset(function(){
       editor.drawMapBg();
-      var mapArray = core.maps.getMapArray(core.status.maps[core.status.floorId].blocks);
+      var mapArray = core.maps.save(core.status.maps,core.status.floorId);
-      editor.map = mapArray.map(function(v){return v.map(function(v){return editor.ids[[editor.indexs[v][0]]]})});
+      editor.map = mapArray.map(function(v){return v.map(function(v){return editor.ids[[editor.indexs[parseInt(v)][0]]]})});
       editor.updateMap();
       editor.currentFloorId=core.status.floorId;
       editor.currentFloorData = core.floors[core.status.floorId];
@@ -35,7 +35,7 @@ editor.prototype.init = function(callback){
     });
     core.events.setInitData(hard);
   }
-  setTimeout(afterMainInit, 300);
+  setTimeout(afterMainInit, 500);
 }
 
 editor.prototype.reset = function(callback){
@@ -298,8 +298,8 @@ editor.prototype.changeFloor = function(floorId,callback) {
   editor.currentFloorData.map = editor.map.map(function(v){return v.map(function(v){return v.idnum||v||0})});
   core.changeFloor(floorId, null, core.firstData.hero.loc, null, function(){
     editor.drawMapBg();
-    var mapArray = core.maps.getMapArray(core.status.maps[core.status.floorId].blocks);
+    var mapArray = core.maps.save(core.status.maps,core.status.floorId);
-    editor.map = mapArray.map(function(v){return v.map(function(v){return editor.ids[[editor.indexs[v][0]]]})});
+    editor.map = mapArray.map(function(v){return v.map(function(v){return editor.ids[[editor.indexs[parseInt(v)][0]]]})});
     editor.updateMap();
     editor.currentFloorId=core.status.floorId;
     editor.currentFloorData = core.floors[core.status.floorId];

_server/editor_blockly.js

@@ -0,0 +1,362 @@
+editor_blockly = function(){
+
+var editor_blockly = {};
+
+initscript=String.raw`
+(function(){
+  var getCategory = function(name){
+  for(var node of document.getElementById('toolbox').children) {
+    if(node.getAttribute('name')==name) return node;
+  }
+  }
+
+  var toolboxObj = {
+    'entry':[
+      MotaActionFunctions.actionParser.parse([
+        "欢迎使用事件编辑器",
+        "本事件触发一次后会消失",
+        {"type": "hide", "time": 500},
+      ],'event'),
+      MotaActionBlocks['changeFloor_m'].xmlText(),
+      MotaActionFunctions.actionParser.parse({"type": "choices", "choices": [
+        {"text": "攻击+\${point}", "action": [
+          {"type": "setValue", "name": "status:atk", "value": "status:atk+\${point}"},
+        ]},
+        {"text": "防御+\${2*point}", "action": [
+          {"type": "setValue", "name": "status:def", "value": "status:def+\${2*point}"},
+        ]},
+        {"text": "生命+\${200*point}", "action": [
+          {"type": "setValue", "name": "status:hp", "value": "status:hp+\${200*point}"},
+        ]},
+      ]},'point'),
+      MotaActionFunctions.actionParser.parse({
+        "id": "moneyShop1",
+        "name": "贪婪之神", 
+        "icon": "blueShop",
+        "textInList": "1F金币商店", 
+        "use": "money",
+        "need": "20+10*times*(times+1)",  
+        "text": "勇敢的武士啊，给我\${need}金币就可以：", 
+        "choices": [ 
+          {"text": "生命+800", "effect": "status:hp+=800"},
+          {"text": "攻击+4", "effect": "status:atk+=4"},
+          {"text": "防御+4", "effect": "status:def+=4"},
+          {"text": "魔防+10", "effect": "status:mdef+=10"}
+        ]
+      },'shop'),
+      MotaActionBlocks['afterBattle_m'].xmlText(),
+      MotaActionBlocks['afterGetItem_m'].xmlText(),
+      MotaActionBlocks['afterOpenDoor_m'].xmlText(),
+      MotaActionBlocks['firstArrive_m'].xmlText(),
+    ],
+    'statement':[
+      '<label text="显示文字"></label>',
+      MotaActionBlocks['text_0_s'].xmlText(),
+      MotaActionBlocks['text_1_s'].xmlText(),
+      MotaActionBlocks['setText_s'].xmlText(),
+      MotaActionBlocks['showImage_0_s'].xmlText(),
+      MotaActionBlocks['showImage_1_s'].xmlText(),
+      MotaActionBlocks['tip_s'].xmlText(),
+      MotaActionBlocks['openShop_s'].xmlText(),
+      MotaActionBlocks['win_s'].xmlText(),
+      MotaActionBlocks['lose_s'].xmlText(),
+      MotaActionBlocks['choices_s'].xmlText([
+        '选择剑或者盾','流浪者','man',MotaActionBlocks['choicesContext'].xmlText([
+          '剑',MotaActionFunctions.actionParser.parseList([{"type": "openDoor", "loc": [3,3]}]),
+          MotaActionBlocks['choicesContext'].xmlText([
+            '盾',MotaActionFunctions.actionParser.parseList([{"type": "openDoor", "loc": [9,3]}]),
+          ])
+        ])
+      ]),
+      '<label text="数据相关"></label>',
+      MotaActionBlocks['setValue_s'].xmlText(),
+      MotaActionBlocks['update_s'].xmlText(),
+      MotaActionBlocks['moveHero_s'].xmlText(),
+      MotaActionBlocks['changeFloor_s'].xmlText(),
+      MotaActionBlocks['changePos_0_s'].xmlText(),
+      MotaActionBlocks['changePos_1_s'].xmlText(),
+      MotaActionBlocks['battle_s'].xmlText(),
+      MotaActionBlocks['openDoor_s'].xmlText(),
+      MotaActionBlocks['setBlock_s'].xmlText(),
+      '<label text="事件控制"></label>',
+      MotaActionBlocks['if_s'].xmlText(),
+      MotaActionBlocks['revisit_s'].xmlText(),
+      MotaActionBlocks['exit_s'].xmlText(),
+      MotaActionBlocks['show_s'].xmlText(),
+      MotaActionBlocks['hide_s'].xmlText(),
+      MotaActionBlocks['trigger_s'].xmlText(),
+      MotaActionBlocks['move_s'].xmlText(),
+      MotaActionBlocks['disableShop_s'].xmlText(),
+      '<label text="特效/声音"></label>',
+      MotaActionBlocks['sleep_s'].xmlText(),
+      MotaActionBlocks['animate_s'].xmlText(),
+      MotaActionBlocks['setFg_0_s'].xmlText(),
+      MotaActionBlocks['setFg_1_s'].xmlText(),
+      MotaActionBlocks['setWeather_s'].xmlText(),
+      MotaActionBlocks['playBgm_s'].xmlText(),
+      MotaActionBlocks['pauseBgm_s'].xmlText(),
+      MotaActionBlocks['resumeBgm_s'].xmlText(),
+      MotaActionBlocks['playSound_s'].xmlText(),
+      '<label text="其他"></label>',
+      MotaActionBlocks['function_s'].xmlText(),
+    ],
+    'value':[
+      MotaActionBlocks['setValue_s'].xmlText(),
+      MotaActionBlocks['expression_arithmetic_0'].xmlText(),
+      MotaActionBlocks['negate_e'].xmlText(),
+      MotaActionBlocks['bool_e'].xmlText(),
+      MotaActionBlocks['idString_e'].xmlText(),
+      MotaActionBlocks['idString_1_e'].xmlText(),
+      MotaActionBlocks['idString_2_e'].xmlText(),
+      MotaActionBlocks['evalString_e'].xmlText(),
+    ],
+    'template':[
+      '<label text="战前剧情"></label>',
+      MotaActionFunctions.actionParser.parse({ 
+        "trigger": "action", 
+        "displayDamage": true, 
+        "data": [ 
+          ' ... 战前剧情',
+          {"type": "battle", "id": "greenSlime"},
+          ' ... 战后剧情；请注意上面的强制战斗不会使怪物消失',
+          '需要下一句来调用{"type": "hide"}来隐藏事件',
+          {"type": "hide"},
+        ]
+      },'event'),
+      '<label text="打怪掉落道具"></label>',
+      MotaActionFunctions.actionParser.parse([
+        '怪物变成了黄钥匙(黄钥匙idnum是21)',
+        '打怪变成可对话的NPC: https://ckcz123.github.io/mota-js/#/event?id=%e6%89%93%e6%80%aa%e5%8f%98%e6%88%90%e5%8f%af%e5%af%b9%e8%af%9d%e7%9a%84npc%ef%bc%88%e6%80%aa%e7%89%a9-gtnpc%ef%bc%89',
+        {"type": "setBlock", "number": 21}
+      ],'afterBattle'),
+      '<label text="打怪开门"></label>',
+      MotaActionFunctions.actionParser.parse([
+        {"type": "setValue", "name": "flag:__door_name__", "value": "flag:__door_name__+1"},
+        {"type": "if", "condition": "flag:__door_name__==2", 
+          "true": [
+            {"type": "openDoor", "loc": [10,5]}
+          ],
+          "false": [] 
+        },
+      ],'afterBattle'),
+      '<label text="获得圣水后变成墙"></label>',
+      MotaActionFunctions.actionParser.parse({
+        "trigger": "action", 
+        "noPass": true, 
+        "data": [
+          {"type": "if", "condition": "flag:hasSuperPotion", 
+            "true": [], 
+            "false": [
+              {"type":"setValue", "name":"status:hp", "value":"status:hp*2"}, 
+              {"type":"setBlock", "number": 1}, 
+              {"type":"setValue", "name":"flag:hasSuperPotion", "value": "true"} 
+            ]
+          }
+        ]
+      },'event'),
+      '<label text="获取用户输入的字符串"></label>',
+      MotaActionFunctions.actionParser.parseList([
+        {"type": "setValue", "name": "flag:inputMsg", "value": "请输入密码"},
+        {"type": "function", "function": "function(){core.setFlag('input',prompt(core.getFlag('inputMsg','请输入字符串'),'xxx')||'')}"},
+        {"type": "if", "condition": 'flag:input == "123456"',"true": [],"false": []},
+      ]),
+    ],
+  }
+  var toolboxgap = '<sep gap="5"></sep>'
+  //xml_text = MotaActionFunctions.actionParser.parse(obj,type||'event')
+  //MotaActionBlocks['idString_e'].xmlText()
+
+  for (var name in toolboxObj){
+    getCategory(name).innerHTML = toolboxObj[name].join(toolboxgap);
+  }
+
+  var workspace = Blockly.inject('blocklyDiv',{
+  media: '_server/blockly/media/',
+  toolbox: document.getElementById('toolbox'),
+  zoom:{
+    controls: true,
+    wheel: true,//false
+    startScale: 1.0,
+    maxScale: 3,
+    minScale: 0.3,
+    scaleSpeed: 1.08
+  },
+  trashcan: false,
+  });
+
+  var doubleClickCheck=[[0,'abc']];
+  function omitedcheckUpdateFunction(event) {
+  console.log(event);
+  if(event.type==='ui'){
+    var newClick = [new Date().getTime(),event.blockId];
+    var lastClick = doubleClickCheck.shift();
+    doubleClickCheck.push(newClick);
+    if(newClick[0]-lastClick[0]<500){
+      if(newClick[1]===lastClick[1]){
+        editor_blockly.doubleClickBlock(newClick[1]);
+      }
+    }
+  }
+  try {
+    var code = Blockly.JavaScript.workspaceToCode(workspace);
+    document.getElementById('codeArea').value = code;
+  } catch (error) {
+    document.getElementById('codeArea').value = String(error);
+    if (error instanceof OmitedError){
+    var blockName = error.blockName;
+    var varName = error.varName;
+    var block = error.block;
+    }
+    console.log(error);
+  }
+  }
+
+  workspace.addChangeListener(omitedcheckUpdateFunction);
+
+  workspace.addChangeListener(Blockly.Events.disableOrphans);
+
+  editor_blockly.workspace = workspace;
+
+  MotaActionFunctions.workspace = function(){
+    return editor_blockly.workspace;
+  }
+})();
+`;
+
+var input_='';
+editor_blockly.runOne = function (){
+    //var printf = console.log;
+    var printf = function(){};
+    var grammerFile = input_;
+    converter = new Converter().init();
+    converter.generBlocks(grammerFile,[]);
+    printf(converter.blocks);
+    converter.renderGrammerName();
+    converter.generToolbox();
+    converter.generMainFile();
+    printf(converter.mainFile.join(''));
+    console.log(converter);
+
+
+
+    var script = document.createElement('script');
+    //var initscript = document.getElementById('initscript').innerText;
+    script.innerHTML = converter.mainFile[5]+initscript;
+    document.body.appendChild(script);
+}
+var xhr=new XMLHttpRequest();
+xhr.onreadystatechange = function (){
+    if(xhr.readyState!=4) return;
+    if(xhr.status!=200) {
+        alert("无法在file://下加载");
+        return;
+    }
+    input_=xhr.responseText;
+    editor_blockly.runOne();
+}
+xhr.open('GET','_server/blockly/MotaAction.g4',true);
+xhr.send(null);
+
+editor_blockly.showXML = function () {
+  var xml = Blockly.Xml.workspaceToDom(editor_blockly.workspace);
+  var xml_text = Blockly.Xml.domToPrettyText(xml);
+  console.log(xml_text);
+  var xml_text = Blockly.Xml.domToText(xml);
+  console.log(xml_text);
+  console.log(xml);
+}
+
+editor_blockly.runCode = function () {
+  // Generate JavaScript code and run it.
+  window.LoopTrap = 1000;
+  Blockly.JavaScript.INFINITE_LOOP_TRAP =
+    'if (--window.LoopTrap == 0) throw "Infinite loop.";\n';
+  var code = Blockly.JavaScript.workspaceToCode(editor_blockly.workspace);
+  Blockly.JavaScript.INFINITE_LOOP_TRAP = null;
+  try {
+    eval('obj=' + code);
+    console.log(obj);
+  } catch (e) {
+    alert(e);
+  }
+}
+
+editor_blockly.parse = function () {
+    MotaActionFunctions.parse(
+        eval('obj=' + document.getElementById('codeArea').value.replace(/[<>&]/g,function(c){return {'<':'&lt;','>':'&gt;','&':'&amp;'}[c];})),
+        document.getElementById('entryType').value
+    );
+}
+
+editor_blockly.id='';
+
+editor_blockly.import = function(id_){
+  var thisTr = document.getElementById(id_);
+  if(!thisTr)return;
+  var input = thisTr.children[2].children[0].children[0];
+  var field = thisTr.children[0].getAttribute('title');
+  var type = {
+    "['events']":'event',
+    "['changeFloor']":'changeFloor',
+    "['afterBattle']":'afterBattle',
+    "['afterGetItem']":'afterGetItem',
+    "['afterOpenDoor']":'afterOpenDoor',
+    
+    "['firstData']['shops']":'shop',
+
+    "['firstArrive']":'firstArrive',
+    "['firstData']['startText']":'firstArrive',
+
+    "--point--未完成数据转移":'point',
+  }[field];
+  if(!type)return;
+  editor_blockly.id=id_;
+  document.getElementById('codeArea').value = input.value;
+  document.getElementById('entryType').value = type;
+  editor_blockly.parse();
+  editor_blockly.show();
+}
+
+editor_blockly.show = function(){}
+
+editor_blockly.confirm =  function (){
+  if(!editor_blockly.id){
+    editor_blockly.id='';
+    return;
+  }
+  var setvalue = function(value){
+    var thisTr = document.getElementById(editor_blockly.id);
+    editor_blockly.id='';
+    var input = thisTr.children[2].children[0].children[0];
+    input.value = value;
+    input.onchange();
+  }
+  if(document.getElementById('codeArea').value===''){
+    setvalue('null');
+    return;
+  }
+  var code = Blockly.JavaScript.workspaceToCode(editor_blockly.workspace);
+  eval('var obj=' + code);
+  setvalue(JSON.stringify(obj));
+}
+
+editor_blockly.doubleClickBlock = function (blockId){
+  var b=editor_blockly.workspace.getBlockById(blockId);
+  console.log(b);
+  var textStringDict = {
+      'text_0_s':'EvalString_0',
+      'text_1_s':'EvalString_2',
+      'choices_s':'EvalString_0',
+      'function_s':'RawEvalString_0',
+  }
+  var f=textStringDict[b];
+  if(f){
+      var value = b.getFieldValue(f);
+      //多行编辑
+      //func(value,function(newvalue,b,f){b.setFieldValue(newvalue,f);})
+  }
+}
+
+return editor_blockly;
+}
+//editor_blockly=editor_blockly();

_server/editor_mode.js

@@ -59,7 +59,10 @@ editor_mode.prototype.objToTable = function(obj,commentObj){
         editor_mode.onmode(editor_mode._ids[node.getAttribute('id')]);
         editor_mode.addAction(['change',field,JSON.parse(input.value)]);
         //尚未完成,不完善,目前还没做$range的检查
-      };
+      }
+      input.ondblclick = function(){
+        editor_blockly.import(guid);
+      }
     });
   }
   return {"HTML":outstr.join(''),"guids":guids,"listen":listen};
@@ -87,6 +90,7 @@ editor_mode.prototype.objToTr = function(obj,commentObj,field){
   try {
     comment = eval('commentObj'+field);
   } catch (error) {}
+  if(!comment)comment='';
 
   var charlength=10;
 

editor.html

@@ -111,6 +111,34 @@
         </table>
       </div>
     </div></div>
+    <div id="left6" class='leftTab'><div><!-- eventsEditor -->
+      <h3>事件编辑器 &nbsp;&nbsp;
+        <button onclick="editor_blockly.showXML()">Show XML</button>
+        <button onclick="editor_blockly.runCode()">console.log(obj=code)</button>
+        <select id="entryType" disabled="disabled">
+            <option value="event">event</option>
+            <option value="changeFloor">changeFloor</option>
+            <option value="point">point</option>
+            <option value="shop">shop</option>
+            <option value="afterBattle">afterBattle</option>
+            <option value="afterGetItem">afterGetItem</option>
+            <option value="afterOpenDoor">afterOpenDoor</option>
+            <option value="firstArrive">firstArrive</option>
+        </select>
+        <button onclick="editor_blockly.parse()">parse</button>
+        <button onclick="editor_blockly.confirm()">confirm</button>
+        <xml id="toolbox" style="display:none">
+          <category name="entry"></category>
+          <category name="statement"></category>
+          <category name="value"></category>
+          <category name="template"></category>
+        </xml>
+      </h3>
+      <div>
+        <div id="blocklyDiv" style="height: 480px; width: 940px;"></div>
+        <textarea id="codeArea" style="width: 99.5%; height: 15.4em;overflow:y;/* resize:none; */" spellcheck="false"></textarea>
+      </div>
+    </div></div>
     <div id="mid">
       <table class="col" id='mapColMark'></table>
       <table class="row" id='mapRowMark'></table>
@@ -294,8 +322,8 @@
 <script id='mainScript' src='main.js'></script>
 <script>
 //所有全局量
-__all__=['Vue','fs','editor_file','editor_mode','main','core','hasOwnProp','editor'];
+__all__=['Vue','fs','editor_file','editor_mode','main','core','hasOwnProp','editor','converter','ActionParser','MotaActionFunctions','MotaActionBlocks'];
-__id__=['editArea','arrRowMark','mapRowMark','data','bg','dataSelection'];
+__id__=['editArea','arrRowMark','mapRowMark','data','bg','dataSelection','blocklyDiv','codeArea','entryType'];
 __Vue__=['exportM','editArea','editTip','clear','tip','selectBox'];
 //var event = document.getElementById('event');
 
@@ -315,10 +343,20 @@ editor.init(function(){
   editor_mode.floor();
   editor_mode.tower();
   editor_mode.listen();
+  editor_blockly=editor_blockly();
 });
+
+
 //main.listen();
-//core.setHeroMoveTriggerInterval();
 </script>
 
+<!-- blockly -->
+<script src="_server/blockly/Converter.bundle.min.js"></script>
+<script src="_server/blockly/blockly_compressed.js"></script>
+<script src="_server/blockly/blocks_compressed.js"></script>
+<script src="_server/blockly/javascript_compressed.js"></script>
+<script src="_server/blockly/zh-hans.js"></script>
+<script src='_server/editor_blockly.js'></script>
+
 </body>
 </html>

libs/events.js

@@ -119,6 +119,7 @@ events.prototype.setInitData = function (hard) {
     if (hard=='Hard') { // 困难难度
         core.setFlag('hard', 3); // 可以用flag:hard来获得当前难度
     }
+    this.afterLoadData();
 }
 
 ////// 游戏获胜事件 //////
@@ -947,7 +948,7 @@ events.prototype.pushBox = function (data) {
 
     var direction = core.getHeroLoc('direction'), nx=data.x+scan[direction].x, ny=data.y+scan[direction].y;
 
-    if (nx<0||nx>=12||ny<0||ny>=12) return;
+    if (nx<0||nx>12||ny<0||ny>12) return;
 
     var block = core.getBlock(nx, ny, null, false);
     if (block!=null && !(core.isset(block.block.event) && block.block.event.id=='flower'))

project/comment.js

@@ -33,7 +33,7 @@ comment_c456ea59_6018_45ef_8bcc_211a24c627dc =
             "canFlyTo": "该楼能否被楼传器飞到（不能的话在该楼也不允许使用楼传器） \n$select({\"values\":[true,false]})$end",
             "canUseQuickShop": "该层是否允许使用快捷商店 \n$select({\"values\":[true,false]})$end",
             "defaultGround": "默认地面的图块ID（terrains中） ",
-            "png": "背景图；你可以选择一张png图片来作为背景素材。详细用法请参见文档“自定义素材”中的说明。 ",
+            "png": "背景图；你可以选择一张png图片来作为背景素材。详细用法请参见文档“自定义素材”中的说明。 \n$leaf(true)$end",
             "color": "该层的默认画面色调。本项可不写（代表无色调），如果写需要是一个RGBA数组。 \n$leaf(true)$end",
             "bgm": "到达该层后默认播放的BGM。本项可忽略。 ",
             //"map": "地图数据，需要是13x13，建议使用地图生成器来生成 ",