JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
李浩 2025-01-21 11:09:01 +08:00
commit c61fcf1b30
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/UI/UICameraSwitch.cs
View File

@ -66,11 +66,11 @@ namespace QFramework.Example
if (string.IsNullOrEmpty(mData.isOn))
{
if (Near.isOn)
if (Near.isOn && Near.gameObject.activeSelf)
{
SetNear();
}
if (Far.isOn)
if (Far.isOn && Far.gameObject.activeSelf)
{
SetNormal();
}

35
Data/Xml/Exam.xml
View File

@ -917,9 +917,8 @@
<!--隐藏帽子和口罩-->
<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.39376,1.659975,-1.546996" time="0"></Action>
<Action type="Rotate" value="FlyCamera" to="7.624402,27.42901,1.076736E-07" time="0"></Action>
<!--点击帽子-->
@ -966,10 +965,7 @@
<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>
@ -1062,8 +1058,6 @@
<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="CameraSwitch" normalPos="-4.72, 1.58, -1.98" normalRot="13.73, 151.63, 0.00" normalTime="0"></Action>
@ -1296,6 +1290,9 @@
<Action type="Show" deviceName="插管" isShow="false"></Action>
<!--等待两秒-->
<Action type="Delay" value="2"></Action>
<Action type="Hint" value="请按顺序进行相关操作" time="-1" icon="false"></Action>
@ -1313,9 +1310,14 @@
</Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-0.47, 2.33, 0.49" nearRot="60.00, 179.49, 0.00" normalTime="0"></Action>
<!--等待两秒-->
<Action type="Delay" value="1"></Action>
<Action type="Show" value="Environment/SM_QvanChangJing/jingwu/SM_YiLiaoQuan/sweep4" isShow="true"></Action>
<!--等待两秒-->
<Action type="Delay" value="1"></Action>
<Action type="NextOperation"></Action>
</Action>
</Start>
@ -1332,7 +1334,7 @@
<Action type="Hint" value="请按顺序进行相关操作" time="-1" icon="false"></Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-3.33, 1.50, -2.93" nearRot="50.40, 179.63, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-0.65, 2.27, 1.14" nearRot="31.40, 180.14, 0.00" normalTime="0"></Action>
<Action type="Point3DQuestion">
<Data name="39-1" position="-0.5265,1.3769,-0.0199" rotate="90,0,0" scale="0.07,0.07,0.07" rotateSpeed="180" clickEvent="1"></Data>
<Data name="39-2" position="-0.5265,1.3718,0.0507" rotate="90,0,0" scale="0.07,0.07,0.07" rotateSpeed="180" clickEvent="2"></Data>
@ -1365,6 +1367,7 @@
<Action type="Parallel">
<Action type="Anim" value="Models/TiMao" animName="TiMaoAnim" ></Action>
<Action type="Anim" value="Models/diantuizi" animName="39电推子动画" ></Action>
<Action type="Anim" value="Models/zhudao" animName="39主刀动画" ></Action>
</Action>
@ -1374,7 +1377,7 @@
<Action type="Hint" value="请按顺序进行相关操作" time="-1" icon="false"></Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-3.33, 1.50, -2.93" nearRot="50.40, 179.63, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-3.33, 1.50, -2.93" nearRot="50.40, 179.63, 0.00" normalTime="0"></Action>
<Action type="Any">
<Action type="Sequence">
@ -1479,7 +1482,7 @@
<Action type="Anim" value="Models/zhudao" animName="42zhudao" ></Action>
</Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-3.33, 1.50, -2.93" nearRot="50.40, 179.63, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.65, 2.27, 1.14" normalRot="31.40, 180.14, 0.00" nearPos="-0.65, 2.27, 1.14" nearRot="31.40, 180.14, 0.00" normalTime="0"></Action>
<Action type="TextQuestion" title="术部消毒时，消毒棉球的涂抹方式是？" options="A、逆时针由里向外呈圆形|B、顺时针由里向外呈圆形|C、由上至下呈之字形|D、由下至上呈之字形" answers="1" btns="确定" wait="1" showAnswer="true" scoreName="术前准备术部消毒准备" rightScore="1" wrongScore="0" finishedEvent="答题完成"></Action>
@ -1707,7 +1710,7 @@
<!--50-->
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-1.07, 1.59, 0.04" nearRot="50.17, 269.17, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-0.69, 2.24, 0.48" nearRot="60.00, 179.84, 0.00" normalTime="0"></Action>
<Action type="Hint" value="请选择肌肉切口起始位置" time="-1" icon="true" ></Action>
<Action type="Point3DQuestion">
@ -1907,7 +1910,7 @@
</Reset>
<Start>
<Action type="Sequence">
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-0.69, 2.24, 0.48" nearRot="60.00, 179.84, 0.00" normalTime="0"></Action>
<Action type="Hint" value="请按顺序进行相关操作" time="-1" icon="false"></Action>
<Action type="Any">
<Action type="Sequence">
@ -2066,7 +2069,7 @@
<Action type="Sequence">
<!--61血管止血位置-->
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-1.07, 1.59, 0.04" nearRot="50.17, 269.17, 0.00" normalTime="0"></Action>
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-0.4207785,1.462944,-0.1083589" nearRot="51.49597,2.79087,1.714213E-07" normalTime="0"></Action>
<Action type="Hint" value="请选择血管上的正确钳夹位置" time="-1" icon="true"></Action>
<Action type="Point3DQuestion">
@ -2161,7 +2164,6 @@
<!--63组织剪-->
<Action type="CameraSwitch" normalPos="-0.69, 2.24, 0.48" normalRot="60.00, 179.84, 0.00" nearPos="-1.07, 1.59, 0.04" nearRot="50.17, 269.17, 0.00" normalTime="0"></Action>
<Action type="Hint" value="请按顺序进行相关操作。" time="-1" icon="false" ></Action>
<Action type="CameraSwitch" nearPos="-1.298339,2.227672,0.1251958" nearRot="47.61902,94.25353,0" nearTime="0" normalPos="-1.298339,2.227672,0.1251958" normalRot="-1.298339,2.227672,0.1251958" normalTime="0" isNear="false"></Action>
<Action type="Any">
<Action type="Sequence">
<Condition type="ObjClick" deviceName="尖剪" ></Condition>
@ -2470,6 +2472,7 @@
<Action type="Show" value="Models/73zhijin" isShow="false" isDevice="false"></Action>
</Action>
<Action type="Anim" value="Models/zhudao" animName="zhudaoNormal" speed="1"></Action>
<Action type="Anim" value="Models/zhushou" animName="zhushouNormal" speed="1"></Action>
<!--74没有展现内容 直接切换-->
<Action type="Show" value="Environment/SM_QvanChangJing/jingwu/SM_XiYinQi" isShow="true" isDevice="false"></Action>