Bläddra i källkod

Merge branch 'feature-pc-choose' into gyt-dev

TIANYONG 9 månader sedan
förälder
incheckning
f55d7da298
4 ändrade filer med 6 tillägg och 4 borttagningar
  1. 1 1
      index.html
  2. 1 0
      src/pages/detail/runtime.ts
  3. 3 2
      src/subpages/colexiu/buttons/evaluating.tsx
  4. 1 1
      vite.config.js

+ 1 - 1
index.html

@@ -43,7 +43,7 @@
   <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
   <script>
     // VConsole will be exported to `window.VConsole` by default.
-    var vConsole = new window.VConsole();
+    // var vConsole = new window.VConsole();
   </script>
 
   <style>

+ 1 - 0
src/pages/detail/runtime.ts

@@ -1052,6 +1052,7 @@ export const setAudioInit = () => {
     // console.log('app返回的mp3进度',time)
     if (diffTime < 0) {
       console.log('进度返回异常','本次时间比上次慢',diffTime,'当前播放时间:',res?.content?.currentTime)
+      return
     }
     requestAnimationFrame(async () => {
       if (state.playState === 'play') {

+ 3 - 2
src/subpages/colexiu/buttons/evaluating.tsx

@@ -323,7 +323,7 @@ let starTime = 0
 const formatTimes = () => {
   // const rate = runtime.speed / detailState.baseSpeed //1
   const rate = runtime.basePlayRate; // 播放倍率
-  // console.log('评测倍率123',rate)
+  console.log('评测倍率123',rate)
   actualBeatLength = Math.round(detailState.times[0].fixtime * 1000 / rate)
   const difftime = detailState.times?.[0]?.difftime || 0
   let ListenMode = false
@@ -434,6 +434,7 @@ const formatTimes = () => {
     // console.log('时间1111', data)
     datas.push(data)
   }
+  starTime = 0;
   return {
     datas,
     firstNoteTime
@@ -666,7 +667,7 @@ export const evaluatPlayerStop = playerStop
 const endevent = (evt: Event) => {
   console.log('选段播放结束事件')
   // 如果是单元测验和课后训练 播放结束
-  if (unitTestData.isSelectMeasureMode && playStatus.value === 'play') {
+  if ((unitTestData.isSelectMeasureMode || detailState.section.length === 2) && playStatus.value === 'play') {
     playerStop()
     canSubmit.value = true
     return

+ 1 - 1
vite.config.js

@@ -5,7 +5,7 @@ import glsl from 'vite-plugin-glsl'
 const vueJsx = require('@vitejs/plugin-vue-jsx')
 const legacy = require('@vitejs/plugin-legacy')
 
-const proxyUrl = 'https://test.lexiaoya.cn/' // test 环境
+const proxyUrl = 'https://dev.lexiaoya.cn/' // test 环境
 // const proxyUrl = 'http://192.168.3.70:8989/' // test 环境
 // const proxyUrl = 'https://online.colexiu.com/' // online 环境