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

修复额外素材可通行性问题

Browse Source
This commit is contained in:
ckcz123 2020-05-28 20:37:07 +08:00
parent fa82673848
commit 8220860c68
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_server/editor_file.js
View File

@ -401,7 +401,7 @@ editor_file = function (editor, callback) {
var mapActions = []; var mapActions = [];
iconActions.push(["add", "['autotile']['" + filename + "']", 0]); iconActions.push(["add", "['autotile']['" + filename + "']", 0]);
mapActions.push(["add", "['" + idnum + "']", {'cls': 'autotile', 'id': filename, 'noPass': true}]); mapActions.push(["add", "['" + idnum + "']", {'cls': 'autotile', 'id': filename}]);
var templist = []; var templist = [];
var tempcallback = function (err) { var tempcallback = function (err) {
@ -575,7 +575,7 @@ editor_file = function (editor, callback) {
var value=actionList[ii]; var value=actionList[ii];
// 是tilesets 且未定义 且在这里是第一次定义 // 是tilesets 且未定义 且在这里是第一次定义
if(idnum>=editor.core.icons.tilesetStartOffset && !isset(editor.core.maps.blocksInfo[idnum]) && tempmap.indexOf(idnum)===-1){ if(idnum>=editor.core.icons.tilesetStartOffset && !isset(editor.core.maps.blocksInfo[idnum]) && tempmap.indexOf(idnum)===-1){
actionList.splice(ii,0,["add","['" + idnum + "']",{"cls": "tileset", "id": "X"+idnum, "noPass": true}]); actionList.splice(ii,0,["add","['" + idnum + "']",{"cls": "tileset", "id": "X"+idnum}]);
tempmap.push(idnum); tempmap.push(idnum);
ii++; ii++;
} }
@ -588,7 +588,7 @@ editor_file = function (editor, callback) {
callback([ callback([
(function () { (function () {
var sourceobj=editor.core.maps.blocksInfo[idnum]; var sourceobj=editor.core.maps.blocksInfo[idnum];
if(!isset(sourceobj) && idnum>=editor.core.icons.tilesetStartOffset)sourceobj={"cls": "tileset", "id": "X"+idnum, "noPass": true} if(!isset(sourceobj) && idnum>=editor.core.icons.tilesetStartOffset)sourceobj={"cls": "tileset", "id": "X"+idnum}
var locObj = Object.assign({}, sourceobj); var locObj = Object.assign({}, sourceobj);
Object.keys(editor.file.comment._data.maps._data).forEach(function (v) { Object.keys(editor.file.comment._data.maps._data).forEach(function (v) {
if (!isset(sourceobj[v])) if (!isset(sourceobj[v]))

4
libs/maps.js
View File

@ -138,9 +138,9 @@ maps.prototype.initBlock = function (x, y, id, addInfo, eventFloor) {
var block = {'x': x, 'y': y, 'id': id}; var block = {'x': x, 'y': y, 'id': id};
if (disable != null) block.disable = disable; if (disable != null) block.disable = disable;
if (id == 17) block.event = {"cls": "terrains", "id": "airwall", "noPass": true, "cannotIn":["up", "down", "left", "right"]}; if (id == 17) block.event = {"cls": "terrains", "id": "airwall", "cannotIn":["up", "down", "left", "right"]};
else if (id in this.blocksInfo) block.event = JSON.parse(JSON.stringify(this.blocksInfo[id])); else if (id in this.blocksInfo) block.event = JSON.parse(JSON.stringify(this.blocksInfo[id]));
else if (core.icons.getTilesetOffset(id)) block.event = {"cls": "tileset", "id": "X" + id, "noPass": true}; else if (core.icons.getTilesetOffset(id)) block.event = {"cls": "tileset", "id": "X" + id};
else block.event = {'cls': 'terrains', 'id': 'none', 'noPass': false}; else block.event = {'cls': 'terrains', 'id': 'none', 'noPass': false};
if (block.event.noPass == null) { if (block.event.noPass == null) {