Merge pull request #154 from ckcz123/v2.0

Save

libs/control.js

@@ -2072,12 +2072,15 @@ control.prototype.syncSave = function (type) {
         }
     }
     else {
+        /*
         for (var i=5*(main.savePages||30);i>=1;i--) {
             saves=core.getLocalStorage("save"+i, null);
             if (core.isset(saves)) {
                 break;
             }
         }
+        */
+        saves=core.getLocalStorage("save"+core.status.saveIndex, null);
     }
     if (!core.isset(saves)) {
         core.drawText("没有要同步的存档");
@@ -2097,7 +2100,9 @@ control.prototype.syncSave = function (type) {
             core.drawText("出错啦！\n无法同步存档到服务器。\n错误原因："+response.msg);
         }
         else {
-            core.drawText("同步成功！\n\n您的存档编号： "+response.code+"\n您的存档密码： "+response.msg+"\n\n请牢记以上两个信息（如截图等），在从服务器\n同步存档时使用。")
+            core.drawText((type=='all'?"所有存档":"存档"+core.status.saveIndex)+"同步成功！\n\n您的存档编号： "
+                +response.code+"\n您的存档密码： "+response.msg
+                +"\n\n请牢记以上两个信息（如截图等），在从服务器\n同步存档时使用。")
         }
     }, function (e) {
         core.drawText("出错啦！\n无法同步存档到服务器。\n错误原因："+e);
@@ -2149,12 +2154,15 @@ control.prototype.syncLoad = function () {
                 }
                 else {
                     // 只覆盖单存档
+                    /*
                     var index=5*(main.savePages||30);
                     for (var i=5*(main.savePages||30);i>=1;i--) {
                         if (core.getLocalStorage("save"+i, null)==null)
                             index=i;
                         else break;
                     }
+                    */
+                    var index = core.status.saveIndex;
                     core.setLocalStorage("save"+index, data);
                     core.drawText("同步成功！\n单存档已覆盖至存档"+index);
                 }

libs/ui.js

@@ -1112,7 +1112,7 @@ ui.prototype.drawSyncSave = function () {
 ui.prototype.drawSyncSelect = function () {
     core.status.event.id = 'syncSelect';
     this.drawChoices(null, [
-        "同步本地所有存档", "只同步最新单存档", "返回上级菜单"
+        "同步本地所有存档", "只同步选中单存档", "返回上级菜单"
     ]);
 }
 
@@ -1120,7 +1120,7 @@ ui.prototype.drawSyncSelect = function () {
 ui.prototype.drawLocalSaveSelect = function () {
     core.status.event.id = 'localSaveSelect';
     this.drawChoices(null, [
-        "下载所有存档", "只下载最新单存档", "返回上级菜单"
+        "下载所有存档", "只下载选中单存档", "返回上级菜单"
     ]);
 }
 
@@ -1307,6 +1307,9 @@ ui.prototype.drawBook = function (index) {
             damage = core.formatBigNumber(damage);
             if (core.enemys.hasSpecial(core.material.enemys[enemy.id], 19))
                 damage += "+";
+            if (core.material.enemys[enemy.id].notBomb)
+                damage += "[b]";
+
         }
         core.fillText('ui', damage, damageOffset, 62 * i + 50, color, 'bold 13px Verdana');