修改反馈完成，添加查尔斯滤色镜模块

Assets/Scenes/ExameScene/ChaErSiLvSeJing.unity.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scenes/FenGuangJing.unity.meta
+guid: e85b8a0b56c8fdb4086f396aa1383472
+========
+guid: 2d639a7bb4fee5645b05ef3ebd023ce1
+>>>>>>>> origin/master:Assets/Projects/3DJiePao/Scene.unity.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Data/Xml/BaoShiZhuoMoJiaGong.xml

@@ -1297,31 +1297,15 @@
               <Action type="Rotate" value="FlyCamera" to="30.578,179.549,0" time="0"></Action>
 
 
-              <Action type="Hint" value="请选择合适的工具，更换细磨盘，对宝石粗坯的亭部进行抛光" time="-1" audio="sound_126.mp3" icon="true" ></Action>
+              <Action type="Hint" value="请选择合适的工具，更换细磨盘，对宝石粗坯的腰部进行抛光" time="-1" audio="sound_126.mp3" icon="true" ></Action>
               <Action type="Show" value="Main/SM_YanMoJi/DingPingQi" isShow="false"></Action>
 
 
 
+              <Action type="HighLightFlash" value="Main/BaJiaoShou" isHigh="true" color="255,0,0,255" time="0.25" count="-1"></Action>
+              <Condition type="ObjClick" value="Main/BaJiaoShou" ></Condition>
+              <Action type="HighLightFlash" value="Main/BaJiaoShou" isHigh="false" color="255,0,0,255"></Action>
 
-              <Action type="UITools" devices="数显游标卡尺,记号笔,粘杆,顶平器,八角手,直尺,扳手" answers="扳手"
-                         setActive="true"
-                         rightLabel="提示：物品选择正确。"
-                         wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
-                         rightEvent="物品准备通过"
-                        wrongEvent="物品准备失败"
-                         rightScore="10"
-                         wrongScore=""
-                         scoreStepName="宝石琢磨加工9.亭部抛光"
-                         autoHide="1"
-                             wrongCount="3">
-              </Action>
-
-              <Condition type="Or">
-                <Condition type="StrEvent" value="物品准备通过"></Condition>
-                <Condition type="StrEvent" value="物品准备失败"></Condition>
-              </Condition>
-
-              <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
               <!--磨盘，显示细磨盘-->

Data/Xml/ChaErSiLvSeJing.xml

@@ -0,0 +1,247 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+
+
+<Module>
+
+
+  <Icon>8分光镜.png</Icon>
+	<Scene>ChaErSiLvSeJing</Scene>
+	<Type>All</Type>
+	<Name>查尔斯滤色镜的使用</Name>
+  <OnlyCurScore>true</OnlyCurScore>
+
+
+
+
+  <FSM name="初始化状态机">
+		<State name="初始化">
+		  <Enter>
+			<Action type="Sequence">
+
+        <Action type="Var" name="完成" value="0"></Action>
+        <Action type="UIShow" value="UIOperationList" isShow="true"></Action>
+        <Action type="Show" value="CustomParent/Canvas" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/Eye" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/Canvas" isShow="false"></Action>
+        <Action type="Parallel">
+					<Action type="Move" value="FlyCamera" to="-0.4474,1.3939,2.0604" time="0"></Action>
+					<Action type="Rotate" value="FlyCamera" to="18.66748,0,0" time="0"></Action>
+				</Action>
+
+        <Action type="Anim" value="CustomParent/GuanXianDeng" animName="FenGuangJingTouSheFa_GXD" frame="0"></Action>
+        <Action type="Anim" value="ChangJing/SM_GuangShanFenGuangJing" animName="FenGuangJingTouSheFa_FGJ" frame="0"></Action>
+        <Action type="Anim" value="ChangJing/SM_GuangShanFenGuangJing" animName="FenGuangJingFanSheFa_FGJ" frame="0"></Action>
+        <Action type="Anim" value="ChangJing/SM_GuangShanFenGuangJing" animName="FenGuangJingFanSheFa_FGJ" frame="0"></Action>
+
+
+        <Action type="Show" value="CustomParent/BaoShiKu/HongBaoShi" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/BaoShiKu/HongSeJianJingShi" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/BaoShiKu/ZuMuLv" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/BaoShiKu/LanBaoShi" isShow="false"></Action>
+        <Action type="Show" value="CustomParent/BaoShiKu/BianShi" isShow="false"></Action>
+        
+        <Action type="TextTip" title="实验说明" value="分光镜是用来观察宝石的吸收光谱，帮助鉴定宝石品种，推断宝石中的致色元素，尤其是对典型光谱的宝石种类，可以用来确定宝石的亚种。还可以用来鉴别是否经染色处理。分光镜根据宝石的特性有两种鉴定方式：
+	一、透射法：适用于透明或半透明的宝石。
+	二、反射法：适用于透明度较差或不透明的宝石。"  btns="确定"/>
+				<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
+
+				<Action type="Hint" value="请点击宝石库中需要鉴定的宝石" time="-1" audio="sound_10.mp3" icon="true" ></Action>
+				<Action type="UIShow" value="UIFengGuangJingBSKPanel" isShow="true"></Action>
+				<Condition type="StrEvent" value="InputUI使用结束"></Condition>
+				
+				<Action type="TipWindow" value="请自行选择宝石鉴定方式" btns="透射法,反射法" audio=""></Action>				
+			</Action>
+		  </Enter>
+		</State>
+		
+		<State name="透射法">
+			<Enter>
+				<Action type="Sequence">
+					<Action type="OperationChange" name="透射法"></Action>
+				</Action>	
+			</Enter>
+		</State>
+		<State name="反射法">
+			<Enter>
+				<Action type="Sequence">
+					<Action type="OperationChange" name="反射法"></Action>
+				</Action>
+			</Enter>
+		</State>
+		
+		<Transision from="初始化" to="透射法">
+			<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/透射法"></Condition>
+		</Transision>
+		<Transision from="初始化" to="反射法">
+			<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/反射法"></Condition>
+		</Transision>
+		<Transision from="any" to="初始化">
+			<Condition type="Var" name="完成" value="1"></Condition>
+
+
+
+    </Transision>
+
+
+
+
+  </FSM>
+	
+	<Score>
+		<Item step="1.打开偏光镜电源" name="1.打开偏光镜电源" sum="0" bind=""/>
+	</Score>
+
+
+  <Operation name="初始化" moduleType="Study" freeStep="false">
+
+
+    <Step name="1.选择宝石库中需要鉴定的宝石">
+
+
+    </Step>
+    <!--<Step name="2.打开偏光镜电源">
+
+    </Step>
+    <Step name="3.打开偏光镜电源">
+
+    </Step>-->
+  </Operation>
+  
+  
+  
+  
+    <Operation name="透射法" moduleType="Study" freeStep="false">
+		<Step name="1.打开偏光镜电源">
+			<Start>
+				<Action type="Sequence">
+
+          <Action type="Parallel">
+            <Action type="Move" value="FlyCamera" to="-0.5556255,1.343078,2.199082" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="28.8251,13.40388,2.436303E-07" time="0"></Action>
+          </Action>
+
+          <Action type="Move" value="CustomParent/BaoShiKu" to="-0.4671,1.2918,2.2519" time="0"></Action>
+					<Action type="Move" value="CustomParent/Eye" to="-0.463,1.42,2.251" time="0"></Action>
+					<Action type="Rotate" value="CustomParent/Eye" to="0,0,0" time="0"></Action>
+				
+					<Action type="Hint" value="请将光纤灯的光源对准宝石，使光透过宝石" time="-1" audio="sound_11.mp3" icon="true" ></Action>
+					<Action type="HighLightFlash" value="CustomParent/GuanXianDeng" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="CustomParent/GuanXianDeng"></Condition>
+					<Action type="HighLightFlash" value="CustomParent/GuanXianDeng" isHigh="false"></Action>
+					
+					<Action type="Anim" value="CustomParent/GuanXianDeng" animName="FenGuangJingTouSheFa_GXD" speed="1"></Action>	
+					<Action type="NextOperation"></Action>
+				</Action>
+			</Start>
+		</Step>
+		<Step name="2.调整分光镜">
+			<Start>
+				<Action type="Sequence">
+					<Action type="Hint" value="请把分光镜放在宝石的上方，狭缝对准宝石，使通过宝石的光经狭缝进入分光镜" time="-1"  audio="sound_12.mp3" icon="true" ></Action>
+					<Action type="Parallel">
+						<Action type="Move" value="FlyCamera" to="-0.228,1.564,1.797" time="1.5"></Action>
+						<Action type="Rotate" value="FlyCamera" to="26.37553,0,0" time="1.5"></Action>
+					</Action>
+					<Action type="HighLightFlash" value="ChangJing/SM_GuangShanFenGuangJing" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="ChangJing/SM_GuangShanFenGuangJing"></Condition>
+					<Action type="HighLightFlash" value="ChangJing/SM_GuangShanFenGuangJing" isHigh="false"></Action>
+					
+					<Action type="Anim" value="ChangJing/SM_GuangShanFenGuangJing" animName="FenGuangJingTouSheFa_FGJ" speed="1"></Action>
+					
+					<Action type="Parallel">
+					<Action type="Move" value="FlyCamera" to="-0.483,1.331,1.995" time="1.0"></Action>
+					<Action type="Rotate" value="FlyCamera" to="0,0,0" time="1.0"></Action>
+					</Action>
+					
+					<Action type="Show" value="CustomParent/Eye" isShow="true"></Action>
+					<Action type="NextOperation"></Action>
+				</Action>
+			</Start>
+		</Step>
+		<Step name="3.观察谱图">
+			<Start>
+				<Action type="Sequence">
+					<Action type="Hint" value="请将眼睛靠近目镜观察，并记录所观察到的谱图" time="-1"  audio="sound_13.mp3" icon="true" ></Action>
+					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="CustomParent/Eye"></Condition>
+					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="false"></Action>
+					
+					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+					<Action type="Delay" value="2"></Action>
+					<Action type="TipWindow" value="重新选择宝石" btns="确定" audio=""></Action>
+					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
+
+          <Action type="Var" name="完成" value="1"></Action>
+        </Action>
+			</Start>
+		</Step>
+	</Operation>
+	<Operation name="反射法" moduleType="Study" freeStep="false">
+		<Step name="1.打开偏光镜电源">
+			<Start>
+				<Action type="Sequence">
+
+          <Action type="Parallel">
+            <Action type="Move" value="FlyCamera" to="-0.5556255,1.343078,2.199082" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="28.8251,13.40388,2.436303E-07" time="0"></Action>
+          </Action>
+          
+          <Action type="Move" value="CustomParent/BaoShiKu" to="-0.4671,1.215,2.2519" time="0"></Action>
+					<Action type="Move" value="CustomParent/Eye" to="-0.377,1.3112,2.251" time="0"></Action>
+					<Action type="Rotate" value="CustomParent/Eye" to="0,0,315" time="0"></Action>
+				
+					<Action type="Hint" value="请将光纤灯的光源对准宝石，调整光源的角度，使光源约45°照射在宝石上" time="-1" audio="sound_14.mp3" icon="true" ></Action>
+					<Action type="HighLightFlash" value="CustomParent/GuanXianDeng" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="CustomParent/GuanXianDeng"></Condition>
+					<Action type="HighLightFlash" value="CustomParent/GuanXianDeng" isHigh="false"></Action>
+					
+					<Action type="Anim" value="CustomParent/GuanXianDeng" animName="FenGuangJingFanSheFa_GXD" speed="1"></Action>	
+					<Action type="NextOperation"></Action>
+				</Action>
+			</Start>
+		</Step>
+		<Step name="2.调整分光镜">
+			<Start>
+				<Action type="Sequence">
+					<Action type="Hint" value="请把分光镜的物镜狭缝对准宝石表面的反射光，分光镜的角度约45°" time="-1"  audio="sound_15.mp3" icon="true" ></Action>
+					<Action type="Parallel">
+						<Action type="Move" value="FlyCamera" to="-0.228,1.564,1.797" time="1.5"></Action>
+						<Action type="Rotate" value="FlyCamera" to="26.37553,0,0" time="1.5"></Action>
+					</Action>
+					<Action type="HighLightFlash" value="ChangJing/SM_GuangShanFenGuangJing" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="ChangJing/SM_GuangShanFenGuangJing"></Condition>
+					<Action type="HighLightFlash" value="ChangJing/SM_GuangShanFenGuangJing" isHigh="false"></Action>
+					
+					<Action type="Anim" value="ChangJing/SM_GuangShanFenGuangJing" animName="FenGuangJingFanSheFa_FGJ" speed="1"></Action>
+					
+					<Action type="Parallel">
+					<Action type="Move" value="FlyCamera" to="-0.483,1.276,1.995" time="1.0"></Action>
+					<Action type="Rotate" value="FlyCamera" to="0,0,0" time="1.0"></Action>
+					</Action>
+					
+					<Action type="Show" value="CustomParent/Eye" isShow="true"></Action>
+					<Action type="NextOperation"></Action>
+				</Action>
+			</Start>
+		</Step>
+		<Step name="3.观察谱图">
+			<Start>
+				<Action type="Sequence">
+					<Action type="Hint" value="请将眼睛靠近目镜观察，并记录所观察到的谱图" time="-1" audio="sound_16.mp3" icon="true" ></Action>
+					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+					<Condition type="ObjClick" value="CustomParent/Eye"></Condition>
+					<Action type="HighLightFlash" value="CustomParent/Eye" isHigh="false"></Action>
+					
+					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+					<Action type="Delay" value="2"></Action>
+          <Action type="TipWindow" value="重新选择宝石" btns="确定" audio=""></Action>
+					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
+
+
+          <Action type="Var" name="完成" value="1"></Action>
+        </Action>
+			</Start>
+		</Step>
+	</Operation>
+</Module>