From d6eb3bab65c2b6dd1a13d6e9018b532d7326082f Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Tue, 27 Nov 2018 17:19:24 +0800 Subject: [PATCH] autoText --- _server/blockly/MotaAction.g4 | 2 +- _server/editor_blockly.js | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index 9d570ac4..188df1e3 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -331,7 +331,7 @@ autoText_s /* autoText_s tooltip : autoText：自动剧情文本,用户无法跳过自动剧情文本,大段剧情文本请添加“是否跳过剧情”的提示 helpUrl : https://h5mota.com/games/template/docs/#/event?id=autotext%EF%BC%9A%E8%87%AA%E5%8A%A8%E5%89%A7%E6%83%85%E6%96%87%E6%9C%AC -default : ["小妖精","fairy","",3000,"双击方块进入多行编辑\\n自动剧情文本\\n自动剧情文本\\n自动剧情文本"] +default : ["小妖精","fairy","",3000,"用户无法跳过自动剧情文本，大段剧情文本请添加“是否跳过剧情”的提示"] var title=''; if (EvalString_0==''){ if (IdString_0=='')title=''; diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index dddcbddd..86e8466c 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -58,13 +58,7 @@ editor_blockly = function () { MotaActionBlocks['text_0_s'].xmlText(), MotaActionBlocks['text_1_s'].xmlText(), MotaActionBlocks['comment_s'].xmlText(), - MotaActionFunctions.actionParser.parseList({"type": "choices", "text": "是否跳过剧情", "choices": [ - {"text": "是", "action": []}, - {"text": "否", "action": [ - {"type": "autoText", "text": "\\t[小妖精,fairy]双击方块进入多行编辑\\n用户无法跳过自动剧情文本,大段剧情文本请添加“是否跳过剧情”的提示\\n自动剧情文本\\n自动剧情文本\\n自动剧情文本", "time" :3000}, - {"type": "autoText", "text": "(可以右键方块后点复制)", "time" :3000}, - ]}, - ]}), + MotaActionBlocks['autoText_s'].xmlText(), MotaActionBlocks['setText_s'].xmlText(), MotaActionBlocks['showImage_0_s'].xmlText(), MotaActionBlocks['animateImage_0_s'].xmlText(),