完善动画流程

Assets/Art/Models/LouDi/SM_Niu_ZiGongJIAO.fbx.meta

@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: add8990208c1edb4ba8b9135297da6d3
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/弹窗-退出.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: beafc472114b880428a732e39975428c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab

@@ -0,0 +1,435 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &677115793739368107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 677115793739368106}
+  - component: {fileID: 677115793739368108}
+  - component: {fileID: 677115793739368109}
+  m_Layer: 5
+  m_Name: FirstFreeViewPrefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &677115793739368106
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793739368107}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1435139407657757270}
+  m_Father: {fileID: 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: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &677115793739368108
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793739368107}
+  m_CullTransparentMesh: 0
+--- !u!114 &677115793739368109
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793739368107}
+  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, g: 0, b: 0, a: 0.5019608}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  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!1 &677115793818007531
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 677115793818007530}
+  - component: {fileID: 677115793818007532}
+  - component: {fileID: 677115793818007533}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &677115793818007530
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793818007531}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 677115793848439996}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &677115793818007532
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793818007531}
+  m_CullTransparentMesh: 0
+--- !u!114 &677115793818007533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793818007531}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 20ebdb412ee9aec4a9d3005965d9c962, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u786E  \u8BA4"
+--- !u!1 &677115793848439997
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 677115793848439996}
+  - component: {fileID: 677115793848439985}
+  - component: {fileID: 677115793848439998}
+  - component: {fileID: 677115793848439999}
+  m_Layer: 5
+  m_Name: ConfirmBtn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &677115793848439996
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793848439997}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 677115793818007530}
+  m_Father: {fileID: 1435139407657757270}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 32.9}
+  m_SizeDelta: {x: 85.6741, y: 28.558}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &677115793848439985
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793848439997}
+  m_CullTransparentMesh: 0
+--- !u!114 &677115793848439998
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793848439997}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fa63ae52e51e2064390c2a75c12f664c, type: 3}
+  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 &677115793848439999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115793848439997}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 2
+  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: 21300000, guid: 8c77a2052664d0d4e9be892444deddd1,
+      type: 3}
+    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: 677115793848439998}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &677115794628638322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 677115794628638325}
+  - component: {fileID: 677115794628638327}
+  - component: {fileID: 677115794628638324}
+  m_Layer: 5
+  m_Name: ContentTxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &677115794628638325
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115794628638322}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1435139407657757270}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 27.9}
+  m_SizeDelta: {x: -20, y: -94.215}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &677115794628638327
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115794628638322}
+  m_CullTransparentMesh: 0
+--- !u!114 &677115794628638324
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 677115794628638322}
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 6682f39107ec959478d15f6ada28f19a, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5DF2\u5207\u6362\u81F3\u81EA\u7531\u79FB\u52A8\u89C6\u89D2\uFF0C\u70B9\u51FB\u53F3\u4E0B\u89D2\u6309\u94AE\u53EF\u56DE\u5230\u9884\u7F6E\u89C6\u89D2"
+--- !u!1 &3962870374185648546
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1435139407657757270}
+  - component: {fileID: 4983709588388820001}
+  - component: {fileID: 8768059054124034680}
+  m_Layer: 5
+  m_Name: BG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1435139407657757270
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3962870374185648546}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 677115794628638325}
+  - {fileID: 677115793848439996}
+  m_Father: {fileID: 677115793739368106}
+  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: -44.938263}
+  m_SizeDelta: {x: 470, y: 146}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4983709588388820001
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3962870374185648546}
+  m_CullTransparentMesh: 1
+--- !u!114 &8768059054124034680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3962870374185648546}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 003fddd8e0543224fb849ccdbb422cd6, type: 3}
+  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

Assets/Resources/UIPrefabs/FirstFreeViewPrefab.prefab.meta

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

Assets/Resources/UIPrefabs/ScoreDataPanel.prefab

@@ -1140,7 +1140,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65E0\u8BBA\u540D\u5B57\u6709\u591A\u957F\uFF0C\u70B9\u51FB\u4E0B\u8F7D\u90FD\u5728\u540E\u8FB9\u865A\u62DF\u5B9E\u8BAD\u6210\u7EE9\u5355"
+  m_Text: "\u865A\u62DF\u5B9E\u8BAD\u6210\u7EE9\u5355"
 --- !u!114 &1289845331804632417
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Resources/UIPrefabs/SelectToolsPanel.prefab

@@ -692,7 +692,7 @@ MonoBehaviour:
   m_Elasticity: 0.1
   m_Inertia: 1
   m_DecelerationRate: 0.135
-  m_ScrollSensitivity: 1
+  m_ScrollSensitivity: 20
   m_Viewport: {fileID: 3422302203127391312}
   m_HorizontalScrollbar: {fileID: 0}
   m_VerticalScrollbar: {fileID: 7765589194165323504}

Assets/Resources/UIPrefabs/VideoShowPanel.prefab

@@ -1804,7 +1804,7 @@ MonoBehaviour:
   m_VideoPath: 
   m_AutoOpen: 1
   m_AutoStart: 1
-  m_Loop: 1
+  m_Loop: 0
   m_Volume: 1
   m_Balance: 0
   m_Muted: 0

Assets/StreamingAssets/ExcelJson/NiuData.txt

@@ -112,7 +112,7 @@
     "ToolsName": "注射器|长柄钳|氯前列烯醇|消毒纸巾|阴道栓|保定架|润滑剂|垃圾袋",
     "ModelBT": "",
     "Operation": "",
-    "ProcessDescription": "注射器、孕酮阴道栓（CIDR）、长柄钳、氯前列烯醇、前列腺素（PG）、消毒纸巾、保定架",
+    "ProcessDescription": "注射器、阴道栓、长柄钳、氯前列烯醇、消毒纸巾、保定架、润滑剂、垃圾袋",
     "SoundPath": "",
     "VideoPath": "",
     "TimelineLength": 0,
@@ -1109,8 +1109,8 @@
     "CameraNearTR2": "",
     "QNextNum": 44,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "双筒显微镜|玻璃棒|长柄镊子",
@@ -2253,8 +2253,8 @@
     "CameraNearTR2": "",
     "QNextNum": 88,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "注射器|保定架|一次性长臂塑料手套",
@@ -2761,7 +2761,7 @@
     "TaskName": "操作准备",
     "ThreeTaskName": "物品准备",
     "TaskType": "物品展示",
-    "ToolsName": "消毒纸巾|润滑剂|恒温水浴锅|长柄镊子|输精枪|输精枪外套|保定架|细管专用剪|0.3%高锰酸钾|杯子|液氮罐|垃圾袋",
+    "ToolsName": "消毒纸巾|润滑剂|恒温水浴锅|长柄镊子|输精枪|输精枪外套|保定架|细管专用剪|0.3%高锰酸钾|杯子|液氮罐|垃圾袋|一次性长臂塑料手套",
     "ModelBT": "",
     "Operation": "",
     "ProcessDescription": "输精枪及外套管、保定架、一次性长臂塑料手套、恒温水浴锅、长柄镊子、细管专用剪、0.3%高锰酸钾、消毒纸巾、液氮罐",
@@ -2773,8 +2773,8 @@
     "CameraNearTR2": "",
     "QNextNum": 108,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "冲卵管|长柄钳|玻璃棒",
@@ -3709,8 +3709,8 @@
     "CameraNearTR2": "",
     "QNextNum": 144,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "输精枪|开窒器|长柄钳",
@@ -4218,7 +4218,7 @@
     "ThreeTaskName": "冲胚步骤",
     "TaskType": "动画",
     "ToolsName": "",
-    "ModelBT": "CPzigongjiao2",
+    "ModelBT": "Cpzigongjiao",
     "Operation": "点击后，冲卵管出现在另一侧的子宫角（气球膨胀的状态），播放注入液体、抬高子宫角、承接回收液的动画另一侧子宫角",
     "ProcessDescription": "完成一侧子宫冲卵后，再对另一侧子宫进行冲卵",
     "SoundPath": "N075",
@@ -4437,8 +4437,8 @@
     "CameraNearTR2": "",
     "QNextNum": 172,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "双筒显微镜|注射器|玻璃棒",
@@ -4879,8 +4879,8 @@
     "CameraNearTR2": "",
     "QNextNum": 189,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "玻璃棒|输精枪|开窒器",
@@ -5685,8 +5685,8 @@
     "CameraNearTR2": "",
     "QNextNum": 220,
     "ExamModelBT": "",
-    "ExamTip": "",
+    "ExamTip": "请在右侧物品栏中，点选当前实训所需的器械",
-    "ExamEvvr": "",
+    "ExamEvvr": "物品选择错误，当前模块中，不需要该物品",
     "Question": "",
     "OptionsAll": "",
     "OptionErro": "输精枪|凯苏枪|双筒显微镜",

Assets/Third/AVProVideo/Demos/Scripts/VCRCustom.cs

@@ -7,6 +7,7 @@ using DG.Tweening;
 using CG.UTility;
 using UnityEngine.EventSystems;
 using ZXK.LouDiXvMuNiu;
+using System;
 /*******************************************************************************
 *Create By CG
 *Function ÊÓƵ²¥·ÅÆ÷
@@ -50,6 +51,8 @@ public class VCRCustom : MonoBehaviour
     private float _curMouseTime = 0.0f;
     private Vector2 _previousPos = Vector2.zero;
 
+    private Action _finishHandle;
+
     //private string _videoPath = Application.streamingAssetsPath + @"/AVProVideoSamples/BigBuckBunny_720p30.mp4";
 
     void Start()
@@ -105,6 +108,10 @@ public class VCRCustom : MonoBehaviour
             }
         }
     }
+    public void SetFinishAction(Action finishAnm)
+    {
+        _finishHandle = finishAnm;
+    }
     void Update()
     {
         if (_playingPlayer && _playingPlayer.Info != null && _playingPlayer.Info.GetDurationMs() > 0f)
@@ -168,6 +175,7 @@ public class VCRCustom : MonoBehaviour
             case MediaPlayerEvent.EventType.FirstFrameReady:
                 break;
             case MediaPlayerEvent.EventType.FinishedPlaying:
+                _finishHandle?.Invoke();
                 break;
         }
         WDebug.Log("Event: " + et.ToString());

Assets/TimeLine/CSPLCLTimeLineCtrl.playable

@@ -5958,7 +5958,25 @@ MonoBehaviour:
       m_RotationOrder: 4
     m_MixOutCurve:
       serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -5985,7 +6003,25 @@ MonoBehaviour:
     m_BlendOutDuration: -1
     m_MixInCurve:
       serializedVersion: 2
-      m_Curve: []
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -15737,7 +15773,7 @@ AnimationClip:
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
-        time: 65.03333
+        time: 65
         value: {x: -0.3160965, y: 0, z: 2.5212123}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
@@ -15831,7 +15867,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 65.03333
+        time: 65
         value: -0.3160965
         inSlope: 0
         outSlope: 0
@@ -15888,7 +15924,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 65.03333
+        time: 65
         value: 0
         inSlope: 0
         outSlope: 0
@@ -15945,7 +15981,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
-        time: 65.03333
+        time: 65
         value: 2.5212123
         inSlope: 0
         outSlope: 0

Assets/TimeLine/PeoplePlanTimeLineCtrl.playable

@@ -415,7 +415,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -8598380649257887164}
-    m_Duration: 77.5
+    m_Duration: 58.0833333333334
     m_TimeScale: 1
     m_ParentTrack: {fileID: -2703544339307601112}
     m_EaseInDuration: 0

Assets/_Scripts/Application/GameManager.cs

@@ -32,6 +32,8 @@ namespace ZXK.LouDiXvMuNiu
         [System.NonSerialized]
         public float _CurMouseFlexible = 50.0f;
 
+        public bool _IsFirstFreeCamera = true;
+
         protected override void AwakeSelf()
         {
             base.AwakeSelf();

Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs

@@ -140,7 +140,7 @@ namespace ZXK.LouDiXvMuNiu
                 //}
                 if (_CurSceneStep.TaskType.Equals(ConstCtrl.TASKTYPE_Anim))
                 {//timeline¶¯»­
-                    if (Input.GetMouseButtonUp(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)&& !_IsPlayAnm)
+                    if (Input.GetMouseButtonDown(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity)&& !_IsPlayAnm)
                     {
                         if (!string.IsNullOrEmpty(curdata.CameraNearTR2)&& _isNearCameraTR)
                         {
@@ -158,7 +158,7 @@ namespace ZXK.LouDiXvMuNiu
                 }
                 else if (_CurSceneStep.TaskType.Equals(ConstCtrl.TASKTYPE_Video))
                 {
-                    if (Input.GetMouseButtonUp(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity))
+                    if (Input.GetMouseButtonDown(0) && Physics.Raycast(ray, out rayHit, Mathf.Infinity))
                     {
                         ClickToolCallInTrainState(rayHit.transform.gameObject, () =>
                         {
@@ -379,7 +379,6 @@ namespace ZXK.LouDiXvMuNiu
                     {
                         SetTimeLineCtrl(curObj, previousObj, _CPTimeLineClip, 5 / 60.0f);
                     }
-                    _CPTran.Find("SM_Niu_ChongPei01").gameObject.SetActive(true);
                 }
                 else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ))
                 {
@@ -387,7 +386,6 @@ namespace ZXK.LouDiXvMuNiu
                 }
                 else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ))
                 {
-                    _RGSJTran.Find("SM_Niu_RenGongSouJing01").gameObject.SetActive(true);
                     SetTimeLineCtrl(curObj, previousObj, _PTYZTimeLineClip, 0);
                 }
                 else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD))
@@ -408,7 +406,6 @@ namespace ZXK.LouDiXvMuNiu
                             }
                         }
                     }
-                    _YYZDTran.Find("SM_YinDaoJianCha01").gameObject.SetActive(true);
                     SetTimeLineCtrl(curObj, previousObj, _YYZDTimeLineClip, 0);
                 }
             }
@@ -735,11 +732,13 @@ namespace ZXK.LouDiXvMuNiu
             {
                 if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
                 {
-                    GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
+                    JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(), false);
+                    //GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
                 }
                 else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
                 {
-                    GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum);
+                    JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum), false);
+                    //GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum);
                 }
                 _IsPlayAnm = false;
             });
@@ -878,6 +877,10 @@ namespace ZXK.LouDiXvMuNiu
                 }
             }
         }
+        public void JumpToTime(float time)
+        {
+            _curTimeLineCtrl.ContinuePlayBackwardByPausePoint(time, null);
+        }
         /// <summary>
         /// ÕýÏòÌøת²½Öè
         /// </summary>

Assets/_Scripts/Application/UI/AppSettingPanel.cs

@@ -88,14 +88,17 @@ namespace ZXK.LouDiXvMuNiu
             });
             _scoreBtn.onClick.AddListener(() =>
             {
+                PopUpMng._TriAble = false;
                 UI_Manage.Instance.ShowPanel("ScoreDataPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ScoreDataPanel"), UIGroup.Tip);
             });
             _desBtn.onClick.AddListener(() =>
             {
+                PopUpMng._TriAble = false;
                 UI_Manage.Instance.ShowPanel("ExplainContainPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.ExplainContainPanel"), UIGroup.Tip);
             });
             _setBtn.onClick.AddListener(() =>
             {
+                PopUpMng._TriAble = false;
                 UI_Manage.Instance.ShowPanel("VolumeTranSettingPanel", System.Type.GetType("ZXK.LouDiXvMuNiu.VolumeTranSettingPanel"), UIGroup.Tip);                
             });
             _closeBtn.onClick.AddListener(() =>

Assets/_Scripts/Application/UI/OperationStepPanel.cs

@@ -337,6 +337,10 @@ namespace ZXK.LouDiXvMuNiu
                     }
                     else
                     {
+                        if(obj.id== 236)
+                        {
+                            NiuSceneMng._Instance.JumpToTime(2950.0f/60.0f);
+                        }
                         NiuSceneMng._Instance.AnswerSystemInStep(obj);
                     }
                 }
@@ -604,6 +608,11 @@ namespace ZXK.LouDiXvMuNiu
         {
             NiuSceneMng._Instance._isNearCameraTR = false;
             _defaultCameraTRTog.isOn = _nearCameraTRTog.isOn = false;
+            if (GameManager.Instance._IsFirstFreeCamera)
+            {
+                GameManager.Instance._IsFirstFreeCamera = false;
+                PopUpMng.PopFirstFreeViewAlert(null);
+            }
         }
            
     }

Assets/_Scripts/Application/UI/ThreeVideoChoicePrefab.cs

@@ -58,6 +58,13 @@ namespace ZXK.LouDiXvMuNiu
 
             _closeBtn.onClick.AddListener(() =>
             {
+                if (!_videoItemContainer.GetChild(rightNumber).GetComponent<Toggle>().isOn)
+                {
+                    _videoItemContainer.GetChild(0).GetComponent<Toggle>().isOn = false;
+                    _videoItemContainer.GetChild(1).GetComponent<Toggle>().isOn = false;
+                    _videoItemContainer.GetChild(2).GetComponent<Toggle>().isOn = false;
+                }
+                
                 Image rightImg = _videoItemContainer.GetChild(rightNumber).Find("Selected").GetComponent<Image>();
                 rightImg.DOFade(1.0f,1.0f).SetLoops(6, LoopType.Yoyo).OnComplete(() =>
                 {

Assets/_Scripts/Application/UI/VideoShowPanel.cs

@@ -20,9 +20,7 @@ namespace ZXK.LouDiXvMuNiu
             _videoCtrl = GetWedage("VCRPanel_N").GetComponent<VCRCustom>();
             AddEventListener("ExitVideoBtn_N", UIEventType.OnButtonClick, () =>
             {
-                _exitEvent?.Invoke();
+                FinishAction();
-                UI_Manage.Instance.ClosePanel("VideoShowPanel");
-                UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel");
             });
         }
 
@@ -32,6 +30,14 @@ namespace ZXK.LouDiXvMuNiu
             
             string _videoPath = Application.streamingAssetsPath + ConstCtrl.VIDEO_CSDY_PATH+clipName+".mp4";
             _videoCtrl.GetComponent<VCRCustom>().OnOpenVideoFile(_videoPath);
+            _videoCtrl.GetComponent<VCRCustom>().SetFinishAction(FinishAction);
+        }
+
+        private void FinishAction()
+        {
+            _exitEvent?.Invoke();
+            UI_Manage.Instance.ClosePanel("VideoShowPanel");
+            UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel");
         }
     }
 }

Assets/_Scripts/Framework/AudioMng/AudioMng.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using ZXK.LouDiXvMuNiu;
 /*******************************************************************************
 *Create By CG
 *Function 
@@ -30,6 +31,11 @@ namespace CG.Framework
 
         public float _CurVolume = 1;
 
+        private void Update()
+        {
+            AdjustVolume(GameManager.Instance._CurAppVoice);
+        }
+
         public void AdjustVolume(float volue)
         {
             //WDebug.Log($"修改声音：{volue}");

Assets/_Scripts/Framework/Utilities/PopUpMng.cs

@@ -169,6 +169,25 @@ namespace CG.UTility
             alertGeo.transform.SetAsLastSibling();
         }
         /// <summary>
+        /// [第一次切换到自由视角提示]
+        /// </summary>
+        /// <param name="titleTxt">弹窗主题</param>
+        /// <param name="content">弹窗正文</param>
+        /// <param name="btnTxt">确认按钮文本</param>
+        /// <param name="configBtnEvent">点击确认按钮后触发事件</param>
+        public static void PopFirstFreeViewAlert(System.Action configBtnEvent)
+        {
+            _TriAble = false;
+            GameObject alertGeo = UI_Manage.Instance.ShowPanel("FirstFreeViewPrefab", null, UIGroup.Tip);
+            alertGeo.transform.Find("BG/ConfirmBtn").GetComponent<Button>().onClick.AddListener(() =>
+            {
+                _TriAble = true;
+                configBtnEvent?.Invoke();
+                GameObject.Destroy(alertGeo);
+            });
+            alertGeo.transform.SetAsLastSibling();
+        }
+        /// <summary>
         /// 弹窗出现后需要点击确认按钮或取消按钮后消失
         /// </summary>
         /// <param name="titleTxt">弹窗主题</param>

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 6278
+  controlID: 32156
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -49,9 +49,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 340
+    y: 494
-    width: 907
+    width: 965
-    height: 651
+    height: 497
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -104,23 +104,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 907
+      width: 965
-      height: 630
+      height: 476
-    m_Scale: {x: 0.47239584, y: 0.47239584}
+    m_Scale: {x: 0.44074073, y: 0.44074073}
-    m_Translation: {x: 453.5, y: 315}
+    m_Translation: {x: 482.5, y: 238}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -960
+      x: -1094.7479
-      y: -666.81366
+      y: -540
-      width: 1920
+      width: 2189.4958
-      height: 1333.6273
+      height: 1080
     m_MinimalGUI: 1
-  m_defaultScale: 0.47239584
+  m_defaultScale: 0.44074073
-  m_LastWindowPixelSize: {x: 907, y: 651}
+  m_LastWindowPixelSize: {x: 965, y: 497}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -140,17 +140,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 4}
-  - {fileID: 8}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 908
+    width: 966
     height: 939
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 6279
+  controlID: 32157
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -161,23 +161,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 908
+    width: 966
-    height: 267
+    height: 421
-  m_MinSize: {x: 100, y: 100}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 7}
+  m_ActualView: {fileID: 5}
   m_Panes:
   - {fileID: 5}
   - {fileID: 6}
-  - {fileID: 7}
+  m_Selected: 0
-  m_Selected: 2
   m_LastSelected: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -202,8 +201,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 907
+    width: 965
-    height: 246
+    height: 400
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -640,9 +639,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1.6347224, y: -2.5084803, z: 0.68781173}
+    m_Target: {x: 0.9861249, y: -2.8113983, z: 40.100723}
     speed: 2
-    m_Value: {x: 1.6347224, y: -2.5084803, z: 0.68781173}
+    m_Value: {x: 0.9861249, y: -2.8113983, z: 40.100723}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -688,13 +687,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.26167488, y: 0.25117496, z: -0.07073281, w: 0.929214}
+    m_Target: {x: 0.017395612, y: 0.013497851, z: -0.00023473609, w: 0.999759}
     speed: 2
-    m_Value: {x: 0.2616743, y: 0.25117442, z: -0.07073266, w: 0.92921203}
+    m_Value: {x: 0.017395588, y: 0.013497831, z: -0.00023473575, w: 0.9997576}
   m_Size:
-    m_Target: 0.14483654
+    m_Target: 0.087950766
     speed: 2
-    m_Value: 0.14483654
+    m_Value: 0.087950766
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -712,7 +711,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.1868545, y: 0.5160025, z: -0.116471924, w: 0.8278125}
+  m_LastSceneViewRotation: {x: 0.28586683, y: 0.22440545, z: -0.06904787, w: 0.9290641}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -793,6 +792,33 @@ MonoBehaviour:
   m_LayerEditor:
     m_SelectedLayerIndex: 0
 --- !u!114 &7
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 421
+    width: 966
+    height: 518
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 2}
+  - {fileID: 8}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -814,9 +840,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
+    y: 494
-    width: 907
+    width: 965
-    height: 246
+    height: 497
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -834,34 +860,8 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: 204774
+    m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &8
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 267
-    width: 908
-    height: 672
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 2}
-  m_Selected: 0
-  m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -877,9 +877,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 908
+    x: 966
     y: 0
-    width: 279
+    width: 376
     height: 939
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -909,9 +909,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 908
+    x: 966
     y: 73
-    width: 277
+    width: 374
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -926,9 +926,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 34750000
+      m_SelectedIDs: d0770000
       m_LastClickedID: 0
-      m_ExpandedIDs: 14edf7ff1a3cf8ff84cef8ffc016f9ffeeaef9ff4050faffa6a2faff8411fbff6457fbff3060fbffee73fcffaa07fdff4e1cfdffe054fdff0a56fdffd092fdfffe3efeff2647fefff258ffff62a2ffff2efbffffdee60000b4ea00009aed0000faf100009af2000082fe00003e050100cc0601009e090100245c010000610100d6a20100e0ed01009cf401002cf50100fcf801009cf90100c63402008a3b02001a3c0200ea3f02008a400200a27a020066810200f6810200c685020066860200
+      m_ExpandedIDs: 6a00e7ff563ee7ff1687e7fff2c2e7ff6e09e8fff665e8ff6ec7e9ffa8fae9ff8afee9ff820ceaffc41ceaffb84aeaff1694eaffce20ebffd220ebff9621ebffdc2febffe237ebffd87aebffec7aebfff07aebffdc8debffca2df0ffd42df0ffd82df0ffe02df0ff702ef0ffa869f0ff32b6f0ff92f8f0ff7c66f2ffde68f2ff0a9bf2ff2a9bf2ff329bf2ff9af3f2ff742ff3ff7275f3ff1417f4ff30baf4ff38baf4ff3cbaf4ff3afcf4ff3431f5ff3e31f5ff4831f5ff5431f5ff5a31f5ff0c32f5ff506df5ffba80f5ffbac3f6ff4e06f7ff3c50f7ff12a0f7ff14edf7ff1a3cf8ff84cef8ffc016f9ffeeaef9ff4050faffa6a2faff8411fbff6457fbff3060fbffee73fcffaa07fdff4e1cfdffe054fdff0a56fdffd092fdfffe3efeff2647fefff258ffff62a2ffff2efbfffff4ffffffdee60000b4ea00009aed0000faf100009af2000082fe00003e050100cc0601009e090100245c010000610100d6a20100e0ed01009cf401002cf50100fcf801009cf90100c63402008a3b02001a3c0200ea3f02008a400200a27a020066810200f6810200c685020066860200963603008a3b0300a83c0300201104008411040068160400c0160400f4550400fa550400125604001a560400785f0400a65f04005c640400966404002cd50400bcd904007ee0040090e40400dee404007ee5040090020500960205005880050076850500928605005aae050072ae05007aae0500404607005c470700664807009e7107001675070070790700f879070074a00700dea20700eca307008ca7070046a80700cea80700a0b7070018bb0700c0be070072bf0700fabf0700a8ce070012d1070020d20700c8d507007ad6070002d7070078700800987008008a7508004a7c0800aa8008004a8108000c8d0800029208003e950800c2980800229d080002d808005cdc0800e4dc0800
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -967,9 +967,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1187
+    x: 1342
     y: 0
-    width: 286
+    width: 284
     height: 939
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -999,9 +999,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1187
+    x: 1342
     y: 73
-    width: 284
+    width: 282
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1024,7 +1024,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/StreamingAssets/Excel
+    - Assets/_Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1040,7 +1040,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: be940b00
     m_LastClickedID: 758974
-    m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000e67700000c780000a28501007c8a01007e8a0100808a0100828a0100b48a0100eeff0100
+    m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e750000107500001275000014750000167500001a7500001c750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000de770000e67700000c780000dcce0000a28501007c8a01007e8a0100808a0100828a0100ae8a0100b48a0100eeff010036320300383203003a320300483203004a3203005a320300
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1065,10 +1065,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_AssetTreeState:
-    scrollPos: {x: 0, y: 660}
+    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 34750000
+    m_SelectedIDs: d0770000
-    m_LastClickedID: 30004
+    m_LastClickedID: 30672
-    m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e75000010750000127500001475000016750000187500001a7500001c7500001e750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000e67700000c780000a28501007c8a01007e8a0100808a0100828a0100b48a0100eeff0100
+    m_ExpandedIDs: ffffffff00000000fe74000000750000027500000475000006750000087500000a7500000c7500000e750000107500001275000014750000167500001a7500001c750000207500002275000026750000287500002a7500002c7500002e750000307500003475000036750000387500003a750000d4770000d6770000de770000e67700000c780000dcce0000a28501007c8a01007e8a0100808a0100828a0100ae8a0100b48a0100eeff010036320300383203003a320300483203004a3203005a320300
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1093,8 +1093,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 34750000
+    m_SelectedInstanceIDs: d0770000
-    m_LastClickedInstanceID: 30004
+    m_LastClickedInstanceID: 30672
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
@@ -1139,9 +1139,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1473
+    x: 1626
     y: 0
-    width: 447
+    width: 294
     height: 939
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
@@ -1171,9 +1171,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1473
+    x: 1626
     y: 73
-    width: 446
+    width: 293
     height: 918
   m_SerializedDataModeController:
     m_DataMode: 0