Prechádzať zdrojové kódy

record_old_data.play_mode === 'music' ? 'music' : 'background'

liushengqiang 2 rokov pred
rodič
commit
dec3433ff2

+ 1 - 0
src/page-gym/header-top/title/index.module.less

@@ -10,6 +10,7 @@
   .noticeBar {
     flex: 1;
     padding: 0 6px;
+    background: transparent;
   }
 }
 

+ 0 - 1
src/page-gym/header-top/title/index.tsx

@@ -28,7 +28,6 @@ export default defineComponent({
           text={this.text}
           color="#000"
           class={styles.noticeBar}
-          background="none"
         />
         {this.rightView ? (
           <img class={styles.status} src={ArrowIcon}/>

+ 7 - 4
src/view/audio-list/index.tsx

@@ -66,15 +66,14 @@ export const setAudioCurrentTime = (time: number, index = 0) => {
 };
 
 /** 设置当前没有播放的音频静音 */
-export const toggleMutePlayAudio = (source: IPlayState, volume: number) => {
+export const toggleMutePlayAudio = (source: IPlayState, muted: boolean) => {
 	if (source === "music") {
 		if (audioData.songEle) {
-			console.log(volume)
-			audioData.songEle.volume = volume;
+			audioData.songEle.muted = muted;
 		}
 	} else if (source === "background") {
 		if (audioData.backgroundEle) {
-			audioData.backgroundEle.volume = volume;
+			audioData.backgroundEle.muted = muted;
 		}
 	}
 };
@@ -102,6 +101,10 @@ export default defineComponent({
 		watch(
 			() => state.playSource,
 			() => {
+				if (state.modeType === 'evaluating' && !state.setting.enableAccompaniment){
+					console.log('评测模式设置了关闭伴奏,不切换原音伴奏')
+					return
+				}
 				if (state.playSource === "music") {
 					audioData.songEle && (audioData.songEle.muted = false);
 					audioData.backgroundEle && (audioData.backgroundEle.muted = true);

+ 4 - 7
src/view/evaluating/index.tsx

@@ -349,7 +349,7 @@ export default defineComponent({
 			/** 原音伴奏 */
 			play_mode: ''  as IPlayState,
 			/** 评测是否要伴奏 */
-			enableAccompaniment: true
+			enableAccompaniment: true,
 		});
 		/** 记录状态 */
 		const hanlde_record = () => {
@@ -360,10 +360,8 @@ export default defineComponent({
 			record_old_data.play_mode = state.playSource
 			record_old_data.enableAccompaniment = state.setting.enableAccompaniment
 			// 如果关闭伴奏,评测静音
-			if (!state.setting.enableAccompaniment){
-				toggleMutePlayAudio('music', 0)
-				toggleMutePlayAudio('background', 0)
-				
+			if (!record_old_data.enableAccompaniment){
+				toggleMutePlayAudio(record_old_data.play_mode === 'music' ? 'music' : 'background', true)
 			}
 		};
 		/** 还原状态 */
@@ -374,8 +372,7 @@ export default defineComponent({
 
 			// 如果关闭伴奏, 结束评测取消静音
 			if (!record_old_data.enableAccompaniment){
-				toggleMutePlayAudio('music', 1)
-				toggleMutePlayAudio('background', 1)
+				toggleMutePlayAudio(record_old_data.play_mode === 'music' ? 'music' : 'background', false)
 			}
 
 		};