动画调整&新版设计稿调整

Assets/Models/ViewPlayer.controller

@@ -519,6 +519,7 @@ AnimatorState:
   - {fileID: -8596154552645026292}
   - {fileID: -1707437159815693159}
   - {fileID: 453927001803204813}
+  - {fileID: 8297486244209268188}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -701,6 +702,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 3451209681293134144}
     m_Position: {x: 730, y: 180, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5932869819320440490}
+    m_Position: {x: 720, y: -200, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions:
@@ -805,61 +809,67 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: speed
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: power
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: cadance
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: preSpeed
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: grade
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: touchHead
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: headBack
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: cadanceConnected
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: cadance 0
     m_Type: 3
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: drinking
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -1268,6 +1278,34 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &5932869819320440490
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: drinking
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 7764372601415394234}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -7540722328937149365, guid: da74832e6eaeece4da2d37fcce2ccfac,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1109 &6077674372584114829
 AnimatorTransition:
   m_ObjectHideFlags: 1
@@ -1396,6 +1434,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &7764372601415394234
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2561558923055515796}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9666667
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &7906722347482806219
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -1440,6 +1500,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &8297486244209268188
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: drinking
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5932869819320440490}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.925
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &8459541290117965463
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

Assets/Models/male_cyclist_cg_animations 4.FBX.meta

@@ -72,6 +72,9 @@ ModelImporter:
   - first:
       74: 7609954123764706225
     second: touchHead
+  - first:
+      74: -7540722328937149365
+    second: drinking
   externalObjects: {}
   materials:
     materialImportMode: 1
@@ -767,6 +770,35 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: drinking
+      takeName: Take 001
+      internalID: 0
+      firstFrame: 275
+      lastFrame: 500
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 0
   meshes:
     lODScreenPercentages: []

Assets/Models/male_cyclist_cg_animations.FBX.meta

@@ -47,15 +47,15 @@ ModelImporter:
     bakeSimulation: 0
     resampleCurves: 1
     optimizeGameObjects: 0
-    motionNodeName: 
+    motionNodeName: wheel_backward
     rigImportErrors: 
     rigImportWarnings: 
     animationImportErrors: 
     animationImportWarnings: 
     animationRetargetingWarnings: 
     animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
+    importAnimatedCustomProperties: 1
-    importConstraints: 0
+    importConstraints: 1
     animationCompression: 1
     animationRotationError: 0.5
     animationPositionError: 0.5
@@ -278,9 +278,9 @@ ModelImporter:
       level: 0
       cycleOffset: 0
       loop: 0
-      hasAdditiveReferencePose: 0
+      hasAdditiveReferencePose: 1
       loopTime: 1
-      loopBlend: 0
+      loopBlend: 1
       loopBlendOrientation: 0
       loopBlendPositionY: 0
       loopBlendPositionXZ: 0
@@ -295,7 +295,7 @@ ModelImporter:
       transformMask: []
       maskType: 3
       maskSource: {instanceID: 0}
-      additiveReferencePoseFrame: 0
+      additiveReferencePoseFrame: 11
     - serializedVersion: 16
       name: StartRide
       takeName: Take 001

Assets/Resources/Images/AR/bg_ftp_small_empty.png.meta

@@ -61,7 +61,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -73,7 +73,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -85,7 +85,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -97,7 +97,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/Resources/Images/AR/bg_ftp_small_full.png.meta

@@ -61,7 +61,7 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -73,7 +73,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -85,7 +85,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -97,7 +97,7 @@ TextureImporter:
     forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1

Assets/Resources/Images/AR/icon_camera_PC_1.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 148a6b09981077f45bbd817c7a0cf54e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/AR/icon_camera_PC_2.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: c7835b8a0ef498a4a891b4eec1fe699e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/AR/img_explosive 1.png.meta

@@ -0,0 +1,128 @@
+fileFormatVersion: 2
+guid: 307560a3a0083dc4d92b0d82dc4f8aa8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Images/AR/mask_podu.png.meta

@@ -6,11 +6,11 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
-    borderMipMap: 1
+    borderMipMap: 0
     mipMapsPreserveCoverage: 0
     alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
@@ -32,26 +32,26 @@ TextureImporter:
   textureSettings:
     serializedVersion: 2
     filterMode: -1
-    aniso: 0
+    aniso: -1
     mipBias: -100
-    wrapU: -1
+    wrapU: 1
-    wrapV: -1
+    wrapV: 1
     wrapW: -1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
   spriteMode: 1
-  spriteExtrude: 32
+  spriteExtrude: 1
-  spriteMeshType: 0
+  spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 1
+  textureType: 8
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -64,7 +64,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 3
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -76,7 +76,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 3
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -88,7 +88,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 3
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -100,7 +100,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 3
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0

Assets/Resources/UI/Font/HanWangZonYi.ttf.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: f878f11ea5771c548ac255f4e39b8e4b
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: HanWangZonYi
+  fontNames:
+  - HanWangZonYi
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/AR/RankingItem.prefab

@@ -0,0 +1,696 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &356461756298577401
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 356461756298577400}
+  - component: {fileID: 356461756298577286}
+  - component: {fileID: 356461756298577287}
+  m_Layer: 5
+  m_Name: Country
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &356461756298577400
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756298577401}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 20, y: 0}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &356461756298577286
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756298577401}
+  m_CullTransparentMesh: 0
+--- !u!114 &356461756298577287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756298577401}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 2800000, guid: b4ef0dada618c53418ad349be4b29faa, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!1 &356461756423929918
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 356461756423929917}
+  - component: {fileID: 356461756423929914}
+  - component: {fileID: 356461756423929915}
+  - component: {fileID: 356461756423929916}
+  - component: {fileID: 8572741427611671941}
+  - component: {fileID: -5018459901137952672}
+  m_Layer: 5
+  m_Name: RankingItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &356461756423929917
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 997880171476640055}
+  - {fileID: 356461756298577400}
+  - {fileID: 356461756806036589}
+  - {fileID: 356461757142253271}
+  - {fileID: 356461757161456314}
+  - {fileID: 2862935674694061735}
+  - {fileID: 6265415831168584355}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 226, y: 42}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &356461756423929914
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_CullTransparentMesh: 0
+--- !u!114 &356461756423929915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &356461756423929916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 20
+--- !u!114 &8572741427611671941
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 356461756423929915}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &-5018459901137952672
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756423929918}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8032c539f5d80584da36ae53a0f52e1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &356461756806036590
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 356461756806036589}
+  - component: {fileID: 356461756806036587}
+  - component: {fileID: 356461756806036588}
+  m_Layer: 5
+  m_Name: Rank
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &356461756806036589
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756806036590}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 9, y: 0}
+  m_SizeDelta: {x: 18, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &356461756806036587
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756806036590}
+  m_CullTransparentMesh: 0
+--- !u!114 &356461756806036588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461756806036590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 01
+--- !u!1 &356461757142253256
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 356461757142253271}
+  - component: {fileID: 356461757142253269}
+  - component: {fileID: 356461757142253270}
+  m_Layer: 5
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &356461757142253271
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757142253256}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 112, y: -16}
+  m_SizeDelta: {x: 120, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &356461757142253269
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757142253256}
+  m_CullTransparentMesh: 0
+--- !u!114 &356461757142253270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757142253256}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: username
+--- !u!1 &356461757161456315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 356461757161456314}
+  - component: {fileID: 356461757161456312}
+  - component: {fileID: 356461757161456313}
+  m_Layer: 5
+  m_Name: Distance
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &356461757161456314
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757161456315}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -30, y: 0}
+  m_SizeDelta: {x: 40, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &356461757161456312
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757161456315}
+  m_CullTransparentMesh: 0
+--- !u!114 &356461757161456313
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356461757161456315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 5
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: 0M
+--- !u!1 &3639242128612966977
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2862935674694061735}
+  - component: {fileID: 6570610577854439532}
+  - component: {fileID: 8409263225232607134}
+  m_Layer: 5
+  m_Name: TeamIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2862935674694061735
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3639242128612966977}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 39, y: 0}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6570610577854439532
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3639242128612966977}
+  m_CullTransparentMesh: 0
+--- !u!114 &8409263225232607134
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3639242128612966977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 2800000, guid: 46767b4c189319542a828a125c6040b1, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!1 &4435188239492566977
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 997880171476640055}
+  - component: {fileID: 5130176118857751327}
+  - component: {fileID: 854857842659132472}
+  - component: {fileID: 5746951117280508119}
+  m_Layer: 5
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &997880171476640055
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4435188239492566977}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 226, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5130176118857751327
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4435188239492566977}
+  m_CullTransparentMesh: 0
+--- !u!114 &854857842659132472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4435188239492566977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.13725491, g: 0.13725491, b: 0.1764706, a: 0.4}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5746951117280508119
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4435188239492566977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  radius: 20
+--- !u!1 &8001663301043807377
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6265415831168584355}
+  - component: {fileID: 694393271331409097}
+  - component: {fileID: 2290462453924062911}
+  m_Layer: 5
+  m_Name: TeamName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6265415831168584355
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8001663301043807377}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 356461756423929917}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 112, y: -29}
+  m_SizeDelta: {x: 120, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &694393271331409097
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8001663301043807377}
+  m_CullTransparentMesh: 0
+--- !u!114 &2290462453924062911
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8001663301043807377}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3}
+    m_FontSize: 8
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Team Name

Assets/Resources/UI/Prefab/AR/RankingItem.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ddc272d4509996a43ba84756608b6e7d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UI/Prefab/AR/VideoPlayerHead.prefab

@@ -145,7 +145,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b2f7b1e37045ae645b0f8922a72da5c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 388602e1ded969d44859c90ca4f0bb33, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Resources/UI/Prefab/AR/VideoPlayerInfo.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 356461756298577286}
   - component: {fileID: 356461756298577287}
   m_Layer: 5
-  m_Name: RawImage
+  m_Name: Country
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Resources/UI/direction.txt

@@ -1,17 +1,16 @@
-347:-5
+347~663:-5
-663:0
+1040~1200:-5
-1040:-5
+2000~2300:20
-1200:0
+3290~3425:35
-1400:-5
+6000~6100:35
-1483:0
+9510~9620:-15
-2050:15
+11822~12064:-5
-2300:0
+12200~12514:5
-3300:45
+12514~12644:-5
-3400:0
+13072~13388:5
-6000:45
+13400~13630:25
-6100:0
+14000~14065:25
-9290:-15
+14524~14660:15
-9400:0
+14839~14920:15
-13500:45
+16300~16440:-25
-13600:0
+16563~16650:-25
-

Assets/Scripts/Scenes/VideoRide/AbstractVideoPlayer.cs

@@ -1,9 +1,9 @@
 using Assets.Scenes.Ride.Scripts;
 using Assets.Scripts.Apis.Models;
-using ChartAndGraph;
 using DG.Tweening;
 using Mapbox.Utils;
 using System;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -142,6 +142,10 @@ namespace Assets.Scripts.Scenes.VideoRide
                 animator.SetFloat("speed", (float)speed);
                 animator.SetFloat("grade", (float)currentSlope);
                 animator.SetFloat("power", (float)power);
+                var headBack = ticks % 10 == 0 && speed > 0 && bearing == 0;
+                var drink = ticks % 15 == 0 && speed > 0 && bearing == 0;
+                animator.SetBool("headBack", headBack);
+                animator.SetBool("drinking", drink);
             }
         }
         protected virtual int GetCurrentFrame() 
@@ -150,42 +154,45 @@ namespace Assets.Scripts.Scenes.VideoRide
         }
         private bool animated = false;
         //大转弯是60度
+        private int offset = 0;
         protected virtual void Turn() 
         {
             var currentFrame = GetCurrentFrame();
-            if (manager.mockDirection.ContainsKey((int)currentFrame))
+            var result = manager.mockDirection.Where(c => c.Start < currentFrame && c.End > currentFrame).FirstOrDefault();
+            if (result != null)
             {
-                bearing = manager.mockDirection[(int)currentFrame];
+                bearing = result.Value;
             }
             animator.SetFloat("bearing", bearing);
-
+            if (Math.Abs(bearing) > 50)
-            if (!animated && Math.Abs(bearing) > 30)
             {
-                //TODO:大拐弯动画
+                if (!animated)
-                animated = true;
-                var current = transform.position;
-                //transform.DOMove(new Vector3(current.x+5, current.y, current.z), 1f).onComplete += () =>
-                //{
-                //    current = transform.position;
-                //    transform.DOMove(new Vector3(current.x-5, current.y, current.z), 1f);
-                //};
-                transform.DORotate(new Vector3(0, bearing, 0), 1f);
-                transform.DOMoveX(current.x + 3, 2).onComplete += () =>
                 {
-                };
+                    animated = true;
-                //transform.DOMove(new Vector3(current.x + 5, current.y, current.z), 1f).onComplete += () => {
+                    transform.DOMoveX(transform.position.x + 3, 1).onComplete += () =>
-                //    transform.DOMove(new Vector3(current.x - 5, current.y, current.z), 1f);
+                    {
-                //    animated = false;
+                        offset = -3;
-                //};
+                    };
+                    print(176);
+                }
             }
             else 
             {
-                var aniInfo = animator.GetCurrentAnimatorStateInfo(0);
+                if (offset != 0)
-                if (aniInfo.loop)
                 {
-                    transform.DORotate(new Vector3(0, bearing, 0), 1f);
+                    transform.DOMoveX(transform.position.x + offset, 1f).onComplete += () =>
+                    {
+                        animated = false;
+                    };
+                    offset = 0;
                 }
             }
+            transform.DORotate(new Vector3(0, bearing, 0), 1f);
+            //var aniInfo = animator.GetCurrentAnimatorStateInfo(0);
+            //if (aniInfo.loop)
+            //{
+
+            //}
         }
         //计算人物当前属性
         protected virtual void ComputePlayer()
@@ -201,7 +208,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 distance = 0;
             }
             //一旦有功率就开始骑行、否则暂停
-            if (!manager.IsQuit() && manager.CurrentPlayer.UserId == UserId)
+            if (!manager.IsQuit() && manager.CurrentPlayer.UserId == UserId && !manager.IsQuit())
             {
                 if (power > 0)
                 {

Assets/Scripts/Scenes/VideoRide/ExplosiveScript.cs

@@ -0,0 +1,33 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Assets.Scripts.Scenes.VideoRide
+{
+    public class ExplosiveScript : MonoBehaviour
+    {
+        Image image;
+        private void Awake()
+        {
+            image = transform.GetComponent<Image>();
+        }
+        float flag = 0f;
+        float alph = 0f;
+        private void Update()
+        {
+            flag += Time.deltaTime;
+            if (flag >= 1f)
+            {
+                alph -= Time.deltaTime;
+                if (alph <= 0)
+                {
+                    flag = 0;
+                }
+            }
+            else
+            {
+                alph += Time.deltaTime;
+            }
+            image.color = new Color(image.color.r, image.color.g, image.color.b, alph);
+        }
+    }
+}

Assets/Scripts/Scenes/VideoRide/ExplosiveScript.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7a04020ffe9892d498bfe3031bac76ce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Scenes/VideoRide/OnlineVideoPlayer.cs

@@ -81,22 +81,15 @@ namespace Assets.Scripts.Scenes.VideoRide
                 var mainFrame = manager.GetCurrentFrame();
                 var min = Math.Min(currentFrame, mainFrame);
                 var max = Math.Max(currentFrame, mainFrame);
-                for (int i = min; i < max; i++)
+                var result = manager.mockDirection.Where(c => c.Start < currentFrame && c.End > currentFrame).FirstOrDefault();
-                {
+                bearing = result?.Value ?? 0;
-                    if (manager.mockDirection.ContainsKey(currentFrame))
+                animator.SetFloat("bearing", bearing);
-                    {
-                        bearing = manager.mockDirection[currentFrame];
-                    }
-                    animator.SetFloat("bearing", bearing);
-                }
             }
             else
             {
                 var mainFrame = manager.GetCurrentFrame();
-                if (manager.mockDirection.ContainsKey(mainFrame))
+                var result = manager.mockDirection.Where(c => c.Start < mainFrame && c.End > mainFrame).FirstOrDefault();
-                {
+                bearing = result?.Value ?? 0;
-                    bearing = manager.mockDirection[mainFrame];
-                }
                 animator.SetFloat("bearing", bearing);
             }
         }

Assets/Scripts/Scenes/VideoRide/RankingItemScript.cs

@@ -0,0 +1,50 @@
+using Assets.Scripts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Assets.Scripts.Scenes.VideoRide
+{
+    public class RankingItemScript:MonoBehaviour
+    {
+        Text rankingText;
+        Text nameText;
+        Text timerText;
+
+        RawImage head;
+        RawImage country;
+        private void Awake()
+        {
+            rankingText = transform.Find("Rank").GetComponent<Text>();
+            nameText = transform.Find("Name").GetComponent<Text>();
+            timerText = transform.Find("Distance").GetComponent<Text>();
+           // head = transform.Find("Head").GetComponent<RawImage>();
+            country = transform.Find("Country").GetComponent<RawImage>();
+        }
+
+        public void SetRanking(string ranking)
+        {
+            rankingText.text = ranking.PadLeft(2,'0');
+        }
+        public void SetName(string name)
+        {
+            nameText.text = name;
+        }
+        public void SetTimer(string timer)
+        {
+            timerText.text = timer;
+        }
+        public void SetHead(string url)
+        {
+            Utils.DisplayImage(head, url);
+        }
+        public void SetCountry(Texture texture)
+        {
+            country.texture = texture; 
+        }
+    }
+}

Assets/Scripts/Scenes/VideoRide/RankingItemScript.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8032c539f5d80584da36ae53a0f52e1a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Scenes/VideoRide/RankingScript.cs

@@ -13,12 +13,33 @@ namespace Assets.Scripts.Scenes.VideoRide
     {
         GameObject Hide { get; set; }
         GameObject Show { get; set; }
+        VideoGameManager manager { get; set; } 
         private void Start()
         {
             Hide = transform.Find("Head/Hide").gameObject;
             Show = transform.Find("Head/Show").gameObject;
+            manager = FindObjectOfType<VideoGameManager>();
             UIManager.AddEvent(Hide, UnityEngine.EventSystems.EventTriggerType.PointerClick, Hidehandler);
             UIManager.AddEvent(Show, UnityEngine.EventSystems.EventTriggerType.PointerClick, Showhandler);
+            Init();
+        }
+
+        private void Init()
+        {
+            var list = manager.GetRankingList();
+            if (list != null)
+            {
+                var prefab = Resources.Load<GameObject>("UI/Prefab/AR/RankingItem");
+                foreach (var item in list.list)
+                {
+                    GameObject newObj = (GameObject)Instantiate(prefab, transform.Find("List/Viewport/Content"));
+                    var itemScript = newObj.GetComponent<RankingItemScript>();
+                    itemScript.SetName(item.NickName);
+                    var texture = manager.GetCountryImageByCode(item.CountryCode);
+                    itemScript.SetCountry(texture);
+                    itemScript.SetTimer(item.TotalTime);
+                }
+            }
         }
         public void Hidehandler(BaseEventData data)
         {

Assets/Scripts/Scenes/VideoRide/ShakeCamera.cs

@@ -0,0 +1,81 @@
+using UnityEngine;
+using System.Collections;
+
+public class ShakeCamera : MonoBehaviour
+{
+
+    // 震动标志位
+    private bool isshakeCamera = true;
+
+    // 震动幅度
+    public float shakeLevel = 3f;
+    // 震动时间
+    public float setShakeTime = 0.2f;
+    // 震动的FPS
+    public float shakeFps = 45f;
+
+    private float fps;
+    private float shakeTime = 0.0f;
+    private float frameTime = 0.0f;
+    private float shakeDelta = 0.005f;
+    private Camera selfCamera;
+
+    private Rect changeRect;
+
+    void Awake()
+    {
+        selfCamera = Camera.main;
+        changeRect = new Rect(0.0f, 0.0f, 1.0f, 1.0f);
+    }
+
+    // Use this for initialization
+    void Start()
+    {
+        shakeTime = setShakeTime;
+        fps = shakeFps;
+        frameTime = 0.03f;
+        shakeDelta = 0.005f;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (isshakeCamera)
+        {
+            if (shakeTime > 0)
+            {
+                shakeTime -= Time.deltaTime;
+                if (shakeTime <= 0)
+                {
+                    changeRect.xMin = 0.0f;
+                    changeRect.yMin = 0.0f;
+                    selfCamera.rect = changeRect;
+                    isshakeCamera = false;
+                    shakeTime = setShakeTime;
+                    fps = shakeFps;
+                    frameTime = 0.03f;
+                    shakeDelta = 0.005f;
+                }
+                else
+                {
+                    frameTime += Time.deltaTime;
+
+                    if (frameTime > 1.0 / fps)
+                    {
+                        frameTime = 0;
+                        changeRect.xMin = shakeDelta * (-1.0f + shakeLevel * Random.value);
+                        changeRect.yMin = shakeDelta * (-1.0f + shakeLevel * Random.value);
+                        selfCamera.rect = changeRect;
+                    }
+                }
+            }
+        }
+    }
+
+    public void shake()
+    {
+        isshakeCamera = true;
+    }
+}
+
+

Assets/Scripts/Scenes/VideoRide/ShakeCamera.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 68972f1ed725ed94bb600236ab29a6d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Scenes/VideoRide/VideoGameManager.cs

@@ -20,6 +20,12 @@ using UnityEngine.Events;
 
 namespace Assets.Scripts.Scenes.VideoRide
 {
+    public class CustomRange
+    {
+        public int Start { get; set; }
+        public int End { get; set; }
+        public int Value { get; set; }
+    }
     public class VideoGameManager : DeviceServiceMonoBase
     {
         [SerializeField]
@@ -36,7 +42,7 @@ namespace Assets.Scripts.Scenes.VideoRide
         public DateTime startTime { get; set; }
         public CyclingModel cyclingModel;
         public BaseCycling cyclingController;
-        public Dictionary<int, int> mockDirection = new Dictionary<int, int>();
+        public List<CustomRange> mockDirection = new List<CustomRange>();
         private double endDistance { get; set; }
         public List<float> slots = new List<float>();
         GameObject infoPanel;
@@ -98,6 +104,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             endDistance = 0;
             //倒计时5s开始
             SetCyclingModel(CyclingModel.Single);
+           
         }
         // Update is called once per frame
         float timer = 1f;
@@ -119,6 +126,18 @@ namespace Assets.Scripts.Scenes.VideoRide
                 timer += 1f;
             }
         }
+        MapRouteRankingList rankingList;
+        public MapRouteRankingList GetRankingList()
+        {
+            if (rankingList != null)
+                return rankingList;
+            var list = ConfigHelper.mapApi.GetRouteRanking(App.RouteIdParam, "1", 0, 10, "");
+            if (list.result) 
+            {
+                rankingList = list.data;
+            }
+            return rankingList;
+        }
 
         //创建当前线路其他选手
         private void CreateOnlineUser(List<BaseRider> list)
@@ -191,6 +210,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             {
                 videoPlayer?.gameObject.SetActive(true);
                 CurrentPlayer = videoPlayer;
+                ContinueAsync();
             }
         }
 
@@ -251,34 +271,21 @@ namespace Assets.Scripts.Scenes.VideoRide
             return infoPanel;
         }
         //骑行记录
-        public async Task ContinueAsync()
+        public void ContinueAsync()
         {
-            //继续骑行数据
+            //骑行结果
-            var r = await ConfigHelper.mapInterruptRecordApi.GetMapInterruptRecord("重庆", 0, 20, "routes");
+            if (App.routeResult != null)
-            if (r.result)
             {
-                var first = r.data.FirstOrDefault();
+                routeResult = App.routeResult;
-                RouteResult routeResult = first.ToObject<RouteResult>();
+                selectParamModel = App.routeResult.ContinueCyclingParam;//继续骑行
-                if (routeResult.ContinueCyclingParam != null)
+                SetCyclingModel(CyclingModel.Single);
-                {
+                endDistance = routeResult.EndDistance;
-                    App.RouteIdParam = routeResult.RouteId;
+                SetCurrentFrame(routeResult.LastFrame ?? 0);
-                    App.routeResult = routeResult;
+                var v = FindObjectOfType<VideoPlayer>();
-                    //骑行结果
+                v.SetEndDistance(endDistance);
-                    if (App.routeResult != null)
-                    {
-                        routeResult = App.routeResult;
-                        selectParamModel = App.routeResult.ContinueCyclingParam;//继续骑行
-                        SetCyclingModel(CyclingModel.Single);
-                        endDistance = routeResult.EndDistance;
-                        var ratio = endDistance / routeResult.TotalDistance;
-                        var frame = Math.Round(ratio * mediaPlayer.Info.GetMaxFrameNumber());
-                        SetCurrentFrame(routeResult.LastFrame ?? 0);
-                        var v = FindObjectOfType<VideoPlayer>();
-                        v.SetEndDistance(endDistance);
-                    }
-                }
             }
         }
+     
         private void MockDirection()
         {
             var text = Resources.Load<TextAsset>("UI/direction");
@@ -287,7 +294,13 @@ namespace Assets.Scripts.Scenes.VideoRide
             {
                 if (string.IsNullOrEmpty(item))
                     continue;
-                mockDirection.Add(Convert.ToInt32(item.Split(':')[0]), Convert.ToInt32(item.Split(':')[1]));
+                var result = item.Split(':');
+                var range = result[0].Split('~');
+                mockDirection.Add(new CustomRange() { 
+                    Start = Convert.ToInt32(range[0]),
+                    End = Convert.ToInt32(range[1]),
+                    Value = Convert.ToInt32(result[1]),
+                });
             }
         }
         //设置骑行模式
@@ -356,8 +369,16 @@ namespace Assets.Scripts.Scenes.VideoRide
         //暂停
         public void Pause()
         {
-            isStart = false;
+            isStart = !isStart;
-            mediaPlayer?.Pause();
+            isStop = !isStop;
+            if (isStop)
+            {
+                mediaPlayer?.Pause();
+            }
+            else
+            {
+                mediaPlayer?.Play();
+            }
         }
         //退出骑行
         public void Quit()

Assets/Scripts/Scenes/VideoRide/VideoPlayer.cs

@@ -2,6 +2,7 @@
 using Assets.Scenes.Ride.Scripts.Model;
 using DG.Tweening;
 using System;
+using System.Linq;
 using UnityEngine;
 
 namespace Assets.Scripts.Scenes.VideoRide
@@ -36,11 +37,10 @@ namespace Assets.Scripts.Scenes.VideoRide
         protected override void ComputeAnimator()
         {
             base.ComputeAnimator();
-            var currentFrame = manager.GetCurrentFrame();
+
-            if (manager.mockDirection.ContainsKey(currentFrame))
+            var mainFrame = manager.GetCurrentFrame();
-            {
+            var result = manager.mockDirection.Where(c => c.Start < mainFrame && c.End > mainFrame).FirstOrDefault();
-                bearing = manager.mockDirection[currentFrame];
+            bearing = result?.Value ?? 0;
-            }
             animator.SetFloat("bearing", bearing);
         }
         protected override void ComputePlayer()
@@ -48,11 +48,11 @@ namespace Assets.Scripts.Scenes.VideoRide
             heartRate = manager.UpDateHeart();
             power = manager.UpdatePower();
             cadance = manager.UpdateCadence();
-            #region TEST 
+            #if UNITY_EDITOR
-            //power = 200;
+            power = 1200;
             cadance = 150;
             heartRate = 160;
-            #endregion
+            #endif
             weight = App.CurrentUser.Weight;
             bicycleWeight = App.CurrentUser.BicycleWeight;
             wkg = Math.Round(power / weight, 2);

Assets/Scripts/Scenes/VideoRide/VideoUIManager.cs

@@ -61,7 +61,6 @@ namespace Assets.Scripts.Scenes.VideoRide
         {
             UIManager.SetModalPanel(transform.Find("ModalPanel").GetComponent<PFUIPanel>());
             manager = FindObjectOfType<VideoGameManager>();
-            button = transform.Find("Panel/Button").gameObject;
             Init();
         }
         // Update is called once per frame
@@ -70,7 +69,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             if (manager != null)
             {
                 mapName.text = manager.GetMapRoute().Name;
-                //infoText.text = $"帧数：{manager.GetCurrentFrame()}";
+                infoText.text = $"帧数：{manager.GetCurrentFrame()}";
                 if (manager.CurrentPlayer != null)
                 {
                     power.text = Math.Round(manager.CurrentPlayer.power).ToString();
@@ -85,6 +84,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                     //ftp
                     ftpImage.fillAmount = (float)(manager.CurrentPlayer.wkg / MAXWKG);
                     wkg.text = $"{manager.CurrentPlayer.wkg}w/kg";
+                    explosive.SetActive(manager.CurrentPlayer.power > 600);
                 }
             }
         }
@@ -104,8 +104,10 @@ namespace Assets.Scripts.Scenes.VideoRide
         }
         GameObject ComputerPanel { get; set; }
         GameObject WatchPanel { get; set; }
+        GameObject explosive { get; set; }
         private void Init()
         {
+            infoText = transform.Find("InfoText").GetComponentInChildren<Text>();
             ComputerPanel = transform.Find("Panel/ComputerPanel").gameObject;
             WatchPanel = transform.Find("Panel/WatchPanel").gameObject;
             power = transform.Find("Panel/ComputerPanel/Power").GetComponent<Text>();
@@ -133,6 +135,8 @@ namespace Assets.Scripts.Scenes.VideoRide
             //modal
             settingPanel = transform.Find("Panel/SettingPanel").gameObject;
             resultPanel = transform.Find("Panel/ResultPanel").gameObject;
+            //
+            explosive = transform.Find("Panel/Explosive").gameObject;
             //toolbar 事件注册
             UIManager.AddEvent(pauseBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, PauseClick);
             UIManager.AddEvent(changeViewBtn, UnityEngine.EventSystems.EventTriggerType.PointerClick, ChangeViewClick);
@@ -191,6 +195,7 @@ namespace Assets.Scripts.Scenes.VideoRide
             var rankingScript = FindObjectOfType<RankingScript>();
             var currentPlayer = manager.CurrentPlayer == null ? videoPlayer.transform : manager.CurrentPlayer.transform;
             _viewMode = _viewMode == ViewMode.THIRD ? ViewMode.FIRST : ViewMode.THIRD;
+            var cameraImage = changeViewBtn.transform.Find("Camera").gameObject;
             if (_viewMode == ViewMode.FIRST)
             {
                 currentPlayer.DOMoveZ(-0.1f, 0f);
@@ -198,6 +203,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 ftpPanel.SetActive(true);
                 nearByScript.Hidehandler(null);
                 rankingScript.Hidehandler(null);
+                cameraImage.SetActive(true);
             }
             else
             {
@@ -206,6 +212,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 currentPlayer.DOMoveY(-1f, 0f);
                 nearByScript.Showhandler(null);
                 rankingScript.Showhandler(null);
+                cameraImage.SetActive(false);
             }
         }
         private void QuitClick(BaseEventData e)
@@ -216,6 +223,7 @@ namespace Assets.Scripts.Scenes.VideoRide
                 UIManager.ShowConfirm("Quit", "Do you want to keep the record?",
                     () =>
                     {
+                        videoPlayer = FindObjectOfType<VideoPlayer>();
                         videoPlayer?.Upload();
                         UIManager.CloseConfirm();
                         //show result

Assets/Scripts/UI/Control/PfUIButton.cs

@@ -87,7 +87,6 @@ namespace Assets.Scripts.UI.Control
                 //tooltips.GetComponent<RectTransform>().localPosition.
                 tooltips.transform.Find("Text").GetComponent<Text>().text = App.GetLocalString(Tooltips);
                 var pftext = tooltips.transform.Find("Text").GetComponent<PFUIText>();
-                Debug.Log(pftext);
                 if (pftext) 
                 {
                     tooltips.transform.Find("Text").GetComponent<PFUIText>().key = Tooltips;

Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs

@@ -289,7 +289,14 @@ public class RouteItem : MonoBehaviour
                 App.RouteIdParam = routeResult.RouteId;
                 App.routeResult = routeResult;
                 RecordFromUrl();
-                SceneManager.LoadScene("Ride");
+                if (routeResult.LastFrame.HasValue)
+                {
+                    SceneManager.LoadScene("VideoPlay");
+                }
+                else
+                {
+                    SceneManager.LoadScene("Ride");
+                }
             }
         });
     }