From 68c8ef12bca7cc12bb7be3599906a7c296a02a56 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 4 Dec 2018 15:50:13 +0800
Subject: [PATCH] saveIndex2 -> saveIndex

---
 libs/actions.js |  8 ++++----
 libs/control.js |  8 ++++----
 libs/items.js   | 34 +++++++++++++++++++++++++---------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index d4f024a3..ceee4f34 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -2243,14 +2243,14 @@ actions.prototype.clickStorageRemove = function (x, y) {
                         core.ui.closePanel();
                         core.drawText("\t[操作成功]你的所有存档已被清空。");
                         core.status.saveIndex = 1;
-                        core.setLocalStorage('saveIndex2', 1);
+                        core.removeLocalStorage('saveIndex');
                     });
                 }
                 else {
                     localStorage.clear();
                     core.drawText("\t[操作成功]你的所有存档已被清空。");
                     core.status.saveIndex = 1;
-                    core.setLocalStorage('saveIndex2', 1);
+                    core.removeLocalStorage('saveIndex');
                 }
                 break;
             case 1:
@@ -2264,7 +2264,7 @@ actions.prototype.clickStorageRemove = function (x, y) {
                         core.ui.closePanel();
                         core.drawText("\t[操作成功]当前塔的存档已被清空。");
                         core.status.saveIndex = 1;
-                        core.setLocalStorage('saveIndex2', 1);
+                        core.removeLocalStorage('saveIndex');
                     });
                 }
                 else {
@@ -2275,7 +2275,7 @@ actions.prototype.clickStorageRemove = function (x, y) {
                     core.removeLocalStorage("autoSave");
                     core.drawText("\t[操作成功]当前塔的存档已被清空。");
                     core.status.saveIndex = 1;
-                    core.setLocalStorage('saveIndex2', 1);
+                    core.removeLocalStorage('saveIndex');
                 }
                 break;
             case 2:
diff --git a/libs/control.js b/libs/control.js
index 56bdff04..c380fb3b 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -350,7 +350,7 @@ control.prototype.resetStatus = function(hero, hard, floorId, route, maps, value
     if (core.isset(route))
         core.status.route = route;
     // 保存的Index
-    core.status.saveIndex = core.getLocalStorage('saveIndex2', 1);
+    core.status.saveIndex = core.getLocalStorage('saveIndex', 1);
 
     if (core.isset(values))
         core.values = core.clone(values);
@@ -2199,7 +2199,7 @@ control.prototype.save = function(need) {
 control.prototype.load = function (need) {
     if (core.isset(core.status.replay)&&core.status.replay.replaying) return;
 
-    var saveIndex = core.getLocalStorage('saveIndex2', 1);
+    var saveIndex = core.getLocalStorage('saveIndex', 1);
     var page=parseInt((saveIndex-1)/5), offset=saveIndex-5*page;
 
     // 游戏开始前读档
@@ -2251,7 +2251,7 @@ control.prototype.doSL = function (id, type) {
             core.drawTip('存档成功！');
             if (id!="autoSave") {
                 core.status.saveIndex=id;
-                core.setLocalStorage('saveIndex2', core.status.saveIndex);
+                core.setLocalStorage('saveIndex', core.status.saveIndex);
             }
         }, function(err) {
             console.info(err);
@@ -2288,7 +2288,7 @@ control.prototype.doSL = function (id, type) {
                 core.drawTip("读档成功");
                 if (id!="autoSave") {
                     core.status.saveIndex=id;
-                    core.setLocalStorage('saveIndex2', core.status.saveIndex);
+                    core.setLocalStorage('saveIndex', core.status.saveIndex);
                 }
             });
         }, function(err) {
diff --git a/libs/items.js b/libs/items.js
index ea6fcd59..49860bda 100644
--- a/libs/items.js
+++ b/libs/items.js
@@ -72,7 +72,12 @@ items.prototype.useItem = function (itemId, callback) {
     var itemCls = core.material.items[itemId].cls;
 
     if (itemId in this.useItemEffect) {
-        eval(this.useItemEffect[itemId]);
+        try {
+            eval(this.useItemEffect[itemId]);
+        }
+        catch (e) {
+            console.log(e);
+        }
     }
     // 记录路线
     if (itemId!='book' && itemId!='fly') {
@@ -96,7 +101,12 @@ items.prototype.canUseItem = function (itemId) {
     if (!core.hasItem(itemId)) return false;
 
     if (itemId in this.canUseItemEffect) {
-        return eval(this.canUseItemEffect[itemId]);
+        try {
+            return eval(this.canUseItemEffect[itemId]);
+        }
+        catch (e) {
+            console.log(e);
+        }
     }
 
     return false;
@@ -121,7 +131,7 @@ items.prototype.hasEquip = function (itemId) {
     if (!core.isset(itemId)) return null;
     if (!core.isset((core.material.items[itemId]||{}).equip)) return null;
 
-    return itemId == this.getEquip(core.material.items[itemId].equip.type);
+    return this.getEquip(core.material.items[itemId].equip.type) == itemId;
 }
 
 ////// 获得某个装备类型的当前装备 //////
@@ -132,14 +142,13 @@ items.prototype.getEquip = function (equipType) {
 ////// 设置某个物品的个数 //////
 items.prototype.setItem = function (itemId, itemNum) {
     itemNum = itemNum || 0;
-    if (itemNum<=0) itemNum = 0;
     var itemCls = core.material.items[itemId].cls;
     if (itemCls == 'items') return;
     if (!core.isset(core.status.hero.items[itemCls])) {
         core.status.hero.items[itemCls] = {};
     }
     core.status.hero.items[itemCls][itemId] = itemNum;
-    if (itemCls!='keys' && itemNum==0) {
+    if (itemCls!='keys' && itemNum<=0) {
         delete core.status.hero.items[itemCls][itemId];
     }
 }
@@ -189,10 +198,17 @@ items.prototype.loadEquip = function (equipId, callback) {
     }
 
     var can = this.canEquip[equipId];
-    if (core.isset(can) && !eval(can)) {
-        core.drawTip("当前不可换上"+loadEquip.name);
-        if (core.isset(callback)) callback();
-        return;
+    if (core.isset(can)) {
+        try {
+            if (!eval(can)) {
+                core.drawTip("当前不可换上"+loadEquip.name);
+                if (core.isset(callback)) callback();
+                return;
+            }
+        }
+        catch (e) {
+            console.log(e);
+        }
     }
 
     core.playSound('equip.mp3');