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

src/pages/detail/speed.tsx

@@ -13,6 +13,7 @@ const state = reactive({
   speed: 90,
   showHint: false,
   maxSpeed: 315,
+  firstExceedEcho: false, // 第一次超出速度范围，显示的速度默认不回退到270或者45
 })
 
 export default defineComponent({
@@ -55,8 +56,11 @@ export default defineComponent({
 
     const updateSpeed = (speed: number) => {
       state.speed = speed
-      state.speed = Math.min(state.speed, 270)
-      state.speed = Math.max(state.speed, 45)
+      if (state.firstExceedEcho) {
+        state.speed = Math.min(state.speed, 270)
+        state.speed = Math.max(state.speed, 45)
+      }
+      if (!state.firstExceedEcho) state.firstExceedEcho = true
       props.updateSpeed(state.speed)
     }
 
@@ -104,8 +108,8 @@ export default defineComponent({
               buttonSize="18px"
               modelValue={state.maxSpeed - state.speed}
               onUpdate:modelValue={(speed: number) => {
-                // console.log('速度123',state.maxSpeed,speed,runtime.playIngSpeed,runtime.speed)
                 const currentSpeed = (runtime.playIngSpeed > 270 ? runtime.playIngSpeed + 45 : state.maxSpeed) - speed
+                // console.log('速度123',state.maxSpeed,speed,runtime.playIngSpeed,runtime.speed,'设置的:',currentSpeed)
                 updateSpeed(currentSpeed)
               }}
               step="1"

src/subpages/colexiu/buttons/evaluating.tsx

@@ -321,7 +321,8 @@ export const formatPitch = (num?: number): number => {
 }
 let starTime = 0
 const formatTimes = () => {
-  const rate = runtime.speed / detailState.baseSpeed //1
+  // const rate = runtime.speed / detailState.baseSpeed //1
+  const rate = runtime.basePlayRate; // 播放倍率
   actualBeatLength = Math.round(detailState.times[0].fixtime * 1000 / rate)
   const difftime = detailState.times?.[0]?.difftime || 0
   let ListenMode = false
@@ -334,7 +335,7 @@ const formatTimes = () => {
   let preTimes = []
   let unitTestIdx = 0
   let preTime = 0
-  if (unitTestData.isSelectMeasureMode) {
+  if (unitTestData.isSelectMeasureMode || detailState.section.length == 2) {
     const startIndex = detailState.times.findIndex(
       (n: any) => n.NoteToGraphicalNoteObjectId == detailState.section[0].NoteToGraphicalNoteObjectId
     )