diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 5650453f..e870f95b 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -26,17 +26,6 @@ code=JSON.stringify(code,null,2).split('"data_asdfefw"').join('[\n'+action_0+']\ return code; */; -//加点 事件编辑器入口之一 -point_m - : '加点' BGNL? Newline choicesContext+ BEND - - -/* point_m -tooltip : 加点事件 -helpUrl : https://h5mota.com/games/template/docs/#/event?id=%e5%8a%a0%e7%82%b9%e4%ba%8b%e4%bb%b6 -var code = '{"type": "choices", "choices": [\n'+choicesContext_0+']}\n'; -return code; -*/; //升级 事件编辑器入口之一 level_m @@ -217,6 +206,18 @@ var code = '{"floorId": "'+toFloorId+'"'+loc+DirectionEx_List_0+Int_0+Bool_0+' } return code; */; +//commonEvent 事件编辑器入口之一 +commonEvent_m + : '公共事件' BGNL? Newline action+ BEND + + +/* commonEvent_m +tooltip : 公共事件 +helpUrl : https://h5mota.com/games/template/docs/#/event +var code = '[\n'+action_0+']\n'; +return code; +*/; + //为了避免关键字冲突,全部加了_s //动作 action @@ -1960,15 +1961,6 @@ ActionParser.prototype.parse = function (obj,type) { obj.time,!this.isset(obj.portalWithoutTrigger) ]); - case 'point': - if(!obj)obj={}; - var text_choices = null; - for(var ii=obj.choices.length-1,choice;choice=obj.choices[ii];ii--) { - text_choices=MotaActionBlocks['choicesContext'].xmlText([ - choice.text,this.parseList(choice.action),text_choices]); - } - return MotaActionBlocks['point_m'].xmlText([text_choices]); - case 'level': if(!obj)obj={}; var text_choices = null; diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index 202f142f..910e6188 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -23,17 +23,6 @@ editor_blockly = function () { {"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": "贪婪之神", @@ -55,6 +44,7 @@ editor_blockly = function () { MotaActionBlocks['firstArrive_m'].xmlText(), MotaActionBlocks['eachArrive_m'].xmlText(), MotaActionBlocks['level_m'].xmlText(), + MotaActionBlocks['commonEvent_m'].xmlText(), ], '显示文字':[ MotaActionBlocks['text_0_s'].xmlText(), diff --git a/editor-mobile.html b/editor-mobile.html index e4116e16..33e2c3f9 100644 --- a/editor-mobile.html +++ b/editor-mobile.html @@ -185,7 +185,6 @@ diff --git a/editor.html b/editor.html index e67d5fe3..ff424f31 100644 --- a/editor.html +++ b/editor.html @@ -181,7 +181,6 @@