Fix gif
This commit is contained in:
parent
5b92ff84e2
commit
92d564eccd
@ -1758,6 +1758,8 @@ control.prototype.replay = function () {
|
|||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
core.ui.closePanel();
|
core.ui.closePanel();
|
||||||
var stair=toIndex<nowIndex?"upFloor":"downFloor";
|
var stair=toIndex<nowIndex?"upFloor":"downFloor";
|
||||||
|
if (toIndex==nowIndex && core.floors[core.status.floorId].underGround)
|
||||||
|
stair = "upFloor";
|
||||||
core.status.route.push("fly:"+floorId);
|
core.status.route.push("fly:"+floorId);
|
||||||
core.changeFloor(floorId, stair, null, null, function () {
|
core.changeFloor(floorId, stair, null, null, function () {
|
||||||
core.replay();
|
core.replay();
|
||||||
|
|||||||
@ -512,6 +512,8 @@ events.prototype.doAction = function() {
|
|||||||
gif.style.position = 'absolute';
|
gif.style.position = 'absolute';
|
||||||
gif.style.left = (core.calValue(data.loc[0])*core.domStyle.scale)+"px";
|
gif.style.left = (core.calValue(data.loc[0])*core.domStyle.scale)+"px";
|
||||||
gif.style.top = (core.calValue(data.loc[1])*core.domStyle.scale)+"px";
|
gif.style.top = (core.calValue(data.loc[1])*core.domStyle.scale)+"px";
|
||||||
|
gif.style.width = core.material.images.images[data.name].style.width*core.domStyle.scale+"px";
|
||||||
|
gif.style.height = core.material.images.images[data.name].style.height*core.domStyle.scale+"px";
|
||||||
core.dom.gif2.appendChild(gif);
|
core.dom.gif2.appendChild(gif);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
@ -331,7 +331,6 @@ maps.prototype.drawMap = function (mapName, callback) {
|
|||||||
dx*=32; dy*=32;
|
dx*=32; dy*=32;
|
||||||
var image = core.material.images.images[p];
|
var image = core.material.images.images[p];
|
||||||
if (!t[3]) {
|
if (!t[3]) {
|
||||||
core.canvas.bg.drawImage(image, dx * ratio, dy * ratio, Math.min(size - dx * ratio, ratio * image.width), Math.min(size - dy * ratio, ratio * image.height));
|
|
||||||
if (/.*\.gif/i.test(p)) {
|
if (/.*\.gif/i.test(p)) {
|
||||||
core.dom.gif.innerHTML = "";
|
core.dom.gif.innerHTML = "";
|
||||||
var gif = new Image();
|
var gif = new Image();
|
||||||
@ -339,8 +338,13 @@ maps.prototype.drawMap = function (mapName, callback) {
|
|||||||
gif.style.position = 'absolute';
|
gif.style.position = 'absolute';
|
||||||
gif.style.left = (dx*core.domStyle.scale)+"px";
|
gif.style.left = (dx*core.domStyle.scale)+"px";
|
||||||
gif.style.top = (dy*core.domStyle.scale)+"px";
|
gif.style.top = (dy*core.domStyle.scale)+"px";
|
||||||
|
gif.style.width = core.material.images.images[p].width*core.domStyle.scale+"px";
|
||||||
|
gif.style.height = core.material.images.images[p].height*core.domStyle.scale+"px";
|
||||||
core.dom.gif.appendChild(gif);
|
core.dom.gif.appendChild(gif);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
core.canvas.bg.drawImage(image, dx * ratio, dy * ratio, Math.min(size - dx * ratio, ratio * image.width), Math.min(size - dy * ratio, ratio * image.height));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
core.canvas.event2.drawImage(image, dx*ratio, dy*ratio, Math.min(size-dx*ratio, ratio*image.width), Math.min(size-dy*ratio, ratio*image.height));
|
core.canvas.event2.drawImage(image, dx*ratio, dy*ratio, Math.min(size-dx*ratio, ratio*image.width), Math.min(size-dy*ratio, ratio*image.height));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user