From 656cd92c203890f5c7d414d3b717ba46e20a9795 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Fri, 24 Aug 2018 23:19:03 +0800
Subject: [PATCH] Fix scale

---
 libs/actions.js |  2 +-
 libs/control.js | 11 ++++++++++-
 libs/maps.js    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index 80e802f0..2ae074d3 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -476,7 +476,7 @@ actions.prototype.onup = function () {
         for(var ii=1;ii<core.status.stepPostfix.length;ii++){
             var pos0 = core.status.stepPostfix[ii-1];
             var pos = core.status.stepPostfix[ii];
-            stepPostfix.push({'direction': direction[pos.x-pos0.x][pos.y-pos0.y], 'x': pos.x, 'y': pos.y});
+            stepPostfix.push({'direction': direction[pos.x-pos0.x][pos.y-pos0.y], 'x': pos.x+parseInt(core.bigmap.offsetX/32), 'y': pos.y+parseInt(core.bigmap.offsetY/32)});
         }
         var posx=core.status.stepPostfix[0].x;
         var posy=core.status.stepPostfix[0].y;
diff --git a/libs/control.js b/libs/control.js
index 4fa4cfe2..05292367 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -632,7 +632,7 @@ control.prototype.automaticRoute = function (destX, destY) {
 
 ////// 显示离散的寻路点 //////
 control.prototype.fillPosWithPoint = function (pos) {
-    core.fillRect('route', pos.x*32+12,pos.y*32+12,8,8, '#bfbfbf');
+    core.fillRect('route', pos.x*32+12+core.bigmap.offsetX,pos.y*32+12+core.bigmap.offsetY,8,8, '#bfbfbf');
 }
 
 ////// 设置勇士的自动行走路线 //////
@@ -985,6 +985,8 @@ control.prototype.stopHero = function () {
 ////// 设置画布偏移
 control.prototype.setGameCanvasTranslate = function(canvas,x,y){
     var c=core.dom.gameCanvas[canvas];
+    x=x*core.domStyle.scale;
+    y=y*core.domStyle.scale;
     c.style.transform='translate('+x+'px,'+y+'px)';
     c.style.webkitTransform='translate('+x+'px,'+y+'px)';
     c.style.OTransform='translate('+x+'px,'+y+'px)';
@@ -2817,6 +2819,13 @@ control.prototype.resize = function(clientWidth, clientHeight) {
                 left: (clientWidth-gameGroupWidth)/2 + unit,
             }
         },
+        {
+            className: 'gameCanvas',
+            rules:{
+                width: (canvasWidth - SPACE*2) + unit,
+                height: (canvasWidth - SPACE*2) + unit,
+            }
+        },
         {
             id: 'gif',
             rules: {
diff --git a/libs/maps.js b/libs/maps.js
index 3f0f83bd..f1423463 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -190,8 +190,8 @@ maps.prototype.resizeMap = function(floorId) {
     core.bigmap.canvas.forEach(function(cn){
         core.canvas[cn].canvas.setAttribute("width",cwidth);
         core.canvas[cn].canvas.setAttribute("height",cheight);
-        core.canvas[cn].canvas.style.width = cwidth;
-        core.canvas[cn].canvas.style.height = cheight;
+        core.canvas[cn].canvas.style.width = cwidth*core.domStyle.scale + "px";
+        core.canvas[cn].canvas.style.height = cheight*core.domStyle.scale + "px";
     });
 }