diff --git a/README.md b/README.md index 50ed514c..de1e27fa 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ HTML5 canvas制作的魔塔样板,支持全平台游戏! **即使完全不会编程的用户,按照模板和说明文档也能很快做出一个魔塔游戏!** +* [List / HTML5魔塔游戏列表](http://mota.pw/) * [Demo / 样板效果](https://ckcz123.com/games/template/) * [Docs / 使用文档说明](https://ckcz123.github.io/mota-js/) * [Video / 视频教程](http://www.bilibili.com/video/av17608025/) diff --git a/_server/blockly/MotaAction.g4 b/_server/blockly/MotaAction.g4 index c553f3bc..027fe661 100644 --- a/_server/blockly/MotaAction.g4 +++ b/_server/blockly/MotaAction.g4 @@ -134,19 +134,19 @@ return code; //changeFloor 事件编辑器入口之一 changeFloor_m - : '楼梯, 传送门' BGNL? Newline '目标楼层' IdString Stair_List 'x' Int ',' 'y' Int '朝向' DirectionEx_List '动画时间' Int? '允许穿透' Bool BEND + : '楼梯, 传送门' BGNL? Newline '目标楼层' IdString Stair_List 'x' Number ',' 'y' Number '朝向' DirectionEx_List '动画时间' Int? '允许穿透' Bool BEND ; /* changeFloor_m tooltip : 楼梯, 传送门, 如果目标楼层有多个楼梯, 写upFloor或downFloor可能会导致到达的楼梯不确定, 这时候请使用loc方式来指定具体的点位置 helpUrl : https://ckcz123.github.io/mota-js/#/element?id=%e8%b7%af%e9%9a%9c%ef%bc%8c%e6%a5%bc%e6%a2%af%ef%bc%8c%e4%bc%a0%e9%80%81%e9%97%a8 default : ["MT1",null,0,0,[['不变',''],['上','up'],['下','down'],['左','left'],['右','right']],500,null] -var loc = ', "loc": ['+Int_0+', '+Int_1+']'; +var loc = ', "loc": ['+Number_0+', '+Number_1+']'; if (Stair_List_0!=='loc')loc = ', "stair": "'+Stair_List_0+'"'; DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"'); -Int_2 = Int_2 ?(', "time": '+Int_2):''; +Int_0 = Int_0 ?(', "time": '+Int_0):''; Bool_0 = Bool_0 ?'':(', "portalWithoutTrigger": false'); -var code = '{"floorId": "'+IdString_0+'"'+loc+DirectionEx_List_0+Int_2+Bool_0+' }\n'; +var code = '{"floorId": "'+IdString_0+'"'+loc+DirectionEx_List_0+Int_0+Bool_0+' }\n'; return code; */ @@ -464,7 +464,7 @@ return code; */ changeFloor_s - : '楼层切换' IdString 'x' Int ',' 'y' Int '朝向' DirectionEx_List '动画时间' Int? Newline + : '楼层切换' IdString 'x' Number ',' 'y' Number '朝向' DirectionEx_List '动画时间' Int? Newline ; /* changeFloor_s @@ -473,13 +473,13 @@ helpUrl : https://ckcz123.github.io/mota-js/#/event?id=changefloor-%e6%a5%bc%e5% default : ["MT1",0,0,[['不变',''],['上','up'],['下','down'],['左','left'],['右','right']],500] colour : this.dataColor DirectionEx_List_0 = DirectionEx_List_0 && (', "direction": "'+DirectionEx_List_0+'"'); -Int_2 = Int_2 ?(', "time": '+Int_2):''; -var code = '{"type": "changeFloor", "floorId": "'+IdString_0+'", "loc": ['+Int_0+', '+Int_1+']'+DirectionEx_List_0+Int_2+' },\n'; +Int_0 = Int_0 ?(', "time": '+Int_0):''; +var code = '{"type": "changeFloor", "floorId": "'+IdString_0+'", "loc": ['+Number_0+', '+Number_1+']'+DirectionEx_List_0+Int_0+' },\n'; return code; */ changePos_0_s - : '位置切换' 'x' Int ',' 'y' Int '朝向' DirectionEx_List Newline + : '位置切换' 'x' Number ',' 'y' Number '朝向' DirectionEx_List Newline ; /* changePos_0_s @@ -988,7 +988,7 @@ StepString ; IdString - : [a-zA-Z_][0-9a-zA-Z_\-:]* + : [0-9a-zA-Z_][0-9a-zA-Z_:]* ; FixedId_List @@ -1415,7 +1415,7 @@ MotaActionFunctions.EvalString_pre = function(EvalString){ MotaActionFunctions.IdString_pre = function(IdString){ if (IdString.indexOf('__door_name__')!==-1) throw new Error('请修改__door_name__,建议如开MT1层的[3,3]点的门, 则使用flag:MT1_3_3作为开门变量'); - if (IdString && !(/^[a-zA-Z_][0-9a-zA-Z_\-:]*$/.test(IdString)))throw new Error('id: '+IdString+'中包含了0-9 a-z A-Z _ - :之外的字符'); + if (IdString && !(/^[0-9a-zA-Z_][0-9a-zA-Z_\-:]*$/.test(IdString)))throw new Error('id: '+IdString+'中包含了0-9 a-z A-Z _ - :之外的字符'); return IdString; } diff --git a/main.js b/main.js index f5f2fea5..ee198da6 100644 --- a/main.js +++ b/main.js @@ -9,6 +9,8 @@ function main() { // 请注意,只有useCompress是false时才会读取floors目录下的文件,为true时会直接读取libs目录下的floors.min.js文件。 // 如果要进行剧本的修改请务必将其改成false。 + this.bgmRemote = false; // 是否采用远程BGM + //------------------------ 用户修改内容 END ------------------------// this.dom = { diff --git a/project/data.comment.js b/project/data.comment.js index 40a8daa0..92601f77 100644 --- a/project/data.comment.js +++ b/project/data.comment.js @@ -32,16 +32,6 @@ data_comment_c456ea59_6018_45ef_8bcc_211a24c627dc = "_type": "textarea", "_data": "在此存放所有的SE,和文件名一致 \n 音频名不能使用中文,不能带空格或特殊字符;可以直接改名拼音就好" }, - "bgmRemote": { - "_leaf": true, - "_type": "select", - "_select": { - "values": [ - false - ] - }, - "_data": "是否使用远程的背景音乐;此项一般不要开启" - }, "startBackground": { "_leaf": true, "_type": "textarea", diff --git a/project/data.js b/project/data.js index 31e53b68..1059227c 100644 --- a/project/data.js +++ b/project/data.js @@ -2,7 +2,7 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = { "main" : { "floorIds" : [ - "sample0", "sample1", "sample2" + "sample0", "sample1", "sample2", "MT0" ], "images" : [ "bg.jpg", @@ -16,7 +16,6 @@ data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "sounds" : [ 'floor.mp3', 'attack.ogg', 'door.ogg', 'item.ogg', 'zone.ogg' ], - "bgmRemote" : false, "startBackground" : "bg.jpg", "startLogoStyle" : "color: black", "levelChoose" : [["简单","Easy"],["普通","Normal"],["困难","Hard"],["噩梦","Hell"]],