From 0b0c7c79581800bacfdab122e2856109790ecfbf Mon Sep 17 00:00:00 2001
From: unanmed <1319491857@qq.com>
Date: Sat, 22 Apr 2023 17:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=B7=83=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/project/plugin/skills.js |  5 +++--
 src/types/plugin.d.ts           |  5 +++++
 src/ui/statusBar.vue            | 30 ++++++++++++++++++++++++++----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/public/project/plugin/skills.js b/public/project/plugin/skills.js
index 711f6de..d748317 100644
--- a/public/project/plugin/skills.js
+++ b/public/project/plugin/skills.js
@@ -20,7 +20,7 @@ var ignoreInJump = {
 };
 
 /** @type {FloorIds[]} */
-const jumpIgnoreFloor = [
+export const jumpIgnoreFloor = [
     'MT31',
     'snowTown',
     'MT36',
@@ -177,5 +177,6 @@ export function jumpSkill() {
 }
 
 core.plugin.skillEffects = {
-    jumpSkill
+    jumpSkill,
+    jumpIgnoreFloor
 };
diff --git a/src/types/plugin.d.ts b/src/types/plugin.d.ts
index edeab8d..f5e5d60 100644
--- a/src/types/plugin.d.ts
+++ b/src/types/plugin.d.ts
@@ -31,6 +31,7 @@ interface PluginDeclaration
     hero: GamePluginHeroRealStatus;
 
     skills: Record<Chapter, Skill[]>;
+    skillEffects: SkillEffects;
 
     /**
      * 添加函数  例：添加弹出文字，像这个就可以使用core.addPop或core.plugin.addPop调用
@@ -435,6 +436,10 @@ interface PluginAchievement {
     checkVisitedFloor(): void;
 }
 
+interface SkillEffects {
+    jumpIgnoreFloor: FloorIds[];
+}
+
 type Chapter = 'chapter1' | 'chapter2';
 
 interface Skill {
diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue
index e192705..bca27b1 100644
--- a/src/ui/statusBar.vue
+++ b/src/ui/statusBar.vue
@@ -25,6 +25,12 @@
                             class="status-icon"
                         />
                         <span>{{ skill }}</span>
+                        <span
+                            v-if="has(spring)"
+                            id="status-spring"
+                            class="status-extra"
+                            >剩余{{ spring }}</span
+                        >
                     </div>
                     <div id="status-hp" class="status-item">
                         <img src="/project/images/hp.png" class="status-icon" />
@@ -37,10 +43,10 @@
                             >+{{ format(hero.hpmax!) }}/t</span
                         >
                         <span
-                            v-if="has(spring)"
-                            id="status-spring"
+                            v-if="has(jumpCnt)"
+                            id="status-jump"
                             class="status-extra"
-                            >剩余{{ spring }}</span
+                            >跳跃剩余{{ jumpCnt }}</span
                         >
                     </div>
                     <div id="status-atk" class="status-item">
@@ -124,7 +130,7 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, shallowReactive, watch } from 'vue';
+import { onMounted, ref, shallowReactive, watch } from 'vue';
 import Box from '../components/box.vue';
 import Scroll from '../components/scroll.vue';
 import { status } from '../plugin/ui/statusBar';
@@ -150,6 +156,7 @@ const up = ref(0);
 const spring = ref<number>();
 const skillOpened = ref(core.getFlag('chapter', 0) > 0);
 const studyOpened = ref(core.plugin.skillTree.getSkillLevel(11) > 0);
+const jumpCnt = ref<number>();
 /**
  * 要展示的勇士属性
  */
@@ -198,6 +205,11 @@ function update() {
     }
     skillOpened.value = core.getFlag('chapter', 0) > 0;
     studyOpened.value = core.plugin.skillTree.getSkillLevel(11) > 0;
+    jumpCnt.value =
+        flags.skill2 &&
+        !core.plugin.skillEffects.jumpIgnoreFloor.includes(core.status.floorId)
+            ? 3 - flags[`jump_${core.status.floorId}`]
+            : void 0;
 }
 
 function openSkillTree() {
@@ -213,6 +225,10 @@ function viewMap() {
 }
 
 function openStudy() {}
+
+onMounted(() => {
+    update();
+});
 </script>
 
 <style lang="less" scoped>
@@ -300,6 +316,12 @@ function openStudy() {}
     font-size: 1.4vw;
 }
 
+#status-jump {
+    line-height: 0;
+    top: 0;
+    font-size: 1.3vw;
+}
+
 #status-key {
     display: flex;
     flex-direction: row;