From 92d564eccdd45b4ca173b1ab55ce7986bfefa407 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Thu, 28 Jun 2018 18:04:51 +0800
Subject: [PATCH] Fix gif

---
 libs/control.js | 2 ++
 libs/events.js  | 2 ++
 libs/maps.js    | 6 +++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/control.js b/libs/control.js
index 43e8bd1f..b848ec69 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -1758,6 +1758,8 @@ control.prototype.replay = function () {
             setTimeout(function () {
                 core.ui.closePanel();
                 var stair=toIndex<nowIndex?"upFloor":"downFloor";
+                if (toIndex==nowIndex && core.floors[core.status.floorId].underGround)
+                    stair = "upFloor";
                 core.status.route.push("fly:"+floorId);
                 core.changeFloor(floorId, stair, null, null, function () {
                     core.replay();
diff --git a/libs/events.js b/libs/events.js
index 06ec8646..265d0b44 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -512,6 +512,8 @@ events.prototype.doAction = function() {
                 gif.style.position = 'absolute';
                 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.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);
             }
             else {
diff --git a/libs/maps.js b/libs/maps.js
index cdfd6b36..4d82878b 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -331,7 +331,6 @@ maps.prototype.drawMap = function (mapName, callback) {
                 dx*=32; dy*=32;
                 var image = core.material.images.images[p];
                 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)) {
                         core.dom.gif.innerHTML = "";
                         var gif = new Image();
@@ -339,8 +338,13 @@ maps.prototype.drawMap = function (mapName, callback) {
                         gif.style.position = 'absolute';
                         gif.style.left = (dx*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);
                     }
+                    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
                     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));