From 64a4fa05a887fa016dd035a24095b49d6590d143 Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Mon, 2 Jan 2023 23:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/project/floors/MT16.js | 9 +--------
 public/project/functions.js   | 2 +-
 public/project/plugins.js     | 3 ++-
 public/styles.css             | 1 +
 src/panel/enemyCritical.vue   | 3 +++
 src/plugin/ui/book.tsx        | 8 --------
 src/ui/skillTree.vue          | 7 ++++++-
 7 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/public/project/floors/MT16.js b/public/project/floors/MT16.js
index 7722bb4..a0cd5c4 100644
--- a/public/project/floors/MT16.js
+++ b/public/project/floors/MT16.js
@@ -371,14 +371,7 @@ main.floors.MT16=
             "这里是漏怪检测，将会检测\r[gold]洞穴、山路、山脚、平原\r[white]地区的怪物是否清完",
             {
                 "type": "function",
-                "function": "function(){\ncore.checkEnemy([0, \"MT0\", \"MT1\", \"MT2\", \"MT3\", \"MT4\", \"MT5\", \"MT6\", \"MT7\", \"MT8\", \"MT9\", \"MT10\", \"MT11\", \"MT12\", \"MT13\", \"MT14\", \"MT15\"]);\n}"
-            },
-            {
-                "type": "if",
-                "condition": "(flag:enemyNumber===0)",
-                "true": [
-                    "请搜刮地上物资，之后此区域无法返回"
-                ]
+                "function": "function(){\nconst enemy = core.getRemainEnemyString(core.floorIds.slice(5, 17));\nif (enemy.length === 0) {\n\tcore.insertAction(['当前无剩余怪物！', { \"type\": \"hide\", \"remove\": true }, ]);\n} else {\n\tcore.insertAction(enemy);\n}\n}"
             }
         ],
         "3,23": [
diff --git a/public/project/functions.js b/public/project/functions.js
index 9a46c00..17b4b98 100644
--- a/public/project/functions.js
+++ b/public/project/functions.js
@@ -52,7 +52,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = {
             // 隐藏右下角的音乐按钮
             core.dom.musicBtn.style.display = 'none';
             core.dom.enlargeBtn.style.display = 'none';
-            core.splitArea();
+            if (main.mode === 'play' && !main.replayChecking) core.splitArea();
         },
         win: function (reason, norank, noexit) {
             // 游戏获胜事件
diff --git a/public/project/plugins.js b/public/project/plugins.js
index 2ff0581..9e43239 100644
--- a/public/project/plugins.js
+++ b/public/project/plugins.js
@@ -4344,7 +4344,8 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = {
                 core.extractBlocks(v);
                 const blocks = core.status.maps[v].blocks;
                 blocks.forEach(block => {
-                    if (!block.event.cls.startsWith('enemy')) return;
+                    if (!block.event.cls.startsWith('enemy') || block.disable)
+                        return;
                     /**
                      * @type {EnemyIds}
                      */
diff --git a/public/styles.css b/public/styles.css
index 6ec7bdb..ff97b3e 100644
--- a/public/styles.css
+++ b/public/styles.css
@@ -264,6 +264,7 @@ span#hard {
     color: #fff;
     background-color: #000;
     z-index: 230;
+    user-select: none;
 }
 
 #logoLabel {
diff --git a/src/panel/enemyCritical.vue b/src/panel/enemyCritical.vue
index b6e2a4d..aff45e4 100644
--- a/src/panel/enemyCritical.vue
+++ b/src/panel/enemyCritical.vue
@@ -133,6 +133,9 @@ function generateChart(ele: HTMLCanvasElement, data: [number, number][]) {
                 point: {
                     radius: 5,
                     hoverRadius: 7
+                },
+                line: {
+                    borderJoinStyle: 'round'
                 }
             },
             scales: {
diff --git a/src/plugin/ui/book.tsx b/src/plugin/ui/book.tsx
index cfde852..2fdce2f 100644
--- a/src/plugin/ui/book.tsx
+++ b/src/plugin/ui/book.tsx
@@ -78,10 +78,6 @@ export function getDefDamage(
         res.push([ratio * i + addDef, dam.damage]);
     }
 
-    if ((res.at(-1)?.[1] ?? 1) <= 0) {
-        res.push([res.at(-1)![0] + 1, 0]);
-    }
-
     return res;
 }
 
@@ -122,9 +118,5 @@ export function getCriticalDamage(
         res.push([ratio * i + addAtk, dam.damage]);
     }
 
-    if ((res.at(-1)?.[1] ?? 1) <= 0) {
-        res.push([res.at(-1)![0] + 1, 0]);
-    }
-
     return res;
 }
diff --git a/src/ui/skillTree.vue b/src/ui/skillTree.vue
index 4f2d1c6..5839f30 100644
--- a/src/ui/skillTree.vue
+++ b/src/ui/skillTree.vue
@@ -33,10 +33,14 @@
                 <span id="skill-level">当前等级：{{ level }}</span>
                 <a-divider dashed class="upgrade-divider"></a-divider>
                 <span
+                    v-if="level < skill.max"
                     id="skill-consume"
                     :style="{ color: consume <= mdef ? '#fff' : '#f44' }"
                     >升级花费：{{ consume }}</span
                 >
+                <span v-else id="skill-consume" style="color: gold"
+                    >已满级</span
+                >
                 <a-divider dashed class="upgrade-divider"></a-divider>
                 <Scroll id="front-scroll" :no-scroll="true"
                     ><div id="skill-front">
@@ -246,7 +250,8 @@ function upgrade(index: number) {
 
 function key(e: KeyboardEvent) {
     const c = keycode(e.keyCode);
-    if (c === KeyCode.Escape || c === KeyCode.KeyX) exit();
+    if (c === KeyCode.Escape || c === KeyCode.KeyX || c === KeyCode.KeyJ)
+        exit();
     if (c === KeyCode.Space || c === KeyCode.Enter || c === KeyCode.KeyC) {
         upgrade(selected.value);
     }