完善第一章

public/libs/maps.js

@@ -3349,11 +3349,11 @@ maps.prototype.setBlock = function (number, x, y, floorId, noredraw) {
                 if (!noredraw) {
                     core.drawBlock(block);
                     core.addGlobalAnimate(block);
-                }
                     core.updateStatusBar();
                 }
             }
         }
+    }
 };
 
 maps.prototype.animateSetBlock = function (

public/project/floors/MT17.js

@@ -39,7 +39,8 @@ main.floors.MT17=
             "在地图上拥有追猎怪物的时候无法瞬移"
         ],
         "13,6": [
-            "这个绝对坚固怪能刷血还是尽量刷吧，塔里面有盾，拿了盾之后差不多就能防杀了，大概可以刷10w血"
+            "这个绝对坚固怪能刷血还是尽量刷吧，塔里面有盾，拿了盾之后差不多就能防杀了，大概可以刷10w血",
+            "注意，如果你开启了自动切换技能，那么当你未防杀他的时候系统可能会自动选择开启技能导致你破了防。这时候你需要自行计算距离不开技能破防还需要吃多少攻"
         ]
     },
     "changeFloor": {

public/project/floors/tower1.js

@@ -158,7 +158,7 @@ main.floors.tower1=
     "cannotMove": {},
     "map": [
     [527,527,527,527,527,527,527,527,527,527,527,527,527,527,527],
-    [527, 87,381,381,381,492,  0, 32,  0,492,  0,484,528,  0,527],
+    [527, 32,381,381,381,492,  0, 87,  0,492,  0,484,528,  0,527],
     [527,528,492,528,546,528,528,536,528,528,  0,  0,548, 29,527],
     [527, 32,381,537,  0, 32,550,  0, 21,  0, 29,  0, 35,  0,527],
     [527,494,528,381,528,550,528,528,528,528,528,549,378,484,527],
@@ -237,7 +237,7 @@ main.floors.tower1=
                 58
             ]
         },
-        "1,1": {
+        "7,1": {
             "floorId": "tower2",
             "loc": [
                 7,

public/project/floors/tower2.js

@@ -65,7 +65,7 @@ main.floors.tower2=
         "7,1": {
             "floorId": "tower1",
             "loc": [
-                1,
+                7,
                 1
             ]
         },

public/project/floors/tower5.js

@@ -21,14 +21,7 @@ main.floors.tower5=
             "这里是漏怪检测，会检测\r[gold]智慧之塔\r[]区域是否有遗漏怪物",
             {
                 "type": "function",
-                "function": "function(){\ncore.checkEnemy([0, \"tower1\", \"tower2\", \"tower3\", \"tower4\", \"tower5\", \"tower6\"]);\n}"
-            },
-            {
-                "type": "if",
-                "condition": "(flag:enemyNumber===0)",
-                "true": [
-                    "请搜刮地上物资，之后此区域无法返回"
-                ]
+                "function": "function(){\nconst enemy = core.getRemainEnemyString([\"tower1\", \"tower2\", \"tower3\", \"tower4\", \"tower5\", \"tower6\"]);\nif (enemy.length === 0) {\n\tcore.insertAction(['当前无剩余怪物！', { \"type\": \"hide\", \"remove\": true }, ]);\n} else {\n\tcore.insertAction(enemy);\n}\n}"
             }
         ]
     },

public/project/plugins.js

@@ -1718,9 +1718,6 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
         };
         // 血条
         this.healthBar = function (now, total) {
-            // 关闭小地图
-            flags.__useMinimap__ = false;
-            core.drawMinimap();
             var nowLength = (now / total) * 476; // 当前血量下绘制长度
             var color = [
                 255 * 2 - (now / total) * 2 * 255,

src/components/enemyOne.vue

@@ -88,12 +88,14 @@
                             >减伤&nbsp;&nbsp;&nbsp;&nbsp;<span
                                 :style="{
                                     color:
-                                        enemy.criticalDamage < 0
+                                        enemy.criticalDamage < 0 &&
+                                        !has(enemy.damage)
                                             ? 'gold'
                                             : 'lightpink'
                                 }"
                                 ><span style="font-family: 'Fira Code'">{{
-                                    enemy.criticalDamage < 0
+                                    enemy.criticalDamage < 0 &&
+                                    !has(enemy.damage)
                                         ? isMobile
                                             ? '-'
                                             : '=>'

src/data/settings.json

@@ -13,7 +13,8 @@
     "autoSkill": {
         "text": "自动切换技能",
         "desc": [
-            "开启后，打怪物的时候会自动选择伤害最低的技能。同时显伤也会显示此状态下的伤害。"
+            "开启后，打怪物的时候会自动选择伤害最低的技能。同时显伤也会显示此状态下的伤害，",
+            "临界也会考虑技能在内"
         ]
     },
     "autoScale": {

src/panel/enemyCritical.vue

@@ -63,10 +63,10 @@
                 >
                 <span
                     ><span style="font-family: 'Fira Code'">{{
-                        nowDamage[0] < 0 ? '=>' : ''
+                        nowDamage[0] < 0 && nowDamage[1] === '???' ? '=>' : ''
                     }}</span
                     >{{
-                        nowDamage[0] < 0
+                        nowDamage[0] < 0 && nowDamage[1] === '???'
                             ? format(-nowDamage[0])
                             : format(nowDamage[0])
                     }}</span

src/ui/equipbox.vue

@@ -39,7 +39,7 @@
                     dashed
                     style="border-color: #ddd4; margin: 1vh 0 1vh 0"
                 ></a-divider>
-                <Scroll :width="10" id="equip-scroll"
+                <Scroll id="equip-scroll"
                     ><div
                         class="equip selectable"
                         v-for="([id, num], i) of toShow"
@@ -662,7 +662,6 @@ onUnmounted(() => {
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    margin: 1vh 1vw 0 0.5vw;
     padding: 0.5vh 0.5vw 0.5vh 0.5vw;
     border: #0000 0.5px solid;
     white-space: nowrap;