Merge branch 'LouDi_Quan' of http://git.dragonwxl.cn:8080/loudizhiye/virtualframework into LouDi_Quan

2025-01-08 14:55:58 +08:00 · 2025-01-08 14:55:58 +08:00 · 48965c42b9
commit 48965c42b9
parent 2cd4547078 a2bfca4765
6 changed files with 285 additions and 138 deletions
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/chuangjin/chuangjin.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: c88a7609779fa1d4090ead6612db10d5
 ModelImporter:
-  serializedVersion: 21300
+  serializedVersion: 22200
  internalIDToNameTable:
  - first:
      74: -623603649343465320
@ -44,7 +44,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: 46chuangjin
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 3800
+      lastFrame: 3960
+      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: []
@ -53,6 +82,7 @@ ModelImporter:
    addColliders: 0
    useSRGBMaterialColor: 1
    sortHierarchyByName: 1
+    importPhysicalCameras: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
@ -80,6 +110,7 @@ ModelImporter:
    secondaryUVMinObjectScale: 1
    secondaryUVPackMargin: 4
    useFileScale: 1
+    strictVertexDataChecks: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
@ -108,10 +139,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/46/jianjian/jianjian.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/jianjian/jianjian.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: 7f18bcb14ed4e3e4ebd09c7ab20c10ca
 ModelImporter:
-  serializedVersion: 21300
+  serializedVersion: 22200
  internalIDToNameTable:
  - first:
      74: -623603649343465320
@ -39,7 +39,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: 46jianjian
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 3800
+      lastFrame: 3960
+      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: []
@ -48,6 +77,7 @@ ModelImporter:
    addColliders: 0
    useSRGBMaterialColor: 1
    sortHierarchyByName: 1
+    importPhysicalCameras: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
@ -75,6 +105,7 @@ ModelImporter:
    secondaryUVMinObjectScale: 1
    secondaryUVPackMargin: 4
    useFileScale: 1
+    strictVertexDataChecks: 0
  tangentSpace:
    normalSmoothAngle: 60
    normalImportMode: 0
@ -103,10 +134,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/46/zhudao.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhudao.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: a2a1f988a08d26440b0eda4029929157
 ModelImporter:
-  serializedVersion: 21300
+  serializedVersion: 22200
  internalIDToNameTable:
  - first:
      74: -623603649343465320
@ -34,7 +34,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: 46zhudao
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 3800
+      lastFrame: 3960
+      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/46/zhushou.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/46/zhushou.fbx.meta
@ -1,7 +1,7 @@
 fileFormatVersion: 2
 guid: a03311e14cdec924aa5ae3bde1a2206e
 ModelImporter:
-  serializedVersion: 21300
+  serializedVersion: 22200
  internalIDToNameTable:
  - first:
      74: -623603649343465320
@ -34,7 +34,36 @@ ModelImporter:
    animationWrapMode: 0
    extraExposedTransformPaths: []
    extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: 46zhushou
+      takeName: 
+      internalID: 3060610079319413300
+      firstFrame: 3800
+      lastFrame: 3960
+      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/Scenes/LouDiXuMuQvan.unity
+++ b/Assets/Scenes/LouDiXuMuQvan.unity
@ -4959,7 +4959,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: ea1d392e4345dc341be80a904b50d0de, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2223639932434330405, guid: ea1d392e4345dc341be80a904b50d0de, type: 3}
      propertyPath: m_PlayAutomatically
--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@ -1389,16 +1389,16 @@
          </Action>
        </Start>
        <Finished>
+          <Action type="Sequence">
+
            <Action type="Log" value="手术动物准备Finish"></Action>
-
-
-       
            <Action type="Show" value="Models/SM_gou/SM_gou"  isShow="false"></Action>
            <Action type="Show" value="Models/SM_gou/SM_gou_01"  isShow="false"></Action>
            <Action type="Show" value="Models/SM_gou/SM_gou_02"  isShow="true"></Action>
            <Action type="Show" value="Models/SM_gou/SM_guan/guan2_1"  isShow="false"></Action>
            <Action type="Show" value="Models/SM_gou/SM_guan/guan2_2"  isShow="true"></Action>
            <Action type="Show" value="Models/SM_gou/SM_goushengti"  isShow="true"></Action>
+          </Action>
        </Finished>
      </Step>

@ -1449,12 +1449,14 @@


            <Action type="Show" value="Models/diantuizi"  isShow="true"></Action>
+            <Action type="Show" value="Models/TiMao"  isShow="true"></Action>
+
            <Action type="Parallel">
              <Action type="Anim" value="Models/diantuizi" animName="39电推子动画" ></Action>
              <Action type="Anim" value="Models/zhudao" animName="39主刀动画" ></Action>
            </Action>
            <Action type="Show" value="Models/diantuizi"  isShow="false"></Action>
-
+            <Action type="Show" value="Models/TiMao"  isShow="false"></Action>

            <!--点击胶带-->

@ -1482,10 +1484,11 @@
            <Action type="Show" value="Models/SM_gou/SM_guan/guan2_1"  isShow="false"></Action>
            <Action type="Show" value="Models/SM_gou/SM_guan/guan2_2"  isShow="true"></Action>
            <Action type="Show" value="Models/diantuizi"  isShow="false"></Action>
+            <Action type="Show" value="Models/Aim_yisheng_01"  isShow="false"></Action>
+            <Action type="Show" value="Models/zhudao"  isShow="true"></Action>

-
-
-          </Action>  </Finished>
+          </Action>
+        </Finished>
      </Step>


@ -1508,7 +1511,7 @@
            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_DaoPian23"></Condition>
            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_DaoPian23" isHigh="false" color="0,255,0,255"></Action>

-            <Action type="Show" value="Models/jiaobu"  isShow="false"></Action>
+            <Action type="Show" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_DaoPian23"  isShow="false"></Action>
            <Action type="Show" value="Models/daopian"  isShow="true"></Action>
            <Action type="Parallel">
              <Action type="Anim" value="Models/daopian" animName="41daopian" ></Action>
@ -1517,6 +1520,7 @@


            <Action type="Show" value="Models/daopian"  isShow="false" ></Action>
+            <Action type="Show" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_DaoPian23"  isShow="true"></Action>


            <Action type="NextOperation"></Action>
@ -1524,83 +1528,65 @@
        </Start>
        <Finished>
          <Action type="Sequence">
-            <Action type="Log" value="术部备皮,Finished"></Action>
+
+
+
+
+
          </Action>
        </Finished>
      </Step>

-      <!--42 点击 酒精喷壶-->
      <Step name="术部消毒准备">
        <Reset>
          <Action type="Log" value="2-1步重置"></Action>
        </Reset>
        <Start>
          <Action type="Sequence">
+
+            <!--42 点击 酒精喷壶-->
            <Action type="Hint" value="先用酒精对剃毛区域进行初步清洗。" time="-1" icon="false" audio="Q013.mp3"></Action>
-            <Action type="CameraSwitch" nearDevice="手术台俯视视位置点1" normalDevice="手术台俯视视位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
-
-
-
            <Action type="Show" value="Models/penhu"  isShow="true" ></Action>

            <Action type="HighLight"   value="Models/penhu/AlcoholSpray.002" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" value="Models/penhu/AlcoholSpray.002"></Condition>
            <Action type="HighLight"   value="Models/penhu/AlcoholSpray.002" isHigh="false" color="0,255,0,255"></Action>
+
+
+            <Action type="CameraSwitch" nearDevice="手术台俯视视位置点1" normalDevice="手术台俯视视位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
+
+            <Action type="Show" value="Models/penhu"  isShow="true"></Action>
+            <Action type="Parallel">
              <Action type="Anim" value="Models/penhu" animName="42penhu" ></Action>
-            <Action type="Show" value="Models/penhu"  isShow="false" ></Action>
-
-
-
-            <Action type="NextOperation"></Action>
+              <Action type="Anim" value="Models/zhudao" animName="42zhudao" ></Action>
            </Action>
-        </Start>
-        <Finished>
-
-        </Finished>
-      </Step>
-
+            <Action type="Show" value="Models/penhu"  isShow="false"></Action>
            <!--43 点击 酒精棉-->
-      <Step name="术部消毒准备">
-        <Reset>
-          <Action type="Log" value="2-1步重置"></Action>
-        </Reset>
-        <Start>
-          <Action type="Sequence">
            <Action type="Hint" value="用镊子夹着酒精棉呈圆形逆时针由里向外消毒。待其干燥。。" time="-1" icon="false" audio="Q014.mp3"></Action>
-            <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="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_JiuJingMianQiu_polySurface123" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_JiuJingMianQiu_polySurface123"></Condition>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_JiuJingMianQiu_polySurface123" isHigh="false" color="0,255,0,255"></Action>

-            <Action type="HighLight"   value="Models/niezi/棱角球" isHigh="true" color="0,255,0,255"></Action>
-            <Condition type="ObjClick" value="Models/niezi/棱角球"></Condition>
-            <Action type="HighLight"   value="Models/niezi/棱角球" isHigh="false" color="0,255,0,255"></Action>
+            <Action type="Show" value="Models/niezi"  isShow="true"></Action>
+            <Action type="Parallel">
              <Action type="Anim" value="Models/niezi" animName="43niezi" ></Action>
-
-
-
-            <Action type="NextOperation"></Action>
+              <Action type="Anim" value="Models/zhudao" animName="43zhudao" ></Action>
            </Action>
-        </Start>
-        <Finished>
+            <Action type="Show" value="Models/niezi"  isShow="false"></Action>

-        </Finished>
-      </Step>
            <!--44 点击  碘伏棉-->
-      <Step name="术部消毒准备">
-        <Reset>
-          <Action type="Log" value="2-1步重置"></Action>
-        </Reset>
-        <Start>
-          <Action type="Sequence">
+            <!--点击，碘伏棉球-->
            <Action type="Hint" value="用镊子夹着碘伏棉呈圆形逆时针由里向外消毒。待其干燥。（再交替反复操作两次）。" time="-1" icon="false" audio="Q015.mp3"></Action>
-            <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="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_DianFuMianQiu_polySurface123" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_DianFuMianQiu_polySurface123"></Condition>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_DianFuMianQiu_polySurface123" isHigh="false" color="0,255,0,255"></Action>

-
-            <Action type="HighLight"   value="Models/niezi/棱角球" isHigh="true" color="0,255,0,255"></Action>
-            <Condition type="ObjClick" value="Models/niezi/棱角球"></Condition>
-            <Action type="HighLight"   value="Models/niezi/棱角球" isHigh="false" color="0,255,0,255"></Action>
+            <Action type="Show" value="Models/niezi"  isShow="true"></Action>
+            <Action type="Parallel">
              <Action type="Anim" value="Models/niezi" animName="43niezi" ></Action>
-
-
-
+              <Action type="Anim" value="Models/zhudao" animName="43zhudao" ></Action>
+            </Action>
+            <Action type="Show" value="Models/niezi"  isShow="false"></Action>
            <Action type="NextOperation"></Action>
          </Action>
        </Start>
@ -1609,15 +1595,20 @@
        </Finished>
      </Step>

+
+
+
      <!--45 文字提示  -->
      <Step name="手术室准备">
        <Reset>
-          <Action type="Log" value="2-1步重置"></Action>
+          <Action type="Sequence">
+
+          </Action>
        </Reset>
        <Start>
          <Action type="Sequence">
+            <Action type="CameraSwitch" nearDevice="手术台俯视视位置点1" normalDevice="手术台俯视视位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>

-            <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="TextTip" value="手术场地术前、术后进行紫外线灯消毒1小时。" audio="Q016.mp3" btns="确定"/>
@ -1629,7 +1620,11 @@
          </Action>
        </Start>
        <Finished>
+          <Action type="Sequence">

+
+
+          </Action>
        </Finished>
      </Step>

@ -1645,41 +1640,59 @@
          <Action type="Sequence">

            <Action type="Hint" value="将创巾中央剪出手术切口范围，平铺到手术动物身上。" time="-1" icon="false" audio="Q017.mp3"></Action>
-            <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="CameraSwitch" nearDevice="手术台俯视视位置点1" normalDevice="手术台俯视视位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>

-            <Action type="HighLight"   value="Models/chuangjin/chuangjin" isHigh="true" color="0,255,0,255"></Action>
-            <Condition type="ObjClick" value="Models/chuangjin/chuangjin"></Condition>
-            <Action type="HighLight"   value="Models/chuangjin/chuangjin" isHigh="false" color="0,255,0,255"></Action>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_ChuangJin" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_ChuangJin"></Condition>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_BuLiaoLei/pasted__SM_ChuangJin" isHigh="false" color="0,255,0,255"></Action>

+            <Action type="Show" value="Models/jianjian"  isShow="true" ></Action>
+            <Action type="Show" value="Models/zhudao"  isShow="true" ></Action>
+            <Action type="Show" value="Models/chuangjin"  isShow="true" ></Action>
+            <Action type="Show" value="Models/zhushou"  isShow="true" ></Action>

-            <Action type="Anim" value="Models/chuangjin" animName="46chuangjin" ></Action>
+            <Action type="Parallel">
              <Action type="Anim" value="Models/jianjian" animName="46jianjian" ></Action>
-
-            <Action type="NextOperation"></Action>
+              <Action type="Anim" value="Models/zhudao" animName="46zhudao"></Action>
+              <Action type="Anim" value="Models/chuangjin" animName="46chuangjin"></Action>
+              <Action type="Anim" value="Models/zhushou" animName="46zhushou"></Action>
            </Action>
-        </Start>
-        <Finished>
-          <Action type="Sequence">
-
-
-          </Action>
-        </Finished>
-      </Step>
-      <!--47 点击皮镊,暂时空着-->
-      <Step name="测试麻醉程度">
-        <Reset>
-        </Reset>
-        <Start>
-          <Action type="Sequence">

+            <!--47 点击皮镊-->
            <Action type="Hint" value="用皮镊在皮肤上夹两点定位，测试麻醉程度，并消毒。" time="-1" icon="false" audio="Q018.mp3"></Action>
-            <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="" isHigh="true" color="0,255,0,255"></Action>
-            <Condition type="ObjClick" deviceName=""></Condition>
-            <Action type="HighLight"   value="" isHigh="false" color="0,255,0,255"></Action>
-            <Action type="Anim" value="" animName="" ></Action>
-            <Action type="Anim" value="" animName="" ></Action>-->
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__pPlane4" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__pPlane4"></Condition>
+            <Action type="HighLight"   value="  Environment/SM_QvanChangJing/SM_JianZiLei/pasted__pPlane4" isHigh="false" color="0,255,0,255"></Action>
+
+
+
+            <Action type="Show" value="Models/zhushou"  isShow="false"></Action>
+            <Action type="Show" value="Models/zhudao"  isShow="true"></Action>
+
+            <Action type="Show" value="Models/Aim_yisheng_01"  isShow="true"></Action>
+            <Action type="Show" value="Models/Aim_pishi"  isShow="true"></Action>
+            <Action type="Parallel">
+              <Action type="Anim" value="Models/Aim_pishi" animName="皮镊皮试" ></Action>
+              <Action type="Anim" value="Models/Aim_yisheng_01" animName="26Aim_pishi" ></Action>
+            </Action>
+            <Action type="Show" value="Models/Aim_pishi"  isShow="false"></Action>
+
+            <Action type="Anim" value="Models/Aim_yisheng_01" animName="26Aim_kanpingmu" ></Action>
+            <Action type="Anim" value="Models/Aim_yisheng_01" animName="26Aim_kangou" ></Action>
+            
+            <!--最后播放一次-->
+            <!--酒精消毒动画-->
+            <Action type="Show" value="Models/niezi"  isShow="true"></Action>
+            <Action type="Parallel">
+              <Action type="Anim" value="Models/niezi" animName="43niezi" ></Action>
+              <Action type="Anim" value="Models/zhudao" animName="43zhudao" ></Action>
+            </Action>
+            <Action type="Show" value="Models/niezi"  isShow="false"></Action>
+            
+
+       
+

            <Action type="NextOperation"></Action>
          </Action>
@ -1692,7 +1705,8 @@
        </Finished>
      </Step>

-      <!--48 鼠标滑动虚线（手术虚线）/暂时，点击手术刀-->
+
+      <!--48-53步骤-->
      <Step name="术部开刀">
        <Reset>
        </Reset>
@ -1700,7 +1714,12 @@
          <Action type="Sequence">

            <Action type="Hint" value="脐前腹中线切口，手术刀切开皮肤" time="-1" icon="false" audio="Q019.mp3"></Action>
-            <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="CameraSwitch" nearDevice="手术台俯视视位置点1" normalDevice="手术台俯视视位置点1"  nearTime="0"  normalTime="0" isNear="false"></Action>
+
+            <Action type="Line" name="红线" value="0,0,0|10,10,10" color="255,0,0,255" width="2" lineScale="10,10"></Action>
+
+            <Action type="Show" value="Models/niezi"  isShow="true"></Action>
+

            <Action type="HighLight"   value="Models/dao" isHigh="true" color="0,255,0,255"></Action>
            <Condition type="ObjClick" value="Models/dao"></Condition>
@ -2645,9 +2664,9 @@



-<Action type="HighLight"  value="Models/changqian" isHigh="true" color="0,255,0,255"></Action>
-<Condition type="ObjClick" value="Models/changqian" isRight="true"></Condition>
-<Action type="HighLight"  value="Models/changqian" isHigh="false" color="0,255,0,255"></Action>
+            <Action type="HighLight"  value="Models/changqian" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Models/changqian" isRight="true"></Condition>
+            <Action type="HighLight"  value="Models/changqian" isHigh="false" color="0,255,0,255"></Action>
            <Action type="Anim" value="Models/changqian"  animName="75changqian"   speed="1"></Action>