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

Fix setBlock in bigmap

Browse Source
This commit is contained in:
oc 2018-12-31 14:11:45 +08:00
parent 4400e24575
commit f0c31a2d0a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/maps.js
View File

@ -1268,7 +1268,7 @@ maps.prototype.setBlock = function (number, x, y, floorId) {
floorId = floorId || core.status.floorId; floorId = floorId || core.status.floorId;
if (!core.isset(floorId)) return; if (!core.isset(floorId)) return;
if (!core.isset(number) || !core.isset(x) || !core.isset(y)) return; if (!core.isset(number) || !core.isset(x) || !core.isset(y)) return;
if (x<0 || x>=core.bigmap.width || y<0 || y>=core.bigmap.height) return; if (x<0 || x>=(core.floors[floorId].width||13) || y<0 || y>=(core.floors[floorId].height||13)) return;
var originBlock=core.getBlock(x,y,floorId,true); var originBlock=core.getBlock(x,y,floorId,true);
var block = core.maps.initBlock(x,y,number); var block = core.maps.initBlock(x,y,number);
@ -1276,6 +1276,15 @@ maps.prototype.setBlock = function (number, x, y, floorId) {
core.maps.addEvent(block,x,y,core.floors[floorId].events[x+","+y]); core.maps.addEvent(block,x,y,core.floors[floorId].events[x+","+y]);
core.maps.addChangeFloor(block,x,y,core.floors[floorId].changeFloor[x+","+y]); core.maps.addChangeFloor(block,x,y,core.floors[floorId].changeFloor[x+","+y]);
if (core.isset(block.event)) { if (core.isset(block.event)) {
if (floorId == core.status.floorId) {
core.removeGlobalAnimate(x, y);
core.clearMap('event', x * 32, y * 32, 32, 32);
if (originBlock != null) {
var height = (originBlock.block.event||{}).height||32;
if (height>32)
core.clearMap('event2', x * 32, y * 32 +32-height, 32, height-32);
}
}
if (originBlock==null) { if (originBlock==null) {
core.status.maps[floorId].blocks.push(block); core.status.maps[floorId].blocks.push(block);
} }
@ -1286,10 +1295,8 @@ maps.prototype.setBlock = function (number, x, y, floorId) {
} }
if (floorId==core.status.floorId && !block.disable) { if (floorId==core.status.floorId && !block.disable) {
core.drawBlock(block); core.drawBlock(block);
if (originBlock == null) { core.addGlobalAnimate(block);
core.addGlobalAnimate(block); core.syncGlobalAnimate();
core.syncGlobalAnimate();
}
core.updateStatusBar(); core.updateStatusBar();
} }
} }
@ -1300,7 +1307,7 @@ maps.prototype.setBgFgBlock = function (name, number, x, y, floorId) {
floorId = floorId || core.status.floorId; floorId = floorId || core.status.floorId;
if (!core.isset(floorId)) return; if (!core.isset(floorId)) return;
if (!core.isset(number) || !core.isset(x) || !core.isset(y)) return; if (!core.isset(number) || !core.isset(x) || !core.isset(y)) return;
if (x<0 || x>=core.bigmap.width || y<0 || y>=core.bigmap.height) return; if (x<0 || x>=(core.floors[floorId].width||13) || y<0 || y>=(core.floors[floorId].height||13)) return;
if (name!='bg' && name!='fg') return; if (name!='bg' && name!='fg') return;
core.setFlag(name+"v_"+floorId+"_"+x+"_"+y, number); core.setFlag(name+"v_"+floorId+"_"+x+"_"+y, number);