From 90054cb7d199e04fa489f136c8e793dfb856749a Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Thu, 18 Jan 2018 03:20:53 +0800
Subject: [PATCH] Fix Bugs

---
 libs/events.js | 14 +++++++-------
 libs/ui.js     |  4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libs/events.js b/libs/events.js
index 696177ae..b4a0d372 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1058,6 +1058,7 @@ events.prototype.clickViewMaps = function (x,y) {
     }
     else {
         core.clearMap('data', 0, 0, 416, 416);
+        core.setOpacity('data', 1);
         core.ui.closePanel();
     }
 }
@@ -1071,15 +1072,14 @@ events.prototype.keyDownViewMaps = function (keycode) {
 
 ////// 查看地图界面时，放开某个键的操作 //////
 events.prototype.keyUpViewMaps = function (keycode) {
-    if (keycode==71 || keycode==27 || keycode==88) {
+    if (keycode==27 || keycode==88 || keycode==13 || keycode==32 || keycode==67) {
         core.clearMap('data', 0, 0, 416, 416);
+        core.setOpacity('data', 1);
         core.ui.closePanel();
     }
     return;
 }
 
-
-
 ////// 商店界面时的点击操作 //////
 events.prototype.clickShop = function(x,y) {
     var shop = core.status.event.data.shop;
@@ -1519,7 +1519,7 @@ events.prototype.keyUpSwitchs = function (keycode) {
         return;
     }
     var choices = [
-        "背景音乐", "背景音效", "战斗动画", "怪物显伤", "领域显伤", "返回主菜单"
+        "背景音乐", "背景音效", "战斗动画", "怪物显伤", "领域显伤", "下载离线版本", "返回主菜单"
     ];
     if (keycode==13 || keycode==32 || keycode==67) {
         var topIndex = 6 - parseInt((choices.length - 1) / 2);
@@ -1648,7 +1648,7 @@ events.prototype.keyUpSettings = function (keycode) {
         return;
     }
     var choices = [
-        "系统设置", "快捷商店", "同步存档", "重新开始", "操作帮助", "关于本塔", "返回游戏"
+        "系统设置", "快捷商店", "浏览地图", "同步存档", "重新开始", "数据统计", "操作帮助", "关于本塔", "返回游戏"
     ];
     if (keycode==13 || keycode==32 || keycode==67) {
         var topIndex = 6 - parseInt((choices.length - 1) / 2);
@@ -1726,7 +1726,7 @@ events.prototype.clickSyncSave = function (x,y) {
                 })
                 break;
             case 5:
-                core.status.event.selection=2;
+                core.status.event.selection=3;
                 core.ui.drawSettings();
                 break;
 
@@ -1755,7 +1755,7 @@ events.prototype.keyUpSyncSave = function (keycode) {
         return;
     }
     var choices = [
-        "同步存档到服务器", "从服务器加载存档", "清空本地存档", "返回主菜单"
+        "同步存档到服务器", "从服务器加载存档", "存档至本地文件", "从本地文件读档", "清空所有存档", "返回主菜单"
     ];
     if (keycode==13 || keycode==32 || keycode==67) {
         var topIndex = 6 - parseInt((choices.length - 1) / 2);
diff --git a/libs/ui.js b/libs/ui.js
index f6c178cf..1b8217af 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -907,6 +907,7 @@ ui.prototype.drawFly = function(page) {
     this.drawThumbnail(floorId, 'ui', core.status.maps[floorId].blocks, 20, 100, 273);
 }
 
+////// 绘制浏览地图界面 //////
 ui.prototype.drawMaps = function (index) {
     if (!core.isset(index)) index=core.floorIds.indexOf(core.status.floorId);
 
@@ -928,12 +929,13 @@ ui.prototype.drawMaps = function (index) {
     core.clearMap('data', 0, 0, 416, 416);
     core.setOpacity('data', 0.2);
     core.canvas.data.textAlign = 'left';
+    core.setFont('data', '16px Arial');
 
     var text = core.floors[floorId].title;
     var textX = 16, textY = 18, width = textX + core.canvas.data.measureText(text).width + 16, height = 42;
     core.fillRect('data', 5, 5, width, height, '#000');
     core.setOpacity('data', 0.5);
-    core.fillText('data', text, textX + 5, textY + 15, '#fff', '16px Arial');
+    core.fillText('data', text, textX + 5, textY + 15, '#fff');
 
 }