From c85d0db48a1b14e263033b1f70e5013a121e50ac Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 31 Dec 2024 13:54:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yifu/yifu.fbx.meta                        |  2 +-
 .../yifu/yifu.txt                             |  2 +-
 Data/Xml/Exam.xml                             | 25 +++++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.fbx.meta
index dab12a9f..9ac7d795 100644
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.fbx.meta
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.fbx.meta
@@ -59,7 +59,7 @@ ModelImporter:
       name: "\u7A7F\u624B\u672F\u670D"
       takeName: 
       internalID: 3060610079319413300
-      firstFrame: 0
+      firstFrame: 130
       lastFrame: 300
       wrapMode: 0
       orientationOffsetY: 0
diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.txt
index 400d41fd..ec9cd415 100644
--- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.txt
+++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/穿衣服(含有主刀角色网格模型)/yifu/yifu.txt
@@ -1 +1 @@
-0-300 穿手术服
\ No newline at end of file
+130-300 穿手术服
\ No newline at end of file
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index 2256f18a..4f68c35d 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -989,7 +989,7 @@
 
 							<Action type="Sequence">
 								<Condition type="Or" >
-									<Condition type="ObjClick" deviceName="无菌擦手纸"></Condition>
+									<Condition type="ObjClick" deviceName="擦手纸"></Condition>
 									<Condition type="ObjClick" deviceName="消毒凝胶"></Condition>
 								</Condition>
 								<Action type="Hint" value="物品穿戴顺序错误" time="2" icon="false"></Action>
@@ -1036,7 +1036,7 @@
 							<Action type="Sequence">
 								<Condition type="Or" >
 									<Condition type="ObjClick" deviceName="水龙头"></Condition>
-									<Condition type="ObjClick" deviceName="无菌擦手纸"></Condition>
+									<Condition type="ObjClick" deviceName="擦手纸"></Condition>
 								</Condition>
 								<Action type="Hint" value="物品穿戴顺序错误" time="2" icon="false"></Action>
 							</Action>
@@ -1063,15 +1063,17 @@
 						<Action type="Hint" value="请选择拿起手术服时的捏拿位置" time="-1" icon="true" audio="Q005.mp3"></Action>
 						<Action type="Any">
 							<Action type="Sequence">
-								<Condition type="UIClick" value="UIRoot/Common/UIPointQuestion/Content/1"></Condition>
+								<Condition type="UIClick" value="UIRoot/PopUI/UIPointQuestion/Content/1"></Condition>
 								<Action type="SetScore" name="术前准备主刀人员准备" value="1"></Action>
 							</Action>
 
 							<Action type="Sequence">
-								<Condition type="UIClick" value="UIRoot/Common/UIPointQuestion/Content/1"></Condition>
+								<Condition type="UIClick" value="UIRoot/PopUI/UIPointQuestion/Content/2"></Condition>
 								<Action type="Hint" value="选择错误，应捏拿衣领处" time="2" icon="false"></Action>
 							</Action>
 						</Action>
+						<Action type="UIShow" value="UIPointQuestion" isShow="false"></Action>
+						<Action type="UIShow" value="UIHint" isShow="false"></Action>
 
 						<Action type="Parallel">
 							<Action type="Sequence">
@@ -1088,26 +1090,29 @@
 						<Action type="Show" value="Models/ZhuDao_chaunyifu" isShow="false"></Action>
 
 
-
-
-
+						
+						
+						<Action type="Show" value="Models/ZhuDao_chaunyifu/shoutao" isShow="true"></Action>
 						<Action type="Show" value="Models/ZhuDao_chaunyifu" isShow="true"></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="PointQuestion" value="Models/ZhuDao_chaunyifu_chaunyifu/shoutao/空物体.001,Models/ZhuDao_chaunyifu_chaunyifu/shoutao/空物体.002"></Action>
+						<Action type="PointQuestion" value="Models/ZhuDao_chaunyifu/shoutao/空物体.001,Models/ZhuDao_chaunyifu/shoutao/空物体.002"></Action>
 
 						<!--点击无菌手套-->
 						<Action type="Hint" value="请选择拿起手套时的捏拿位置" time="-1" icon="true" audio="Q005.mp3"></Action>
 						<Action type="Any">
 							<Action type="Sequence">
-								<Condition type="ObjClick" value="Models/ZhuDao_chaunyifu_chaunyifu/shoutao/空物体.001"></Condition>
+								<Condition type="UIClick" value="UIRoot/PopUI/UIPointQuestion/Content/1"></Condition>
 								<Action type="SetScore" name="术前准备主刀人员准备" value="1"></Action>
 							</Action>
 							<Action type="Sequence">
-								<Condition type="ObjClick" value="Models/ZhuDao_chaunyifu_chaunyifu/shoutao/空物体.002"></Condition>
+								<Condition type="UIClick" value="UIRoot/PopUI/UIPointQuestion/Content/2"></Condition>
 								<Action type="Hint" value="选择错误，应捏翻折部位" time="2" icon="false"></Action>
 							</Action>
 						</Action>
+
+						<Action type="UIShow" value="UIPointQuestion" isShow="false"></Action>
+
 						<Action type="Parallel">
 							<Action type="Show" value="Models/ZhuDao_chaunyifu_chaunyifu/shoutao" isShow="true" ></Action>