update

src/move/move.service.ts

@@ -934,13 +934,8 @@ export class MoveService implements OnModuleInit {
         neighPoints.push(neighPoint);
         ++count;
       } else if (Math.abs(angle - move_angle) == 0) {
-<<<<<<< HEAD
         count = 2
         //console.log('handlejoysticktesttest:刚好45°的倍数')
-=======
-        count = 2;
-        console.log('handlejoysticktesttest:刚好45°的倍数');
->>>>>>> 403e108ac3b4bbc2668f8baf813631699589fe03
         //debugger;
         break;
 
@@ -1220,15 +1215,10 @@ export class MoveService implements OnModuleInit {
         Math.floor(user.camera.angle.yaw / 45);
       const moveFramesRes = await this.cacheService.get(key);
       const moveFrames = JSON.parse(moveFramesRes);
-<<<<<<< HEAD
       */
       const moveFrames = await this.getMoveFrames(appId,breakPointId,chooseBreakPointId,Math.floor(user.camera.angle.yaw / 45))
       this.setCameraInfo(appId,moveFrames,breakPointId,chooseBreakPointId);
       
-=======
-      this.setCameraInfo(appId, moveFrames, breakPointId, chooseBreakPointId);
-
->>>>>>> 403e108ac3b4bbc2668f8baf813631699589fe03
       user.breakPointId = chooseBreakPointId;
 
       const cameraInfo = this.getCameraInfo();