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

Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50，52，53/quan_jirou.fbx.meta

@@ -93,6 +93,64 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: 53quan_jirouZuo
+      takeName: 
+      internalID: -5880667880897408871
+      firstFrame: 4220
+      lastFrame: 4298
+      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
+    - serializedVersion: 16
+      name: 53quan_jirouYou
+      takeName: 
+      internalID: -8025109807753351146
+      firstFrame: 4298
+      lastFrame: 4330
+      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: 1
   meshes:
     lODScreenPercentages: []

Assets/Art/Models/LouDi/A_QvanChangJing/Animation/50，52，53/quan_jirou.txt

@@ -1,2 +1,4 @@
 4130-4220 50qiekou
-4220-4330 53quan_jirou
+4220-4330 53quan_jirou
+4220-4298 53quan_jirouZuo
+4298-4330 53quan_jirouYou

Data/Xml/Study.xml

@@ -1774,7 +1774,6 @@
             <Action type="Show" value="Models/zhudao"  isShow="true"></Action>
             <Action type="Show" value="Models/chuangjin"  isShow="true"></Action>
             <Action type="Show" value="Models/jianjian"  isShow="true"></Action>
-            <Action type="Show" value="Models/chuangjinqian"  isShow="true"></Action>
             <Action type="Show" value="Models/jianjian"  isShow="false"></Action>
             <Action type="Show" value="Models/zhushou"  isShow="false"></Action>
             <Action type="Show" value="Models/zhudao"  isShow="false"></Action>
@@ -1782,6 +1781,7 @@
             <Action type="Show" value="Models/zhushou"  isShow="false"></Action>
             <Action type="Show" value="Models/zhudao"  isShow="false"></Action>
             <Action type="Show" value="Models/Aim_pishi"  isShow="false"></Action>
+            <Action type="Anim" value="Models/chuangjin" animName="46chuangjin" frame="160"></Action>
           </Action>
         </Finished>
       </Step>
@@ -1857,12 +1857,15 @@
             <Action type="Show" value="Models/zhushou"  isShow="true"></Action>
             <Action type="Show" value="Models/shoushudao"  isShow="true"></Action>
             
-            <!--手术刀，添加,碰撞体--><!--
+  
-            Models/shoushudao/pasted__SM_DaoPian23-->
             <!--点击手术刀-->
-            <Action type="HighLight"   value="Models/shoushudao" isHigh="true" color="0,255,0,255"></Action>
+            <Action type="Anim" value="Models/zhushou" animName="50zhushou" frame="1"></Action>
-            <Condition type="ObjClick" value="Models/shoushudao"></Condition>
+            <Action type="Anim" value="Models/zhudao" animName="50zhudao" frame="1"></Action>
-            <Action type="HighLight"   value="Models/shoushudao" isHigh="false" color="0,255,0,255"></Action>
+
+
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_ShouShuDaoBing" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_ShouShuDaoBing"></Condition>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_ShouShuDaoBing" isHigh="false" color="0,255,0,255"></Action>
 
 
 
@@ -1879,72 +1882,63 @@
             <!--51 点击钝剪,工具顿剪隐藏，手术中的剪刀显示-->
             <Action type="Hint" value="用手术刀在腹白线上切开一小口，向左向右，依次剪开腹白线" time="-1" icon="false"></Action>
 
-
-
-            <!--<Action type="Show" value="Models/shoushudao"  isShow="false"></Action>
-
-
-            --><!--高亮，点击工具上的顿剪--><!--
             <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/dunjian" isHigh="true" color="0,255,0,255"></Action>
             <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_JianZiLei/dunjian"></Condition>
             <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/dunjian" isHigh="false" color="0,255,0,255"></Action>
+            
+            <Action type="Show" value="Models/shoushudao"  isShow="false"></Action>
             <Action type="Show" value="Models/dunjian"  isShow="true"></Action>
+            <Action type="Anim" value="Models/dunjian" animName="5253dunjianZuo" frame="1"></Action>
 
-            <Action type="Anim" value="Models/dunjian" animName="5253dunjian" frame="1"></Action>-->
+            <!--52. 显示左侧高亮范围-->
-            <!--显示动画，顿剪-->
+            <Action type="Hint" value="用手术刀在腹白线上切开一小口，向左向右，依次剪开腹白线" time="-1" icon="false"></Action>
 
 
-            <!--52/53--><!--
+            <Action type="Anim" value="Models/dunjian" animName="5253dunjianZuo" frame="1"></Action>-->
-            <Action type="Parallel">
+            <Action type="Anim" value="Models/zhudao" animName="5253zhudaoZuo"  frame="1"></Action>
-              <Action type="Anim" value="Models/dunjian" animName="5253dunjian" ></Action>
-              <Action type="Sequence">
-                <Action type="Anim" value="Models/zhudao" animName="5253zhudaoZuo" ></Action>
-                <Action type="Anim" value="Models/zhudao" animName="5253zhudaoYou" ></Action>
-              </Action>
-              <Action type="Anim" value="Models/quan_jirou" animName="53quan_jirou" ></Action>
-            </Action-->>
 
+            <Action type="Show" value="Models/52FanWeiZuo"  isShow="true"></Action>
+            <Action type="HighLight"   value="Models/52FanWeiZuo" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Models/52FanWeiZuo"></Condition>
+            <Action type="HighLight"   value="Models/52FanWeiZuo" isHigh="false" color="0,255,0,255"></Action>
+            <Action type="Show" value="Models/52FanWeiZuo"  isShow="false"></Action>
 
 
-            <!--显示手术中的顿剪,隐藏工具剪刀--><!--
-            <Action type="Show" value="Environment/SM_QvanChangJing/SM_JianZiLei/dunjian"  isShow="false" isDevice="false"></Action>
-            <Action type="Show" value="Models/dunjian"  isShow="true" isDevice="false"></Action>
-
-
-    
-            <Action type="Log" value=" 53动画"></Action>
-
             <Action type="Parallel">
-              <Action type="Anim" value="Models/dunjian" animName="5253dunjian" ></Action>
               <Action type="Sequence">
-                <Action type="Anim" value="Models/zhudao" animName="5253zhudaoZuo" ></Action>
+                <Action type="Anim" value="Models/dunjian" animName="5253dunjianZuo" ></Action>
-                <Action type="Anim" value="Models/zhudao" animName="5253zhudaoYou" ></Action>
               </Action>
-            </Action>-->
+              <Action type="Anim" value="Models/zhudao" animName="5253zhudaoZuo" ></Action>
+              <Action type="Anim" value="Models/quan_jirou" animName="53quan_jirouZuo" ></Action>
+            </Action>
 
 
-            <!--<Action type="Log" value="53动画"></Action>
+            <!--53. 显示左侧高亮范围-->
+            <Action type="Hint" value="用手术刀在腹白线上切开一小口，向左向右，依次剪开腹白线" time="-1" icon="false"></Action>
 
-            <Action type="Hint" value="腹中线开口的右侧，标出高亮的范围圈，点击后，主刀人员持顿尖剪将右侧剪开" time="-1" icon="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="Anim" value="Models/dunjian" animName="5253dunjianYou" frame="1"></Action>-->
-            --><!--点击右侧，范围高亮圈--><!--
+            <Action type="Anim" value="Models/zhudao" animName="5253zhudaoYou"  frame="1"></Action>
-            <Action type="Show" value="Models/52FanWeiYou"  isShow="true" isDevice="true"></Action>
+
+            <Action type="Show" value="Models/52FanWeiYou"  isShow="true"></Action>
             <Action type="HighLight"   value="Models/52FanWeiYou" isHigh="true" color="0,255,0,255"></Action>
             <Condition type="ObjClick" value="Models/52FanWeiYou"></Condition>
             <Action type="HighLight"   value="Models/52FanWeiYou" isHigh="false" color="0,255,0,255"></Action>
-            <Action type="Show" value="Models/52FanWeiYou"  isShow="false" isDevice="true"></Action>
+            <Action type="Show" value="Models/52FanWeiYou"  isShow="false"></Action>
+
+
             <Action type="Parallel">
-
+              <Action type="Sequence">
-              <Action type="Anim" value="Models/zhudao"  animName="5253zhudaoYou"   speed="1"></Action>
+                <Action type="Anim" value="Models/dunjian" animName="5253dunjianYou" ></Action>
-              --><!--播放动画--><!--
+              </Action>
-              <Action type="Anim" value="Models/dunjian"  animName="5253dunjianYou"   speed="1"></Action>
+              <Action type="Anim" value="Models/zhudao" animName="5253zhudaoYou" ></Action>
-            </Action>-->
+              <Action type="Anim" value="Models/quan_jirou" animName="53quan_jirouYou" ></Action>
-
+            </Action>
-
-
 
 
             <Action type="NextOperation"></Action>
+
+
           </Action>
         </Start>
         <Finished>
@@ -1962,7 +1956,6 @@
 
 
 
-      <!--54  点击拉钩，显示拉钩-->
       <Step name="找出病变小肠">
         <Reset>
           <Action type="Sequence">
@@ -1972,15 +1965,48 @@
         </Reset>
         <Start>
           <Action type="Sequence">
+            <Action type="Show" value="Models/dunjian"  isShow="false"></Action>
+            <Action type="Show" value="Models/quan_fubu"  isShow="false" ></Action>
+            <Action type="Show" value="Models/lagou"  isShow="true" ></Action>
+            <Action type="Show" value="Models/quan_fubu"  isShow="false" ></Action>
+            <Action type="Show" value="Models/quan_jirou"  isShow="false" ></Action>
+            <Action type="Show" value="Models/quan_jirou_pifu"  isShow="true" ></Action>
+
+            <!--54  点击拉钩，显示拉钩-->
+
             <Action type="Hint" value="用弯拉钩将切口端拉开，暴露手术视野" time="-1" icon="false" audio="Q022.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="Show" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_LaGou"  isShow="true" ></Action>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_LaGou" isHigh="true" color="0,255,0,255"></Action>
+            <Condition type="ObjClick" value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_LaGou"></Condition>
+            <Action type="HighLight"   value="Environment/SM_QvanChangJing/SM_JianZiLei/pasted__SM_LaGou" isHigh="false" color="0,255,0,255"></Action>
             <Action type="Show" value="Models/lagou"  isShow="true" ></Action>
+            <!--  拉钩动画,初始状态设置-->
+
+            <Action type="Anim" value="Models/lagou"  animName="5455lagou"   frame="1"></Action>
+            <Action type="Anim" value="Models/quan_jirou_pifu"  animName="5455quan_jirou_pifu"   frame="1"></Action>
+            <Action type="Anim" value="Models/zhudao"  animName="5455zhudao"   frame="1"></Action>
+            <Action type="Anim" value="Models/zhushou"  animName="5455zhushou"   frame="1"></Action>
+
+
+            <!--55  点击拉钩，显示拉钩-->
+            <Action type="Hint" value="用弯拉钩将切口端拉开，暴露手术视野" time="-1" icon="false" ></Action>
+            <Action type="Collider" value="Models/lagou"  colliderType="AddBox" args="-0.4090763,1.361263,-0.01660019|0.04199231,0.05587626,0.2554389"></Action>
+
+            
+
             <Action type="HighLight"   value="Models/lagou" isHigh="true" color="0,255,0,255"></Action>
             <Condition type="ObjClick" value="Models/lagou"></Condition>
             <Action type="HighLight"   value="Models/lagou" isHigh="false" color="0,255,0,255"></Action>
-            <Action type="Show" value="Models/lagou"  isShow="false" ></Action>
+            <!--播放动画-->
-
 
+            <Action type="Parallel">
+              <Action type="Anim" value="Models/lagou"  animName="5455lagou"   speed="1"></Action>
+              <Action type="Anim" value="Models/quan_jirou_pifu"  animName="5455quan_jirou_pifu"   speed="1"></Action>
+              <Action type="Anim" value="Models/zhudao"  animName="5455zhudao"   speed="1"></Action>
+              <Action type="Anim" value="Models/zhushou"  animName="5455zhushou"   speed="1"></Action>
+              <!--助手动画有问题-->
+            </Action>
 
             <Action type="NextOperation"></Action>
 
@@ -1993,7 +2019,7 @@
           </Action>
         </Finished>
       </Step>
-      <!--55  拉钩动画-->
+  
       <Step name="找出病变小肠">
         <Reset>
           <Action type="Sequence">