Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214

This commit is contained in:
YouWei Zhao 2018-02-20 22:55:58 +08:00
commit c41f2a49e7

View File

@ -359,7 +359,7 @@ events.prototype.doAction = function() {
y=data.loc[1];
}
var floorId = data.floorId||core.status.floorId;
var originBlock=core.getBlock(x,y,toId,false);
var originBlock=core.getBlock(x,y,floorId,false);
var block = core.maps.getBlock(x,y,data.number);
core.maps.addInfo(block);
core.maps.addEvent(block,x,y,core.floors[floorId].events[x+","+y]);