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

Foreground Image: event2 -> fg

Browse Source
This commit is contained in:
ckcz123 2018-09-13 14:52:41 +08:00
parent 97aa203d94
commit 8bc24c50c3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/maps.js
View File

@ -249,7 +249,7 @@ maps.prototype.canMoveHero = function(x,y,direction,floorId) {
var nowBlock = core.getBlock(x,y,floorId); var nowBlock = core.getBlock(x,y,floorId);
if (nowBlock!=null){ if (nowBlock!=null){
nowId = nowBlock.block.event.id; var nowId = nowBlock.block.event.id;
var nowIsArrow = nowId.slice(0, 5).toLowerCase() == 'arrow'; var nowIsArrow = nowId.slice(0, 5).toLowerCase() == 'arrow';
if(nowIsArrow){ if(nowIsArrow){
var nowArrow = nowId.slice(5).toLowerCase(); var nowArrow = nowId.slice(5).toLowerCase();
@ -267,7 +267,7 @@ maps.prototype.canMoveHero = function(x,y,direction,floorId) {
var nx = x+scan[direction].x, ny = y+scan[direction].y; var nx = x+scan[direction].x, ny = y+scan[direction].y;
var nextBlock = core.getBlock(nx,ny); var nextBlock = core.getBlock(nx,ny);
if (nextBlock!=null){ if (nextBlock!=null){
nextId = nextBlock.block.event.id; var nextId = nextBlock.block.event.id;
// 遇到单向箭头处理 // 遇到单向箭头处理
var isArrow = nextId.slice(0, 5).toLowerCase() == 'arrow'; var isArrow = nextId.slice(0, 5).toLowerCase() == 'arrow';
if(isArrow){ if(isArrow){
@ -387,7 +387,7 @@ maps.prototype.drawMap = function (mapName, callback) {
var drawBg = function(){ var drawBg = function(){
core.maps.drawBgFgMap(mapName, core.canvas.bg, "bg"); core.maps.drawBgFgMap(mapName, core.canvas.bg, "bg");
core.maps.drawBgFgMap(mapName, core.canvas.event2, "event2"); core.maps.drawBgFgMap(mapName, core.canvas.fg, "fg");
var images = []; var images = [];
if (core.isset(core.floors[mapName].images)) { if (core.isset(core.floors[mapName].images)) {
@ -419,9 +419,9 @@ maps.prototype.drawMap = function (mapName, callback) {
} }
} }
else if (t[3]==1) else if (t[3]==1)
core.canvas.event2.drawImage(image, 32*dx, 32*dy, image.width, image.height); core.canvas.fg.drawImage(image, 32*dx, 32*dy, image.width, image.height);
else if (t[3]==2) { else if (t[3]==2) {
core.canvas.event2.drawImage(image, 0, 0, image.width, image.height-32, core.canvas.fg.drawImage(image, 0, 0, image.width, image.height-32,
32*dx, 32*dy, image.width, image.height-32); 32*dx, 32*dy, image.width, image.height-32);
core.canvas.bg.drawImage(image, 0, image.height-32, image.width, 32, core.canvas.bg.drawImage(image, 0, image.height-32, image.width, 32,
32*dx, 32*dy + image.height - 32, image.width, 32); 32*dx, 32*dy + image.height - 32, image.width, 32);
@ -469,6 +469,7 @@ maps.prototype.drawMap = function (mapName, callback) {
core.clearMap('bg'); core.clearMap('bg');
core.clearMap('event'); core.clearMap('event');
core.clearMap('event2'); core.clearMap('event2');
core.clearMap('fg');
drawBg(); drawBg();
drawEvent(); drawEvent();
core.setGlobalAnimate(core.values.animateSpeed); core.setGlobalAnimate(core.values.animateSpeed);

2
libs/ui.js
View File

@ -1877,7 +1877,7 @@ ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, cente
tempCanvas.drawImage(core.material.images.images[heroIcon], icon.stop * 32, icon.loc * height, 32, height, 32*heroLoc.x, 32*heroLoc.y+32-height, 32, height); tempCanvas.drawImage(core.material.images.images[heroIcon], icon.stop * 32, icon.loc * height, 32, height, 32*heroLoc.x, 32*heroLoc.y+32-height, 32, height);
} }
// foreground map // foreground map
core.maps.drawBgFgMap(floorId, tempCanvas, "event2"); core.maps.drawBgFgMap(floorId, tempCanvas, "fg");
// draw fg // draw fg
images.forEach(function (t) { images.forEach(function (t) {