From 0a82bad3ff0870b835a1a4b3a8300ed2c4598a94 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Thu, 2 Jan 2025 14:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Animation/22/zhijin/zhijin.fbx.meta       |  2 +-
 .../Animation/22/zhijin/zhijin.txt            |  2 +-
 .../24/麻醉助手01/Aim_yisheng_01.fbx.meta     |  2 +-
 Data/Xml/Study.xml                            | 27 ++++++++++++++++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta
index e6f4aecf..3824dca9 100644
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.fbx.meta
@@ -45,7 +45,7 @@ ModelImporter:
       takeName: 
       internalID: 3060610079319413300
       firstFrame: 2330
-      lastFrame: 2750
+      lastFrame: 2500
       wrapMode: 0
       orientationOffsetY: 0
       level: 0
diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt
index 9638c590..3c414329 100644
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/zhijin/zhijin.txt
@@ -1 +1 @@
-2330-2750 擦手
\ No newline at end of file
+2330-2500 擦手
\ No newline at end of file
diff --git 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
index 263f3a65..f6c7c335 100644
--- 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
diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml
index 06359b23..8daba7bf 100644
--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@@ -789,7 +789,7 @@
 						<Action type="HighLight"  deviceName="水龙头" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="水龙头"></Condition>
 						<Action type="Anim" value="Models/ZhuDao_chaunyifu" animName="洗手" speed="2"></Action>
-						
+
 
 
 						<Action type="Hint" value="手臂消毒后，呈“抱球状”姿势，用无菌擦手纸擦干手及手臂" time="-1" icon="true" audio="Q003.mp3"></Action>
@@ -919,6 +919,7 @@
 
 						<Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="true" 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="Models/ZhuDao_chaunyifu/SM_YiShengMaoZi1" isShow="true" ></Action>
@@ -1028,7 +1029,7 @@
 				</Start>
 				<Finished>
 					<Action type="Sequence">
-						<Action type="Anim" value="Models/ZhuDao_chaunyifu" animName="站立"/>
+						<Action type="Anim" value="Models/ZhuDao_chaunyifu" animName="穿手术服" frame="0"/>
 						<Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengShenTi1.006" isShow="true" ></Action>
 						<Action type="Show" value="Models/ZhuDao_chaunyifu/SM_YiShengShenTi1.010" isShow="true" ></Action>
 						<Action type="Show" value="Models/ZhuDao_chaunyifu/nan_shoushufu.001"  isShow="true"></Action>
@@ -1061,6 +1062,7 @@
 						<Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>
 
 						<!--点击帽子-->
+						<Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="true" 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="Models/nvzhushou_xishou/pasted__Yisheng_A7" isShow="true" ></Action>
@@ -1078,9 +1080,11 @@
 							<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="Hint" value="打开水龙头，按照七步洗手法进行手臂消毒" time="-1" icon="true" audio="Q002.mp3"></Action>
 						<Action type="HighLight"  deviceName="水龙头" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="水龙头"></Condition>
 						<Action type="Anim" value="Models/nvzhushou_xishou" animName="洗手" speed="2"></Action>
+						<Action type="Hint" value="手臂消毒后，呈“抱球状”姿势，用无菌擦手纸擦干手及手臂" time="-1" icon="true" audio="Q003.mp3"></Action>
 						<Action type="HighLight"  deviceName="擦手纸" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="擦手纸"></Condition>
 						<Action type="Parallel">
@@ -1092,6 +1096,7 @@
 								<Action type="Show" value="Models/nvzhushou_xishou/zhijin" isShow="false" ></Action>
 							</Action>
 						</Action>
+						<Action type="Hint" value="用洁肤柔消毒凝胶进行术部部加强" time="-1" icon="true" audio="Q004.mp3"></Action>
 						<Action type="HighLight"  deviceName="消毒凝胶" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="消毒凝胶"></Condition>
 						<Action type="Anim" value="Models/nvzhushou_xishou" animName="消毒" ></Action>
@@ -1140,6 +1145,7 @@
 						<Action type="Rotate" value="FlyCamera" to="7.624398,21.15804,-7.429481E-06" time="0"></Action>
 
 						<!--点击帽子-->
+						<Action type="Hint" value="穿戴帽子、口罩" time="-1" icon="true" 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="Models/nvzhushou_xishou/pasted__Yisheng_A7" isShow="true" ></Action>
@@ -1157,9 +1163,11 @@
 							<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="Hint" value="打开水龙头，按照七步洗手法进行手臂消毒" time="-1" icon="true" audio="Q002.mp3"></Action>
 						<Action type="HighLight"  deviceName="水龙头" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="水龙头"></Condition>
 						<Action type="Anim" value="Models/nvzhushou_xishou" animName="洗手" speed="2"></Action>
+						<Action type="Hint" value="手臂消毒后，呈“抱球状”姿势，用无菌擦手纸擦干手及手臂" time="-1" icon="true" audio="Q003.mp3"></Action>
 						<Action type="HighLight"  deviceName="擦手纸" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="擦手纸"></Condition>
 						<Action type="Parallel">
@@ -1171,6 +1179,7 @@
 								<Action type="Show" value="Models/nvzhushou_xishou/zhijin" isShow="false" ></Action>
 							</Action>
 						</Action>
+						<Action type="Hint" value="用洁肤柔消毒凝胶进行术部部加强" time="-1" icon="true" audio="Q004.mp3"></Action>
 						<Action type="HighLight"  deviceName="消毒凝胶" isHigh="true" color="0,255,0,255"></Action>
 						<Condition type="ObjClick" deviceName="消毒凝胶"></Condition>
 						<Action type="Anim" value="Models/nvzhushou_xishou" animName="消毒" ></Action>
@@ -1197,11 +1206,20 @@
 				<Start>
 					<Action type="Sequence">
 
+						
+						<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="Hint" value="（术前12小时禁食，术前2小时禁水）首先进行诱导式麻醉" time="-1" icon="true" 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" deviceName="注射器"  isShow="true"></Action>
+						<Action type="Show" value="注射器"  isShow="true" isDevice="true"></Action>
 						<Condition type="ObjClick" deviceName="注射器"></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>
@@ -1209,7 +1227,7 @@
 
 
 						<Action type="Show" value="Models/SM_gou/SM_gou"  isShow="false"></Action>
-						<Action type="Show" deviceName="注射器"  isShow="false"></Action>
+						<Action type="Show" value="注射器"  isShow="false" isDevice="true"></Action>
 
 						<Action type="Hint" value="下颌肌肉松弛即可进行插管" time="-1" icon="true" audio="Q008.mp3"></Action>
 
@@ -1218,6 +1236,7 @@
 						<Action type="Show" value="Models/Aim_chaguan"  isShow="true"></Action>
 
 						<Action type="HighLight"  deviceName="插管" isHigh="true" color="0,255,0,255"></Action>
+						<Action type="SkinnedBake" deviceName="插管"></Action>
 						<Condition type="ObjClick" deviceName="插管"></Condition>
 						<Action type="Anim" value="Models/Aim_chaguan" animName="插管" ></Action>