From 39f01cd620f4a18878e60a5d844fa73c2a35a10f Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 14 Aug 2021 23:15:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6V2.8=E7=B4=A0=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _server/MotaAction.g4 | 11 ++- _server/MotaActionParser.js | 2 +- editor-mobile.html | 2 +- editor.html | 24 +++--- libs/events.js | 4 +- project/data.js | 56 ++++++++++---- project/enemys.js | 47 ++++++------ project/floors/sample0.js | 132 +++++++++++++++++++------------- project/floors/sample1.js | 23 ++---- project/floors/sample2.js | 3 +- project/functions.js | 32 ++++---- project/icons.js | 109 +++++++++++++------------- project/images/bg.jpg | Bin 61847 -> 27900 bytes project/images/bg2.jpg | Bin 27900 -> 0 bytes project/images/brave.png | Bin 5509 -> 5082 bytes project/items.js | 32 ++++---- project/maps.js | 29 ++++--- project/materials/animates.png | Bin 38365 -> 35724 bytes project/materials/enemys.png | Bin 54232 -> 51283 bytes project/materials/icons.png | Bin 8778 -> 8879 bytes project/materials/items.png | Bin 17991 -> 18696 bytes project/materials/keyboard.png | Bin 17979 -> 27655 bytes project/materials/npc48.png | Bin 5556 -> 22189 bytes project/materials/npcs.png | Bin 20724 -> 21322 bytes project/materials/terrains.png | Bin 21221 -> 24527 bytes project/plugins.js | 2 +- project/sounds/attack.mp3 | Bin 6000 -> 10100 bytes project/sounds/bomb.mp3 | Bin 4329 -> 16477 bytes project/sounds/cancel.mp3 | Bin 6627 -> 12507 bytes project/sounds/error.mp3 | Bin 3178 -> 3387 bytes project/sounds/gem.mp3 | Bin 0 -> 7567 bytes project/sounds/icePickaxe.mp3 | Bin 0 -> 9657 bytes project/sounds/open_ui.mp3 | Bin 9448 -> 2760 bytes project/sounds/pickaxe.mp3 | Bin 3180 -> 7358 bytes project/sounds/recovery.mp3 | Bin 7567 -> 13210 bytes project/sounds/zone.mp3 | Bin 11956 -> 9239 bytes project/tilesets/magictower.png | Bin 165590 -> 199115 bytes 37 files changed, 271 insertions(+), 237 deletions(-) delete mode 100644 project/images/bg2.jpg create mode 100644 project/sounds/gem.mp3 create mode 100644 project/sounds/icePickaxe.mp3 diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4 index 7e8828f4..2aff6d8d 100644 --- a/_server/MotaAction.g4 +++ b/_server/MotaAction.g4 @@ -2797,7 +2797,7 @@ return code; */; choices_s - : '选项' ':' EvalString_Multi? BGNL? '标题' EvalString? '图像' IdString? '默认选中项' Int '超时毫秒数' Int '宽度' IntString? BGNL? Newline choicesContext+ BEND Newline + : '选项' ':' EvalString_Multi? BGNL? '标题' EvalString? '图像' IdString? '超时毫秒数' Int '宽度' IntString? BGNL? Newline choicesContext+ BEND Newline /* choices_s @@ -2816,10 +2816,9 @@ if (EvalString_0==''){ } EvalString_Multi_0 = title+EvalString_Multi_0; EvalString_Multi_0 = EvalString_Multi_0 ?(', "text": "'+EvalString_Multi_0+'"'):''; -Int_0 = Int_0 ? (', "selected": '+Int_0) : ''; -Int_1 = Int_1 ? (', "timeout": '+Int_1) : ''; +Int_0 = Int_0 ? (', "timeout": '+Int_0) : ''; IntString_0 = IntString_0 ? (', "width": ' + IntString_0) : ''; -var code = ['{"type": "choices"',EvalString_Multi_0,Int_0,Int_1,IntString_0, +var code = ['{"type": "choices"',EvalString_Multi_0,Int_0,IntString_0, block.isCollapsed()?', "_collapsed": true':'', block.isEnabled()?'':', "_disabled": true', ', "choices": [\n', @@ -4115,8 +4114,8 @@ MoveMode_List /*MoveMode_List ['', 'easeIn', 'easeOut', 'easeInOut']*/; NameMap_List - : '确定'|'取消'|'操作失败'|'光标移动'|'打开界面'|'读档'|'存档'|'获得道具'|'回血'|'炸弹'|'飞行器'|'开关门'|'上下楼'|'跳跃'|'破墙镐'|'阻激夹域'|'穿脱装备' - /*NameMap_List ['确定','取消','操作失败','光标移动','打开界面','读档','存档','获得道具','回血','炸弹','飞行器','开关门','上下楼','跳跃','破墙镐','阻激夹域','穿脱装备']*/; + : '确定'|'取消'|'操作失败'|'光标移动'|'打开界面'|'读档'|'存档'|'获得道具'|'回血'|'宝石'|'炸弹'|'飞行器'|'开关门'|'上下楼'|'跳跃'|'破墙镐'|'破冰镐'|'阻激夹域'|'穿脱装备'|'商店' + /*NameMap_List ['确定','取消','操作失败','光标移动','打开界面','读档','存档','获得道具','回血','宝石','炸弹','飞行器','开关门','上下楼','跳跃','破墙镐','破冰稿','阻激夹域','穿脱装备','商店']*/; //转blockly后不保留需要加" EvalString diff --git a/_server/MotaActionParser.js b/_server/MotaActionParser.js index 6ba25fe5..7f642a9f 100644 --- a/_server/MotaActionParser.js +++ b/_server/MotaActionParser.js @@ -863,7 +863,7 @@ ActionParser.prototype.parseAction = function() { if (!this.isset(data.text)) data.text = ''; var info = this.getTitleAndPosition(data.text); this.next = MotaActionFunctions.xmlText('choices_s', [ - info[3],info[0],info[1],data.selected||0,data.timeout||0,data.width,text_choices,this.next], /* isShadow */false, /*comment*/ null, /*collapsed*/ data._collapsed, /*disabled*/ data._disabled); + info[3],info[0],info[1],data.timeout||0,data.width,text_choices,this.next], /* isShadow */false, /*comment*/ null, /*collapsed*/ data._collapsed, /*disabled*/ data._disabled); break; case "for": // 循环遍历 this.next = MotaActionFunctions.xmlText('for_s',[ diff --git a/editor-mobile.html b/editor-mobile.html index 77188c74..0356e7c5 100644 --- a/editor-mobile.html +++ b/editor-mobile.html @@ -383,7 +383,7 @@ - +