jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

图块属性noPass -> canPass

Browse Source
This commit is contained in:
ckcz123 2020-05-06 14:24:34 +08:00
parent b55388a499
commit 5ab15d998d
5 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/css/editor_mode.css
View File

@ -223,7 +223,7 @@ div.etableInputDiv {
.etableInputDiv .cannotInOutCheckbox {
width: 16px;
height: 16px;
display: inline;
display: inline-block;
}
.etableInputDiv textarea {

15
_server/table/comment.js
View File

@ -95,7 +95,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
}
}
},
"items_template": { 'cls': 'items', 'name': '新物品' },
"items_template": { 'cls': 'items', 'name': '新物品', 'canPass': true },
// --------------------------- 【怪物】相关的表格配置 --------------------------- //
@ -248,17 +248,10 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
},
"_data": "该图块的默认触发器"
},
"noPass": {
"canPass": {
"_leaf": true,
"_type": "select",
"_select": {
"values": [
"null",
"true",
"false"
]
},
"_data": "该图块是否不可通行；true代表不可通行，false代表可通行，null代表使用系统缺省值"
"_type": "checkbox",
"_data": "该图块是否可以通行；true代表可以通行，false代表不可通行"
},
"script": {
"_leaf": true,

15
libs/maps.js
View File

@ -109,8 +109,14 @@ maps.prototype.initBlock = function (x, y, id, addInfo, eventFloor) {
else if (core.icons.getTilesetOffset(id)) block.event = {"cls": "tileset", "id": "X" + id, "noPass": true};
else block.event = {'cls': 'terrains', 'id': 'none', 'noPass': false};
if (typeof block.event.noPass === 'string')
block.event.noPass = JSON.parse(block.event.noPass);
if (block.event.noPass == null) {
if (block.event.canPass == null) {
block.event.noPass = block.event.cls != 'items';
} else {
block.event.noPass = !block.event.canPass;
}
}
delete block.event.canPass;
if (addInfo) this._addInfo(block);
if (eventFloor) {
@ -130,11 +136,6 @@ maps.prototype._addInfo = function (block) {
if (block.event.cls == 'items' && !block.event.trigger) {
block.event.trigger = 'getItem';
}
if (block.event.noPass == null) {
if (block.event.cls != 'items') {
block.event.noPass = true;
}
}
if (block.event.animate == null) {
block.event.animate = core.icons._getAnimateFrames(block.event.cls, false);
}

60
project/maps.js
View File

@ -3,20 +3,20 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"1": {"cls":"animates","id":"yellowWall","canBreak":true,"animate":1,"doorInfo":[null,"door.mp3","door.mp3"]},
"2": {"cls":"animates","id":"whiteWall","canBreak":true,"animate":1,"doorInfo":[null,"door.mp3","door.mp3"]},
"3": {"cls":"animates","id":"blueWall","canBreak":true,"animate":1,"doorInfo":[null,"door.mp3","door.mp3"]},
"4": {"cls":"animates","id":"star","noPass":true},
"5": {"cls":"animates","id":"lava","noPass":true},
"4": {"cls":"animates","id":"star"},
"5": {"cls":"animates","id":"lava"},
"6": {"cls":"terrains","id":"ice"},
"7": {"cls":"terrains","id":"blueShopLeft"},
"8": {"cls":"terrains","id":"blueShopRight"},
"9": {"cls":"terrains","id":"pinkShopLeft"},
"10": {"cls":"terrains","id":"pinkShopRight"},
"11": {"cls":"animates","id":"lavaNet","noPass":false,"trigger":"passNet"},
"12": {"cls":"animates","id":"poisonNet","noPass":false,"trigger":"passNet"},
"13": {"cls":"animates","id":"weakNet","noPass":false,"trigger":"passNet"},
"14": {"cls":"animates","id":"curseNet","noPass":false,"trigger":"passNet"},
"15": {"cls":"animates","id":"blueWater","noPass":true},
"16": {"cls":"animates","id":"water","noPass":true},
"20": {"cls":"autotile","id":"autotile","noPass":true},
"11": {"cls":"animates","id":"lavaNet","canPass":true,"trigger":"passNet"},
"12": {"cls":"animates","id":"poisonNet","canPass":true,"trigger":"passNet"},
"13": {"cls":"animates","id":"weakNet","canPass":true,"trigger":"passNet"},
"14": {"cls":"animates","id":"curseNet","canPass":true,"trigger":"passNet"},
"15": {"cls":"animates","id":"blueWater"},
"16": {"cls":"animates","id":"water"},
"20": {"cls":"autotile","id":"autotile"},
"21": {"cls":"items","id":"yellowKey"},
"22": {"cls":"items","id":"blueKey"},
"23": {"cls":"items","id":"redKey"},
@ -74,14 +74,14 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"84": {"cls":"animates","id":"greenDoor","trigger":"openDoor","animate":1,"doorInfo":[{"greenKey":1},"door.mp3","door.mp3"]},
"85": {"cls":"animates","id":"specialDoor","trigger":"openDoor","animate":1,"doorInfo":[null,"door.mp3","door.mp3"]},
"86": {"cls":"animates","id":"steelDoor","trigger":"openDoor","animate":1,"doorInfo":[{"steelKey":1},"door.mp3","door.mp3"]},
"87": {"cls":"terrains","id":"upFloor","noPass":false},
"88": {"cls":"terrains","id":"downFloor","noPass":false},
"89": {"cls":"animates","id":"portal","noPass":false},
"90": {"cls":"animates","id":"starPortal","noPass":false},
"91": {"cls":"animates","id":"upPortal","noPass":false},
"92": {"cls":"animates","id":"leftPortal","noPass":false},
"93": {"cls":"animates","id":"downPortal","noPass":false},
"94": {"cls":"animates","id":"rightPortal","noPass":false},
"87": {"cls":"terrains","id":"upFloor","canPass":true},
"88": {"cls":"terrains","id":"downFloor","canPass":true},
"89": {"cls":"animates","id":"portal","canPass":true},
"90": {"cls":"animates","id":"starPortal","canPass":true},
"91": {"cls":"animates","id":"upPortal","canPass":true},
"92": {"cls":"animates","id":"leftPortal","canPass":true},
"93": {"cls":"animates","id":"downPortal","canPass":true},
"94": {"cls":"animates","id":"rightPortal","canPass":true},
"101": {"cls":"animates","id":"crystalUp"},
"102": {"cls":"animates","id":"crystalBottom"},
"103": {"cls":"animates","id":"fire"},
@ -102,19 +102,19 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e =
"134": {"cls":"npc48","id":"npc1","faceIds":{"down":"npc0","left":"npc1","right":"npc2","up":"npc3"}},
"135": {"cls":"npc48","id":"npc2","faceIds":{"down":"npc0","left":"npc1","right":"npc2","up":"npc3"}},
"136": {"cls":"npc48","id":"npc3","faceIds":{"down":"npc0","left":"npc1","right":"npc2","up":"npc3"}},
"151": {"cls":"autotile","id":"autotile1","noPass":true},
"152": {"cls":"autotile","id":"autotile2","noPass":true},
"153": {"cls":"autotile","id":"autotile3","noPass":true},
"161": {"cls":"terrains","id":"arrowUp","noPass":false,"cannotOut":["left","right","down"],"cannotIn":["up"]},
"162": {"cls":"terrains","id":"arrowDown","noPass":false,"cannotOut":["left","right","up"],"cannotIn":["down"]},
"163": {"cls":"terrains","id":"arrowLeft","noPass":false,"cannotOut":["up","down","right"],"cannotIn":["left"]},
"164": {"cls":"terrains","id":"arrowRight","noPass":false,"cannotOut":["up","down","left"],"cannotIn":["right"]},
"165": {"cls":"terrains","id":"light","trigger":"changeLight","noPass":false},
"166": {"cls":"terrains","id":"darkLight","noPass":true},
"167": {"cls":"terrains","id":"ski","trigger":"ski","noPass":false},
"168": {"cls":"terrains","id":"flower","noPass":false},
"169": {"cls":"terrains","id":"box","trigger":"pushBox","noPass":true},
"170": {"cls":"terrains","id":"boxed","trigger":"pushBox","noPass":true},
"151": {"cls":"autotile","id":"autotile1"},
"152": {"cls":"autotile","id":"autotile2"},
"153": {"cls":"autotile","id":"autotile3"},
"161": {"cls":"terrains","id":"arrowUp","canPass":true,"cannotOut":["left","right","down"],"cannotIn":["up"]},
"162": {"cls":"terrains","id":"arrowDown","canPass":true,"cannotOut":["left","right","up"],"cannotIn":["down"]},
"163": {"cls":"terrains","id":"arrowLeft","canPass":true,"cannotOut":["up","down","right"],"cannotIn":["left"]},
"164": {"cls":"terrains","id":"arrowRight","canPass":true,"cannotOut":["up","down","left"],"cannotIn":["right"]},
"165": {"cls":"terrains","id":"light","trigger":"changeLight","canPass":true},
"166": {"cls":"terrains","id":"darkLight"},
"167": {"cls":"terrains","id":"ski","trigger":"ski","canPass":true},
"168": {"cls":"terrains","id":"flower","canPass":true},
"169": {"cls":"terrains","id":"box","trigger":"pushBox"},
"170": {"cls":"terrains","id":"boxed","trigger":"pushBox"},
"181": {"cls":"npcs","id":"wlt"},
"182": {"cls":"npcs","id":"wt"},
"183": {"cls":"npcs","id":"wrt"},

2
v2.x-final更新.txt
View File

@ -24,7 +24,7 @@
（已完成！） 对floorIds和图片进行检测
（已完成！） 删除绘图模式
（已完成！） 清除最近使用图块
（已完成！） cannotIn / cannotOut使用选项框
（不处理） 0. 部分文案的修改，如“地图编辑器”（启动服务.exe中）、“enemys”、“snipe”