提交修改内容，部分动画添加切割文本，人形动画修改

2025-01-05 17:36:55 +08:00 · 2025-01-05 17:36:55 +08:00 · e46dc5ff5d
commit e46dc5ff5d
parent 406e9a6de8
32 changed files with 630 additions and 278 deletions
--- a/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
+++ b/Assets/Art/Fonts/pingfangSc/PingFangSC-Medium
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/17/zhijin_nan.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/17/zhijin_nan.fbx.meta
@ -36,7 +36,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: "\u6D17\u624B"
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 2330
+      lastFrame: 2750
+      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: 0
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
    isReadable: 0
  meshes:
    lODScreenPercentages: []
@ -102,7 +131,7 @@ ModelImporter:
    skeletonHasParents: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 2
+  animationType: 1
  humanoidOversampling: 1
  avatarSetup: 0
  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/17/zhijin_nan.txt
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/17/zhijin_nan.txt
@ -0,0 +1 @@
+2330-2750 洗手
--- a/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta
+++ b/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 4c87a0e1993f7439285693c04d6dab68
-DefaultImporter:
+guid: d6cb114f6c4454a458e1cabf3fc4072d
+TextScriptImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 426de14724ad2594da77384a09da5da4
 ModelImporter:
-  serializedVersion: 21300
+  serializedVersion: 22200
  internalIDToNameTable:
  - first:
      74: -623603649343465320
@ -34,7 +34,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: "\u64E6\u624B"
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 2330
+      lastFrame: 2750
+      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: 0
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
    isReadable: 0
  meshes:
    lODScreenPercentages: []
@ -43,6 +72,7 @@ ModelImporter:
    addColliders: 0
    useSRGBMaterialColor: 1
    sortHierarchyByName: 1
+    importPhysicalCameras: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
@ -70,6 +100,7 @@ ModelImporter:
    secondaryUVMinObjectScale: 1
    secondaryUVPackMargin: 4
    useFileScale: 1
+    strictVertexDataChecks: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
@ -98,10 +129,11 @@ ModelImporter:
    skeletonHasParents: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 2
+  animationType: 1
  humanoidOversampling: 1
  avatarSetup: 0
  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 0
  remapMaterialsIfMaterialImportModeIsNone: 0
  additionalBone: 0
  userData: 
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.txt
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.txt
@ -0,0 +1 @@
+2330-2750 擦手
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.txt.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/七步洗手/SM_ZhiJin/zhijin.txt.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 52f45c84fa7e04a17922d3833762b05c
-DefaultImporter:
+guid: 602d3e012bfe01846a05dd21a65c94e8
+TextScriptImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta
@ -293,6 +293,35 @@ ModelImporter:
      maskType: 3
      maskSource: {instanceID: 0}
      additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: Scene
+      takeName: Scene
+      internalID: -623603649343465320
+      firstFrame: 130
+      lastFrame: 350
+      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: []
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24/麻醉助手01/Aim_yisheng_01.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/24/麻醉助手01/Aim_yisheng_01.fbx.meta
@ -362,7 +362,7 @@ ModelImporter:
    skeletonHasParents: 1
  lastHumanDescriptionAvatarSource: {instanceID: 0}
  autoGenerateAvatarMappingIfUnspecified: 1
-  animationType: 2
+  animationType: 1
  humanoidOversampling: 1
  avatarSetup: 0
  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
--- a/Assets/QFramework/Framework/Examples.unitypackage.meta
+++ b/Assets/QFramework/Framework/Examples.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 51c6f3b897886a44991168f065c0a99d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta
+++ b/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2bf6cf57b414f194baf76e0a325b7964
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta
+++ b/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a84ca8d2ecd964e4688324f75f6f582a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1fae029c3eecbe44ea3ff0b493f20601
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d3f0c8e9f16a58243b803d5d47a79c03
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 976cb377135fda24791255ebe76b2e57
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5176cd918f52ea842b73948dd3bc26a8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 92ad6261b6f1d234e95b0d3d93ecb063
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 92073d73c00ba4745a1846e66e0d487e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c8cdbc6f43d08374d8ad57ba52c291e9
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 921cbf26409b3dc42bced514dfbc0294
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 260510f68d4501045937a08a041e9193
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3ec7c95d917901144b2b4c87d6223452
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d649e0c4be6794b47be815440ab085d3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 84093f18d10915540be5035bf0bebf1c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 160fc31f922750444afec5e3d7280c07
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 637404373c3be1b4abb149a6ec887955
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 43709ae6df606fe4680b4f2cdb456ef2
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta
+++ b/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 27a53bb609d45b240a6ae0f54e40ac3b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/LouDiXuMuQvan.unity
+++ b/Assets/Scenes/LouDiXuMuQvan.unity
@ -307,6 +307,30 @@ PrefabInstance:
      propertyPath: m_PlayAutomatically
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 6587157971700447682, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -16.599937
+      objectReference: {fileID: 0}
+    - target: {fileID: 6587157971700447682, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 19.13148
+      objectReference: {fileID: 0}
+    - target: {fileID: 6587157971700447682, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -15.403883
+      objectReference: {fileID: 0}
+    - target: {fileID: 7394907148475094852, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -1.0262983
+      objectReference: {fileID: 0}
+    - target: {fileID: 7394907148475094852, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 4.3323736
+      objectReference: {fileID: 0}
+    - target: {fileID: 7394907148475094852, guid: 426de14724ad2594da77384a09da5da4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -4.7853074
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@ -2146,6 +2170,7 @@ Transform:
  - {fileID: 721289085}
  - {fileID: 1113166098}
  - {fileID: 135934044}
+  - {fileID: 2111207637}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &667147657
@ -12466,7 +12491,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 78b6213564e7c8b478101849642c087c, type: 3}
      propertyPath: m_IsActive
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 2543275608982091975, guid: 78b6213564e7c8b478101849642c087c, type: 3}
      propertyPath: m_IsActive
@ -30442,6 +30467,134 @@ PlayableDirector:
    value: {fileID: 0}
  m_ExposedReferences:
    m_References: []
+--- !u!1 &2111207636
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2111207637}
+  - component: {fileID: 2111207639}
+  - component: {fileID: 2111207638}
+  m_Layer: 0
+  m_Name: "\u6E05\u70B9\u624B\u672F\u5668\u68B0\u53F0\u4F4D\u7F6E\u70B9"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2111207637
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111207636}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.3700275, y: -0.6036889, z: 0.37229174, w: -0.6000319}
+  m_LocalPosition: {x: -1.9877343, y: 1.5999866, z: -0.022855183}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 664206377}
+  m_LocalEulerAnglesHint: {x: 14.277, y: 90, z: 0}
+--- !u!114 &2111207638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111207636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    quality: 3
+    frameInfluence: 0.1
+    jitterScale: 1
+    mipBias: 0
+    varianceClampScale: 0.9
+    contrastAdaptiveSharpening: 0
+--- !u!20 &2111207639
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111207636}
+  m_Enabled: 0
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.1
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
 --- !u!1001 &2117771015
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Actions/AnimationAction.cs
+++ b/Assets/Scripts/Actions/AnimationAction.cs
@ -83,6 +83,7 @@ namespace QFramework
                }
                catch (Exception)
                {
+                    anim = obj.GetComponent<Animation>();
                    Debug.LogError($"{path} 播放动画 {animName} 出错");
                }

--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@ -412,6 +412,7 @@
    <MeshCollider/>
    <Icon>耗材/骨蜡.png</Icon>
  </Device>
+  
  <Device>
    <Name>肝素帽</Name>
    <HighLight color="255,255,255"/>
@ -577,21 +578,28 @@
    <Tip>一次性外科灭菌手套</Tip>
    <BoxCollider size="0.15,0.01,0.15" center="0,0,0"></BoxCollider>
  </Device>
-
+  <Device>
+    <Name>麻醉注射器</Name>
+    <Path>Models/Aim_ZSQ/SM_ZhSheQI_20/pasted__polySurface6</Path>
+    <MeshCollider/>
+  </Device>
  <!--相机位置点-->
  <Device>
    <Name>洗手间相机位置点1</Name>
    <Path>CameraPos/洗手间相机位置点1</Path>
  </Device>
  <Device>
-    <Name>洗手间相机位置2</Name>
+    <Name>洗手间相机位置点2</Name>
    <Path>CameraPos/洗手间相机位置点2</Path>
  </Device>
  <Device>
    <Name>主刀人员穿戴衣服相机位置点1</Name>
    <Path>CameraPos/主刀人员穿戴衣服相机位置点1</Path>
  </Device>
-  
+  <Device>
+    <Name>清点手术器械台位置点</Name>
+    <Path>CameraPos/清点手术器械台位置点</Path>
+  </Device>
  
  <!--手术过程的道具-->

@ -809,7 +817,7 @@
            <Action type="Parallel">
              <!--<Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>-->
-              <Action type="CameraSwitch" nearDevice="洗手间相机位置2" normalDevice="洗手间相机位置2"  nearTime="0"  normalTime="0" isNear="false"></Action>
+              <Action type="CameraSwitch" nearDevice="洗手间相机位置点2" normalDevice="洗手间相机位置点2"  nearTime="0"  normalTime="0" isNear="false"></Action>

            </Action>

@ -833,6 +841,7 @@
                <Action type="Show" value="Models/ZhuDao_chaunyifu/zhijin" isShow="true" ></Action>
                <Action type="Anim" value="Models/ZhuDao_chaunyifu/zhijin" animName="擦手" ></Action>
                <Action type="Show" value="Models/ZhuDao_chaunyifu/zhijin" isShow="false" ></Action>
+
              </Action>
            </Action>

@ -852,13 +861,13 @@
            <Action type="Hint" value="穿戴手术衣和无菌手套" time="-1" icon="false" audio="Q005.mp3"></Action>

            <!--原先的位置点，及 旋转点-->
-            <!--<Action type="Move" value="Models/ZhuDao_chaunyifu" to="-4.333,0,-3.307" time="0"></Action>
-            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,90,0" time="0"></Action>-->
+            <Action type="Move" value="Models/ZhuDao_chaunyifu" to="-4.333,0,-3.307" time="0"></Action>
+            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,90,0" time="0"></Action>
+
+            <!--<Action type="Move" value="Models/ZhuDao_chaunyifu" to="-4.338,0,-3.41" time="0"></Action>
+            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,0,0" time="0"></Action>-->

-            <Action type="Move" value="Models/ZhuDao_chaunyifu" to="-4.338,0,-3.41" time="0"></Action>
-            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,0,0" time="0"></Action>
             
-            <Action type="Log" value="移动摄像机"></Action>

            <!--<Action type="Move" value="FlyCamera" to="-2.291751,3.206589,-0.4614787" time="0"></Action>
            <Action type="Rotate" value="FlyCamera" to="31.98415,200.0271,0" time="0"></Action>-->
@ -955,19 +964,31 @@
            <Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengMaoZi1" isShow="false" ></Action>
            <Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengKouZhao1" isShow="false" ></Action>
            <!--镜头切过来-->
-            <Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>
+            <!--<Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>-->
+
+            <Action type="CameraSwitch" nearDevice="洗手间相机位置点1" normalDevice="洗手间相机位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
+
            <!--点击帽子-->

            <Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="false" audio="Q001.mp3"></Action>

+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="true" ></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.006" isShow="true" ></Action>
+

            <Action type="HighLight"  deviceName="帽子" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="帽子"></Condition>
            <Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengMaoZi1" isShow="true" ></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="false" ></Action>
+
+
+
+
            <Action type="HighLight"  deviceName="口罩" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="口罩"></Condition>
            <Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengKouZhao1" isShow="true"></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.006" isShow="false" ></Action>


            <Action type="Delay" value="0.5"></Action>
@ -976,10 +997,12 @@
            <Action type="Move" value="Models/ZhuDao_chaunyifu" to="49.992,0,0.201" time="0"></Action>
            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,0,0" time="0"></Action>

-            <Action type="Parallel">
-              <Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
-              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>
-            </Action>
+            <!--<Action type="Parallel">
+
+              --><!--<Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
+              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>--><!--
+            </Action>-->
+            <Action type="CameraSwitch" nearDevice="洗手间相机位置点2" normalDevice="洗手间相机位置点2"  nearTime="0"  normalTime="0" isNear="false"></Action>


            <Action type="Hint" value="打开水龙头，按照七步洗手法进行手臂消毒" time="-1" icon="false" audio="Q002.mp3"></Action>
@ -1021,8 +1044,10 @@
            <Action type="Hint" value="穿戴手术衣和无菌手套" time="-1" icon="false" audio="Q005.mp3"></Action>
            <Action type="Move" value="Models/ZhuDao_chaunyifu" to="-4.333,0,-3.307" time="0"></Action>
            <Action type="Rotate" value="Models/ZhuDao_chaunyifu" to="0,90,0" time="0"></Action>
-            <Action type="Move" value="FlyCamera" to="-2.291751,3.206589,-0.4614787" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="31.98415,200.0271,0" time="0"></Action>
+            <!--<Action type="Move" value="FlyCamera" to="-2.291751,3.206589,-0.4614787" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="31.98415,200.0271,0" time="0"></Action>-->
+            <Action type="CameraSwitch" nearDevice="主刀人员穿戴衣服相机位置点1" normalDevice="主刀人员穿戴衣服相机位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
+
            <Action type="HighLight"  deviceName="一次性手术衣" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="一次性手术衣"></Condition>

@ -1100,17 +1125,29 @@
            <Action type="Move" value="Models/nvzhushou_xishou" to="48.114,0,-0.037" time="0"></Action>
            <Action type="Rotate" value="Models/nvzhushou_xishou" to="0,270,0" time="0"></Action>

-            <Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>
+            <!--<Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>-->
+            <Action type="CameraSwitch" nearDevice="洗手间相机位置点1" normalDevice="洗手间相机位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
+

            <!--点击帽子-->
+
+
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="true" ></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.006" isShow="true"></Action>
+
+
+
            <Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="false" audio="Q001.mp3"></Action>
            <Action type="HighLight"  deviceName="帽子" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="帽子"></Condition>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="false" ></Action>
            <Action type="Show" value="Models/nvzhushou_xishou/pasted__Yisheng_A7" isShow="true" ></Action>
+  
            <Action type="HighLight"  deviceName="口罩" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="口罩"></Condition>
            <Action type="Show" value="Models/nvzhushou_xishou/pasted__Yisheng_A8" isShow="true"></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.005" isShow="false"></Action>
            

            <Action type="Delay" value="0.5"></Action>
@ -1119,8 +1156,7 @@
            <Action type="Move" value="Models/nvzhushou_xishou" to="50,0,-0.054" time="0"></Action>
            <Action type="Rotate" value="Models/nvzhushou_xishou" to="0,0,0" time="0"></Action>
            <Action type="Parallel">
-              <Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
-              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>
+              <Action type="CameraSwitch" nearDevice="洗手间相机位置点2" normalDevice="洗手间相机位置点2"  nearTime="0"  normalTime="0" isNear="false"></Action>
            </Action>
            <Action type="Hint" value="打开水龙头，按照七步洗手法进行手臂消毒" time="-1" icon="false" audio="Q002.mp3"></Action>
            <Action type="HighLight"  deviceName="水龙头" isHigh="true" color="0,255,0,255"></Action>
@ -1148,12 +1184,17 @@


            <!--检查器械台-->
+            <Action type="Hint" value="用洁肤柔消毒凝胶进行术部部加强" time="-1" icon="false" audio="Q004.mp3"></Action>
+
            <Action type="Parallel">
              <Action type="Move" value="Models/nvzhushou_xishou" to="-2.612,0,0.149" time="0"></Action>
              <Action type="Rotate" value="Models/nvzhushou_xishou" to="0,90,0" time="0"></Action>
+              <Action type="Log" value="检查器械台1111"></Action>
+
+              <!--<Action type="Move" value="FlyCamera" to="-2.698119,3.271376,5.092645" time="0"></Action>
+              <Action type="Rotate" value="FlyCamera" to="24.48734,164.994,-2.345396E-07" time="0"></Action>-->
+              <Action type="CameraSwitch" nearDevice="清点手术器械台位置点" normalDevice="清点手术器械台位置点"  nearTime="0"  normalTime="0" isNear="false"></Action>

-              <Action type="Move" value="FlyCamera" to="-2.698119,3.271376,5.092645" time="0"></Action>
-              <Action type="Rotate" value="FlyCamera" to="24.48734,164.994,-2.345396E-07" time="0"></Action>
            </Action>


@ -1182,18 +1223,28 @@

            <Action type="Move" value="Models/nvzhushou_xishou" to="48.114,0,-0.037" time="0"></Action>
            <Action type="Rotate" value="Models/nvzhushou_xishou" to="0,270,0" time="0"></Action>
+            <Action type="CameraSwitch" nearDevice="洗手间相机位置点1" normalDevice="洗手间相机位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>

-            <Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>
+            <!--<Action type="Move" value="FlyCamera" to="46.44073,1.759616,-2.202513" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>-->
+
+
+            
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="true" ></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.005" isShow="true" ></Action>

            <!--点击帽子-->
            <Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="false" audio="Q001.mp3"></Action>
            <Action type="HighLight"  deviceName="帽子" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="帽子"></Condition>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengMaoZi1.005" isShow="false" ></Action>
            <Action type="Show" value="Models/nvzhushou_xishou/pasted__Yisheng_A7" isShow="true" ></Action>
+            
+
            <Action type="HighLight"  deviceName="口罩" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" deviceName="口罩"></Condition>
            <Action type="Show" value="Models/nvzhushou_xishou/pasted__Yisheng_A8" isShow="true"></Action>
+            <Action type="Show" value="Environment/room_xishou/SM_YiShengKouZhao1.005" isShow="false" ></Action>


            <Action type="Delay" value="0.5"></Action>
@ -1202,8 +1253,10 @@
            <Action type="Move" value="Models/nvzhushou_xishou" to="50,0,-0.054" time="0"></Action>
            <Action type="Rotate" value="Models/nvzhushou_xishou" to="0,0,0" time="0"></Action>
            <Action type="Parallel">
-              <Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
-              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>
+              <!--<Action type="Move" value="FlyCamera" to="48.55724,2.303822,-0.2929218" time="1"></Action>
+              <Action type="Rotate" value="FlyCamera" to="29.84437,46.55205,0" time="1"></Action>-->
+              <Action type="CameraSwitch" nearDevice="洗手间相机位置点2" normalDevice="洗手间相机位置点2"  nearTime="0"  normalTime="0" isNear="false"></Action>
+
            </Action>
            <Action type="Hint" value="打开水龙头，按照七步洗手法进行手臂消毒" time="-1" icon="false" audio="Q002.mp3"></Action>
            <Action type="HighLight"  deviceName="水龙头" isHigh="true" color="0,255,0,255"></Action>
@ -1227,11 +1280,6 @@
            <Action type="Anim" value="Models/nvzhushou_xishou" animName="消毒" ></Action>
            <Action type="Anim" value="Models/nvzhushou_xishou" animName="洗手" frame="0"></Action>

-
-
-            <Action type="TextTip" value="后续暂未配置"  btns="给我抓紧,好的"/>
-
-            <Action type="Btns" value="下一步"></Action>
            <Condition type="UIClick" value="UIRoot/RightBottom/UIBtns/BtnContent/下一步"></Condition>
            <Action type="NextOperation"></Action>
          </Action>
@ -1254,22 +1302,35 @@

            <Action type="Hint" value="（术前12小时禁食，术前2小时禁水）首先进行诱导式麻醉" time="-1" icon="false" audio="Q007.mp3"></Action>

-
            <Action type="HighLight"  value="Models/Aim_ZSQ/SM_ZhSheQI_20" isHigh="true" color="0,255,0,255"></Action>


            <Action type="Show" value="Models/SM_gou/SM_gou"  isShow="true"></Action>
-            <Action type="Show" value="注射器"  isShow="true" isDevice="true"></Action>
-            <Condition type="ObjClick" deviceName="注射器"></Condition>
+            <Action type="Show" value="Models/Aim_yisheng_01"  isShow="true"></Action>
+            <Action type="Show" value="Models/Aim_yisheng_02"  isShow="true"></Action>
+            <Action type="Show" value="Models/SM_gou"  isShow="true"></Action>
+
+            
+
+
+            <Action type="Show" value="Models/Aim_ZSQ"  isShow="true" ></Action>
+
+       
+
+      
+            <Condition type="ObjClick" value="Models/Aim_ZSQ/SM_ZhSheQI_20/pasted__polySurface6"></Condition>
            <Action type="HighLight"  value="Models/Aim_ZSQ/SM_ZhSheQI_20" isHigh="false" color="0,255,0,255"></Action>
+       
+
            <Action type="Parallel">
              <Action type="Anim" value="Models/Aim_ZSQ" animName="针筒推药" ></Action>
-              <Action type="Anim" value="Models/Aim_yisheng_01" animName="24Aim_tuizhusheqi" ></Action>
+        
+           
+              <Action type="Anim" value="Models/Aim_yisheng_01"  animName="24Aim_tuizhusheqi"   speed="1"></Action>
+
            </Action>

-
            <Action type="Show" value="Models/SM_gou/SM_gou"  isShow="false"></Action>
-            <Action type="Show" value="注射器"  isShow="false" isDevice="true"></Action>
          
            <Action type="Hint" value="下颌肌肉松弛即可进行插管" time="-1" icon="false" audio="Q008.mp3"></Action>

@ -2035,7 +2096,7 @@

            <Action type="CameraSwitch" nearPos="-0.6115125,2.286091,2.874755" nearRot="25.15765,163.7622,0" nearTime="0" normalPos="-0.6115125,2.286091,2.874755" normalRot="25.15765,163.7622,0" normalTime="0" isNear="false"></Action>

-            <!--点击工具，弯止血钳子-->
+            <!--点击动画，弯止血钳子-->
            <Action type="HighLight"  value="Models/wanzhixueqian" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" value="Models/wanzhixueqian" isRight="true"></Condition>
            <Action type="HighLight"  value="Models/wanzhixueqian" isHigh="false" color="0,255,0,255"></Action>
--- a/ProjectSettings/TimelineSettings.asset
+++ b/ProjectSettings/TimelineSettings.asset
@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60