Merge pull request #139 from ckcz123/v2.0

V2.0
This commit is contained in:
Zhang Chen 2018-06-06 00:21:10 +08:00 committed by GitHub
commit 1e68fb92bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions

View File

@ -11,7 +11,7 @@ editor_blockly = function () {
}
var toolboxObj = {
'entry':[
'入口方块':[
MotaActionFunctions.actionParser.parse([
"欢迎使用事件编辑器",
"本事件触发一次后会消失",
@ -49,7 +49,7 @@ editor_blockly = function () {
MotaActionBlocks['afterOpenDoor_m'].xmlText(),
MotaActionBlocks['firstArrive_m'].xmlText(),
],
'statement':[
'语句块':[
'<label text="显示文字"></label>',
MotaActionBlocks['text_0_s'].xmlText(),
MotaActionBlocks['text_1_s'].xmlText(),
@ -119,7 +119,7 @@ editor_blockly = function () {
'<label text="其他"></label>',
MotaActionBlocks['function_s'].xmlText(),
],
'value':[
'值块':[
MotaActionBlocks['setValue_s'].xmlText(),
MotaActionBlocks['expression_arithmetic_0'].xmlText(),
MotaActionBlocks['negate_e'].xmlText(),
@ -129,7 +129,7 @@ editor_blockly = function () {
MotaActionBlocks['idString_2_e'].xmlText(),
MotaActionBlocks['evalString_e'].xmlText(),
],
'template':[
'常见事件模板':[
'<label text="检测音乐如果没有开启则系统提示开启"></label>',
MotaActionFunctions.actionParser.parseList({"type": "if", "condition": "!core.musicStatus.bgmStatus",
"true": [

View File

@ -159,10 +159,10 @@
<button onclick="editor_blockly.parse()">解析</button>
<button onclick="editor_blockly.cancel()">取消</button>
<xml id="toolbox" style="display:none">
<category name="entry"></category>
<category name="statement"></category>
<category name="value"></category>
<category name="template"></category>
<category name="入口方块"></category>
<category name="语句块"></category>
<category name="值块"></category>
<category name="常见事件模板"></category>
</xml>
</h3>
<div style="position: relative;height: 100%">

View File

@ -13,6 +13,8 @@ functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
core.material.items.pickaxe.text = "可以破坏勇士四周的墙";
if (core.flags.bombFourDirections)
core.material.items.bomb.text = "可以炸掉勇士四周的怪物";
if (core.flags.snowFourDirections)
core.material.items.bomb.text = "可以将四周的熔岩变成平地";
if (core.flags.equipment) {
core.material.items.sword1.cls = 'constants';
core.material.items.sword2.cls = 'constants';

View File

@ -131,7 +131,7 @@ items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a =
"snow": {
"cls": "constants",
"name": "冰冻徽章",
"text": "可以将四周的熔岩变成平地"
"text": "可以将面前的熔岩变成平地"
},
"cross": {
"cls": "constants",