Przeglądaj źródła

feat: 评测模式显示指法

TIANYONG 8 miesięcy temu
rodzic
commit
3e3e4e99d0

+ 1 - 1
src/page-instrument/header-top/settting/index.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
                 <div class={styles.content}>
                     <div class={styles.conBox}>
                         {
-                            state.isShowFingering && state.fingeringInfo.name && ["practise", "follow"].includes(state.modeType) && state.playType === "play" &&
+                            state.isShowFingering && state.fingeringInfo.name && ["practise", "follow", "evaluating"].includes(state.modeType) && state.playType === "play" &&
                                 <div class={styles.cellBox}>
                                 <div class={styles.tit}>指法</div>
                                     <Switch v-model={state.setting.displayFingering}></Switch>

+ 6 - 0
src/view/fingering/index.tsx

@@ -2,6 +2,8 @@ import { computed, defineComponent, onBeforeMount, reactive } from "vue";
 import styles from "./index.module.less";
 import state from "/src/state";
 import { getFingeringConfig, ITypeFingering } from "./fingering-config";
+import { evaluatingData } from "/src/view/evaluating";
+import { followData } from "/src/view/follow-practice/index"
 
 export default defineComponent({
   name: "fingering",
@@ -34,6 +36,10 @@ export default defineComponent({
     });
 
     const doubeClick = () => {
+      // 如果在评测和跟练中,双击指法不跳转
+      if ((state.modeType === 'evaluating' && evaluatingData.startBegin) || (state.modeType === 'follow' && followData.start)) {
+        return;
+      }
       const nowTime = Date.now();
       if (nowTime - fingerData.delay < 300) {
         emit("open");