瀏覽代碼

fix: bug修复

TIANYONG 1 年之前
父節點
當前提交
49ee0f42db
共有 4 個文件被更改,包括 12 次插入8 次删除
  1. 1 1
      osmd-extended
  2. 1 1
      src/helpers/formateMusic.ts
  3. 8 5
      src/page-instrument/evaluat-model/delay-check/index.tsx
  4. 2 1
      src/state.ts

+ 1 - 1
osmd-extended

@@ -1 +1 @@
-Subproject commit 1c3096cff67a43a57ea8052cebc0689268e94ce2
+Subproject commit c1534a99aab326538920eb09406378990054c61a

+ 1 - 1
src/helpers/formateMusic.ts

@@ -955,7 +955,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				 * 管乐迷,部分弱起的曲目,mp3制作不标准,没有按照补齐弱起后的时间进行制作,需要单独处理
 				 * 2670:需要减去第一小节音符的时间
 				*/
-				if (["2670"].includes(detailId)) {
+				if (["2670"].includes(state.cbsExamSongId)) {
 					fixtime -= _firstMeasureRealValue * formatBeatUnit(beatUnit) * (60 / beatSpeed);
 				} else {
 					if (difftime > 0) {

+ 8 - 5
src/page-instrument/evaluat-model/delay-check/index.tsx

@@ -233,11 +233,14 @@ export default defineComponent({
 				<div class={styles.delayBox}>
 					{/*返回按钮*/}
 					{/* <div class={styles.delayTest}>步骤:{data.step}{evaluatingData.accompanyErrorType}</div> */}
-					<img class={styles.delayBackBtn} src={iconBack} onClick={() => {
-						clearTimeout(startTuneTimer)
-						api_toggleTune("stop");
-						emit("back")
-					}} />
+					{
+						data.step > 1 && 
+						<img class={styles.delayBackBtn} src={iconBack} onClick={() => {
+							clearTimeout(startTuneTimer)
+							api_toggleTune("stop");
+							emit("back")
+						}} />						
+					}
 					{/* 异常提示弹窗 */}
 					{
 						data.abnormalPopShow && 

+ 2 - 1
src/state.ts

@@ -554,7 +554,8 @@ const handlePlaying = () => {
       }
 
       // if (Math.abs(selectEndItem.endtime - currentTime) < offset_duration) {
-        if (currentTime - selectEndItem.endtime > offset_duration) {
+        // if (currentTime - selectEndItem.endtime > offset_duration) {
+        if (currentTime - selectEndItem.endtime >= 0) {
         console.log("选段播放结束",state.setting.repeatAutoPlay);
         // 如果为选段评测模式
         if (state.modeType === "evaluating" && state.isSelectMeasureMode) {