修改后几个反馈

Assets/Art/Models/AnHui/SM_BaoShi/Materials/3d66-Standardmaterial-20385992-001.mat

@@ -25,15 +25,17 @@ Material:
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
-  - _EMISSION
+  - _SURFACE_TYPE_TRANSPARENT
   m_InvalidKeywords: []
-  m_LightmapFlags: 2
+  m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 3000
   stringTagMap:
-    RenderType: Opaque
+    RenderType: Transparent
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DepthOnly
+  - SHADOWCASTER
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
@@ -71,7 +73,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
-        m_Texture: {fileID: 2800000, guid: d5550345cf5d59c49a5f06e43592c25c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _ParallaxMap:
@@ -99,7 +101,7 @@ Material:
     - _AlphaClip: 0
     - _AlphaToMask: 0
     - _Blend: 0
-    - _BlendModePreserveSpecular: 1
+    - _BlendModePreserveSpecular: 0
     - _BumpScale: 1
     - _ClearCoatMask: 0
     - _ClearCoatSmoothness: 0
@@ -107,30 +109,30 @@ Material:
     - _Cutoff: 0.5
     - _DetailAlbedoMapScale: 1
     - _DetailNormalMapScale: 1
-    - _DstBlend: 0
+    - _DstBlend: 10
-    - _DstBlendAlpha: 0
+    - _DstBlendAlpha: 10
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
-    - _Glossiness: 0.14142135
+    - _Glossiness: 0.22191389
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 1
-    - _Mode: 0
+    - _Mode: 3
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 1
+    - _Smoothness: 0.76
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
-    - _SrcBlend: 1
+    - _SrcBlend: 5
     - _SrcBlendAlpha: 1
-    - _Surface: 0
+    - _Surface: 1
     - _UVSec: 0
     - _WorkflowMode: 1
-    - _ZWrite: 1
+    - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 0.4743359, g: 1, b: 0, a: 1}
+    - _BaseColor: {r: 0.76920515, g: 0.96107477, b: 0.9965443, a: 1}
-    - _Color: {r: 0.4743359, g: 1, b: 0, a: 1}
+    - _Color: {r: 0.76920515, g: 0.96107477, b: 0.9965443, a: 1}
-    - _EmissionColor: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Art/Models/AnHui/ZheSheYiHuMian/Materials/3d66-Standardmaterial-20385992-001.mat

@@ -116,13 +116,13 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.22191389
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.254
     - _Mode: 3
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Smoothness: 0.22191389
+    - _Smoothness: 0.733
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
@@ -132,8 +132,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 0.5529412, g: 0.9137255, b: 0.99215686, a: 0.24000001}
+    - _BaseColor: {r: 0.13679248, g: 0.8458558, b: 1, a: 0.3882353}
-    - _Color: {r: 0.5529412, g: 0.9137255, b: 0.99215686, a: 0.24000001}
+    - _Color: {r: 0.13679248, g: 0.8458558, b: 1, a: 0.3882353}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
   m_BuildTextureStacks: []

Assets/Art/UIPrefab/UIInput.prefab

@@ -1439,7 +1439,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
-  m_MinWidth: 865
+  m_MinWidth: 500
   m_MinHeight: 320
   m_PreferredWidth: -1
   m_PreferredHeight: -1

Assets/Projects/AnHui/16PianGuangJingZhuiGuangJing/Timeline/FangZhiBaoShi2.playable

@@ -154,6 +154,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: baoshi2
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0, y: 13.9, z: -1.5}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: baoshi2/SM_heishizi (1)
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -182,6 +198,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 372048815
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -465,6 +490,69 @@ AnimationClip:
     classID: 4
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: baoshi2/SM_heishizi (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: 13.9
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: baoshi2/SM_heishizi (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: -1.5
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: baoshi2/SM_heishizi (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

Assets/Projects/AnHui/16PianGuangJingZhuiGuangJing/Timeline/FangZhiBaoShi3.playable

@@ -92,6 +92,22 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     path: baoshi3
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0, y: -14.6, z: -1.6}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: baoshi3/SM_niuyan (1)
   m_ScaleCurves: []
   m_FloatCurves: []
   m_PPtrCurves: []
@@ -120,6 +136,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 350175499
+      attribute: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -403,6 +428,69 @@ AnimationClip:
     classID: 4
     script: {fileID: 0}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: baoshi3/SM_niuyan (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: -14.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: baoshi3/SM_niuyan (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 1
+        value: -1.6
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: baoshi3/SM_niuyan (1)
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

Assets/Scenes/ExameScene/16PianGuangJingZhuiGuangJing.unity

@@ -472,7 +472,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f6930c8a1e45ff848808a0ab0efb413b, type: 2}
+  - {fileID: 2100000, guid: 87eb2f0861974bb488424bda1e418308, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -501,7 +501,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 199150080}
-  m_Mesh: {fileID: -6212925342036764337, guid: 9bc203037e3eb3240b2ac3670ed5f916, type: 3}
+  m_Mesh: {fileID: 2157396624544953193, guid: 9bc203037e3eb3240b2ac3670ed5f916, type: 3}
 --- !u!1 &218323544
 GameObject:
   m_ObjectHideFlags: 0
@@ -995,7 +995,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -226.03345, y: 187.85529}
+  m_AnchoredPosition: {x: -226.03345, y: 269.8553}
   m_SizeDelta: {x: 415.8129, y: 391.9292}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &543293330
@@ -1071,7 +1071,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -645.00006, y: 189.59381}
+  m_AnchoredPosition: {x: -217, y: 760}
   m_SizeDelta: {x: 415.8129, y: 391.9292}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &593903310
@@ -1431,6 +1431,7 @@ GameObject:
   - component: {fileID: 699002897}
   - component: {fileID: 699002896}
   - component: {fileID: 699002895}
+  - component: {fileID: 699002898}
   m_Layer: 0
   m_Name: 3DCanvas
   m_TagString: Untagged
@@ -1521,6 +1522,18 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!225 &699002898
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 699002893}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 0
+  m_BlocksRaycasts: 0
+  m_IgnoreParentGroups: 1
 --- !u!1 &789948729
 GameObject:
   m_ObjectHideFlags: 0
@@ -1556,7 +1569,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -645, y: 587}
+  m_AnchoredPosition: {x: -223, y: 587}
   m_SizeDelta: {x: 415.8129, y: 391.9292}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &789948731
@@ -2210,7 +2223,7 @@ PrefabInstance:
       addedObject: {fileID: 1139875096}
     - targetCorrespondingSourceObject: {fileID: 8451320943725212689, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
       insertIndex: -1
-      addedObject: {fileID: 1139875099}
+      addedObject: {fileID: 1139875105}
     - targetCorrespondingSourceObject: {fileID: -4624443313370957404, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1139875098}
@@ -2309,8 +2322,8 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.057793446, y: 0.056915425, z: 0.0072321664}
   m_Center: {x: -0.0000000055879346, y: -9.3131597e-10, z: -0.000000028638176}
---- !u!64 &1139875099
+--- !u!65 &1139875105
-MeshCollider:
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -2327,10 +2340,9 @@ MeshCollider:
   m_IsTrigger: 0
   m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 5
+  serializedVersion: 3
-  m_Convex: 1
+  m_Size: {x: 0.09088785, y: 0.068324104, z: 0.031488948}
-  m_CookingOptions: 30
+  m_Center: {x: 0.000000007450581, y: -9.313114e-10, z: 0.000000047730293}
-  m_Mesh: {fileID: -270935532989386305, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
 --- !u!1 &1163019684
 GameObject:
   m_ObjectHideFlags: 0
@@ -3276,7 +3288,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 87eb2f0861974bb488424bda1e418308, type: 2}
+  - {fileID: 2100000, guid: f6930c8a1e45ff848808a0ab0efb413b, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -3305,7 +3317,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1645741305}
-  m_Mesh: {fileID: 2157396624544953193, guid: 9bc203037e3eb3240b2ac3670ed5f916, type: 3}
+  m_Mesh: {fileID: -6212925342036764337, guid: 9bc203037e3eb3240b2ac3670ed5f916, type: 3}
 --- !u!1 &1667413622
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/ExameScene/18XianWeiJingDeShiYongLiangYuZhaoMingFa.unity

@@ -2172,19 +2172,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.68037134
+      value: 0.9237995
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0.28181913
+      value: 0.38265064
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.25889125
+      value: 0.005030869
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0.62501854
+      value: -0.012145854
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2192,7 +2192,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2163200439550883907, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
-      value: -85.144
+      value: -1.507
       objectReference: {fileID: 0}
     - target: {fileID: 2264786704637003082, guid: b2eda5b7349633a4fb6d7dde28e9ba8b, type: 3}
       propertyPath: m_StaticEditorFlags

Assets/Scenes/ExameScene/19XianWeiJingDeShiYongDingGuangYuanZhaoMingFa.unity

@@ -552,7 +552,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000040455166, y: -0.90828353, z: -0.4183553, w: 0.00000009731112}
   m_LocalPosition: {x: 1.948, y: -2.35, z: -1.758}
-  m_LocalScale: {x: 0.09545611, y: 0.09545611, z: 0.09545611}
+  m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1229104326}
@@ -576,8 +576,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 6.2955675, y: 4.7707753, z: 2.1748772}
+  m_Size: {x: 2.2921915, y: 1.1370714, z: 5.5932555}
-  m_Center: {x: 1.7900553, y: -0.00061774265, z: -1.0874939}
+  m_Center: {x: 0.000033915043, y: 0.000014156107, z: 0.000021815296}
 --- !u!23 &219302733
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -598,7 +598,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 905ff5f1d2aae384980ca186f1efde91, type: 2}
+  - {fileID: 2100000, guid: b8f01ddf83b0d00469d9c39ffd014b69, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -627,7 +627,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 219302730}
-  m_Mesh: {fileID: 6774637775579592750, guid: 7180576e706b6b443ab13625ed252f14, type: 3}
+  m_Mesh: {fileID: -5983563541478323421, guid: 9bc203037e3eb3240b2ac3670ed5f916, type: 3}
 --- !u!65 &289080355
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Scenes/ExameScene/20ZheSheYiHuMian.unity

@@ -1066,6 +1066,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 721412779}
   m_CullTransparentMesh: 1
+--- !u!1 &830571286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 830571287}
+  - component: {fileID: 830571289}
+  - component: {fileID: 830571288}
+  m_Layer: 5
+  m_Name: "\u767D\u6761 (1)"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &830571287
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830571286}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1054607700}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -0.21}
+  m_SizeDelta: {x: 5.175, y: 0.995}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &830571288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830571286}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c922ce0ceaa4f4384bda0fc997fdff5a, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &830571289
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 830571286}
+  m_CullTransparentMesh: 1
 --- !u!1 &865550013
 GameObject:
   m_ObjectHideFlags: 0
@@ -1564,7 +1639,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0.100273445}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 830571287}
   m_Father: {fileID: 536734780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3492,6 +3568,81 @@ Transform:
   - {fileID: 122079762}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2090890650
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2090890651}
+  - component: {fileID: 2090890653}
+  - component: {fileID: 2090890652}
+  m_Layer: 5
+  m_Name: "\u9ED1\u6761 (1)"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2090890651
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2090890650}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.00004497}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2094587272}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0.44606}
+  m_SizeDelta: {x: 5.175, y: 0.88967}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2090890652
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2090890650}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: c922ce0ceaa4f4384bda0fc997fdff5a, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 1
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &2090890653
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2090890650}
+  m_CullTransparentMesh: 1
 --- !u!1 &2093706083
 GameObject:
   m_ObjectHideFlags: 0
@@ -3552,7 +3703,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2090890651}
   m_Father: {fileID: 536734780}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3674,7 +3826,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 905ff5f1d2aae384980ca186f1efde91, type: 2}
+  - {fileID: 2100000, guid: 8e939a013538813468234b46e3235927, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -3703,7 +3855,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2105820832}
-  m_Mesh: {fileID: -2805638167851708950, guid: c6083c5657728de45b21bb4d9f1ef459, type: 3}
+  m_Mesh: {fileID: 3412113210204034890, guid: 6fbf10c7237809d42a0d371196de8ce0, type: 3}
 --- !u!1 &2121422266
 GameObject:
   m_ObjectHideFlags: 0

Data/Xml/13BaoShiFenLei.xml

@@ -3,7 +3,7 @@
 <Module>
 
 	<Icon>13.png</Icon>
-	<Scene>ZheSheYiScene</Scene>
+	<Scene>13BaoShiFenLei</Scene>
 	<Type>All</Type>
 	<Name>宝石分类</Name>
 	<OnlyCurScore>true</OnlyCurScore>

Data/Xml/14YuShiFenLei.xml

@@ -3,7 +3,7 @@
 <Module>
 
   <Icon>14.png</Icon>
-  <Scene>ZheSheYiScene</Scene>
+  <Scene>14YuShiFenLei</Scene>
   <Type>All</Type>
   <Name>玉石分类</Name>
   <OnlyCurScore>true</OnlyCurScore>

Data/Xml/15ChaErSiLvSeJing.xml

@@ -314,7 +314,7 @@
     <Step name="6.实验完成">
       <Start>
         <Action type="Sequence">
-          <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务，点击确定按钮，返回模块导航页。" btns="确定" audio="15/sound_7.mp3"></Action>
+          <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务，点击确定按钮，返回模块导航页。" btns="确定,取消" audio="15/sound_7.mp3"></Action>
           <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
           <Action type="Var" name="完成" value="1"></Action>
@@ -345,7 +345,7 @@
               <Action type="Rotate" value="FlyCamera" to="33.3920975,359.285889,-1.59777631e-08" time="0"></Action>
 
             </Action>
-            <Action type="Hint" value="请获取棉签，蘸取酒精，清洗宝石。" time="-1" audio="" icon="true" ></Action>
+            <Action type="Hint" value="请获取棉签，蘸取酒精，清洗宝石。" time="-1"  audio="15/sound_2.mp3" icon="true" ></Action>
             <Action type="HighLightFlash" value="ChangJing (1)/SM_MianQian" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
             <Condition type="ObjClick" value="ChangJing (1)/SM_MianQian"></Condition>
             <Action type="HighLightFlash" value="ChangJing (1)/SM_MianQian" isHigh="false"></Action>
@@ -373,7 +373,7 @@
         <Start>
           <Action type="Sequence">
 
-            <Action type="Hint" value="请获取镊子，夹取宝石放置在白色板上。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请获取镊子，夹取宝石放置在白色板上。" time="-1"   audio="15/sound_3.mp3"   icon="true" ></Action>
 
 
             <Action type="Parallel">
@@ -407,7 +407,7 @@
       <Step name="3.光源照射宝石">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请打开光纤灯开关，打开光纤灯照射在宝石上。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请打开光纤灯开关，打开光纤灯照射在宝石上。" time="-1"   audio="15/sound_4.mp3" icon="true" ></Action>
 
             <Action type="Parallel">
 
@@ -450,7 +450,7 @@
       <Step name="4.用滤光镜观察宝石">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请使用滤光镜观察宝石的变化。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请使用滤光镜观察宝石的变化。" time="-1"  audio="15/sound_5.mp3"  icon="true" ></Action>
 
             <Action type="Parallel">
 
@@ -491,7 +491,7 @@
       <Step name="5.输入观察结果">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1" audio="15/sound_6.mp3"  icon="true" ></Action>
             <Action type="Parallel">
 
               <Action type="Move" value="FlyCamera" to="-0.1280813,1.261573,2.363149" time="0"></Action>
@@ -533,7 +533,7 @@
       <Step name="6.实验完成">
         <Start>
           <Action type="Sequence">
-            <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务,可以选择重新检测其他宝石" btns="确定" audio=""></Action>
+            <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务,可以选择重新检测其他宝石" btns="确定,取消" audio="15/sound_7.mp3" ></Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
             <Action type="Var" name="完成" value="1"></Action>
@@ -563,7 +563,7 @@
               <Action type="Rotate" value="FlyCamera" to="33.3920975,359.285889,-1.59777631e-08" time="0"></Action>
 
             </Action>
-            <Action type="Hint" value="请获取棉签，蘸取酒精，清洗宝石。" time="-1" audio="" icon="true" ></Action>
+            <Action type="Hint" value="请获取棉签，蘸取酒精，清洗宝石。" time="-1" audio="15/sound_2.mp3"  icon="true" ></Action>
             <Action type="HighLightFlash" value="ChangJing (1)/SM_MianQian" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
             <Condition type="ObjClick" value="ChangJing (1)/SM_MianQian"></Condition>
             <Action type="HighLightFlash" value="ChangJing (1)/SM_MianQian" isHigh="false"></Action>
@@ -591,7 +591,7 @@
         <Start>
           <Action type="Sequence">
 
-            <Action type="Hint" value="请获取镊子，夹取宝石放置在白色板上。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请获取镊子，夹取宝石放置在白色板上。" time="-1" audio="15/sound_3.mp3" icon="true" ></Action>
 
 
             <Action type="Parallel">
@@ -625,7 +625,7 @@
       <Step name="3.光源照射宝石">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请打开光纤灯开关，打开光纤灯照射在宝石上。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请打开光纤灯开关，打开光纤灯照射在宝石上。" time="-1"  audio="15/sound_4.mp3"  icon="true" ></Action>
 
             <Action type="Parallel">
 
@@ -668,7 +668,7 @@
       <Step name="4.用滤光镜观察宝石">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请使用滤光镜观察宝石的变化。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请使用滤光镜观察宝石的变化。" time="-1"  audio="15/sound_5.mp3" icon="true" ></Action>
 
             <Action type="Parallel">
 
@@ -709,7 +709,7 @@
       <Step name="5.输入观察结果">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="" icon="true" ></Action>
+            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="15/sound_6.mp3"  icon="true" ></Action>
             <Action type="Parallel">
 
               <Action type="Move" value="FlyCamera" to="-0.1280813,1.261573,2.363149" time="0"></Action>
@@ -751,7 +751,7 @@
       <Step name="6.实验完成">
         <Start>
           <Action type="Sequence">
-            <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务,可以选择重新检测其他宝石" btns="确定" audio=""></Action>
+            <Action type="TipWindow" value="恭喜您完成滤光镜鉴定宝石任务,可以选择重新检测其他宝石" btns="确定,取消" audio="15/sound_7.mp3"></Action>
             <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
             <Action type="Var" name="完成" value="1"></Action>

Data/Xml/16PianGuangJingZhuiGuangJing.xml

@@ -113,7 +113,7 @@
       <Step name="2.放置宝石">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请将已经经过清理的均质体宝石，放置在玻璃载物台上。" time="-1"  audio="16/sound_3.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请将已经经过清理的均质体宝石，放置在玻璃载物台上。" time="-1"  audio="16/sound_3.wav" icon="true" ></Action>
 
 
             <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi1Group/baoshi1" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
@@ -121,22 +121,11 @@
             <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi1Group/baoshi1" isHigh="false"></Action>
 
 
-            <!--<Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+       
-            <Condition type="ObjClick" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2"></Condition>
-            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2" isHigh="false"></Action>
-
-            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
-            <Condition type="ObjClick" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3"></Condition>
-            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3" isHigh="false"></Action>-->
-
 
             <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi1" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
 
-            <!--<Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi2" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
+       
-
-            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi3" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>-->
-
-
 
             <Action type="NextOperation"></Action>
           </Action>
@@ -152,9 +141,9 @@
 
 
             <Action type="Show" value="CustomParent/2" isShow="true"></Action>
-            <Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas" isShow="true"></Action>
-            <Action type="Show" value="CustomParent/Canvas/背景" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景" isShow="true"></Action>
-            <Action type="Show" value="CustomParent/Canvas/背景/宝石1" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石1" isShow="true"></Action>
 
             <Action type="HighLightFlash" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
             <Condition type="ObjClick" value="SM_PianGuangJing 1/SM_ShangPianGuangPian"></Condition>
@@ -192,9 +181,7 @@
 
 
             <Action type="Show" value="CustomParent/2DCanvas/黑十字干涉图"  isShow="true" isDevice="false"></Action>
-            <Action type="Show" value="CustomParent/2DCanvas/牛眼干涉图"  isShow="true" isDevice="false"></Action>
+         
-            <Action type="Show" value="CustomParent/2DCanvas/单臂干涉图"  isShow="true" isDevice="false"></Action>
-            <Action type="Show" value="CustomParent/2DCanvas/双臂干涉图"  isShow="true" isDevice="false"></Action>
             <Action type="Delay" value="1"></Action>
 
 
@@ -207,11 +194,237 @@
       <Step name="5.输入观察结果">
         <Start>
           <Action type="Sequence">
-            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="16/sound_6.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="16/sound_6.wav" icon="true" ></Action>
           
             <Action type="Input" title="请输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
               <Input name="黑十字干涉图:"  answer="一轴晶"></Input>
+             
+              <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
+            </Action>
+            <Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+      </Step>
+
+
+      <Step name="6.放置宝石">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请将已经经过清理的均质体宝石，放置在玻璃载物台上。" time="-1"  audio="16/sound_3.wav" icon="true" ></Action>
+
+
+            <Action type="Rotate" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" to="270,-1.866933E-05,0" time="0"></Action>
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi1" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+            <Action type="Anim" value="CustomParent/2" animName="PianGuangJing_2" frame="1"></Action>
+            <Action type="Anim" value="SM_PianGuangJing 1/SM_ZaiWuTai_Jing" animName="PianGuangJing_ZaiWuTaiJing" frame="1"></Action>
+            <Action type="TimeLine" value="TimeLineManager/ZhuiGuangJingYiDong" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石1"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石2"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石3"  isShow="false" isDevice="false"></Action>
+     
+            
+            <Action type="Show" value="CustomParent/2DCanvas/黑十字干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/牛眼干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/单臂干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/双臂干涉图"  isShow="false" isDevice="false"></Action>
+
+
+
+            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3"></Condition>
+            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi3Group/baoshi3" isHigh="false"></Action>
+
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi3" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+
+
+      </Step>
+      <Step name="7.寻找宝石的干涉色">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请通过旋转载物台，观察宝石干涉色。" time="-1"  audio="16/sound_4.mp3" icon="true" ></Action>
+
+
+            <Action type="Show" value="CustomParent/2" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石2" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="true"></Action>
+
+            <Action type="HighLightFlash" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="SM_PianGuangJing 1/SM_ShangPianGuangPian"></Condition>
+            <Action type="HighLightFlash" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" isHigh="false"></Action>
+
+
+            <Action type="Rotate" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" to="270,0,0" time="1.5"></Action>
+            <Action type="Anim" value="CustomParent/2" animName="PianGuangJing_2" speed="1"></Action>
+
+            <Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="false"></Action>
+
+
+            <Action type="Anim" value="SM_PianGuangJing 1/SM_ZaiWuTai_Jing" animName="PianGuangJing_ZaiWuTaiJing" speed="1"></Action>
+            <Action type="Show" value="CustomParent/2" isShow="true"></Action>
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+
+      </Step>
+      <Step name="8.用锥光镜观察宝石干涉图">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请使用锥光镜观察宝石的干涉图。" time="-1"  audio="16/sound_5.mp3" icon="true" ></Action>
+
+            <Action type="HighLightFlash" value="ChangJing/ZhuiGuangJing" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="ChangJing/ZhuiGuangJing"></Condition>
+            <Action type="HighLightFlash" value="ChangJing/ZhuiGuangJing" isHigh="false"></Action>
+
+
+            <Action type="TimeLine" value="TimeLineManager/ZhuiGuangJingYiDong" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="120"></Action>
+
+            <Action type="Show" value="CustomParent/2DCanvas"  isShow="true" isDevice="false"></Action>
+
+
+
+            <Action type="Show" value="CustomParent/2DCanvas/牛眼干涉图"  isShow="true" isDevice="false"></Action>
+           <Action type="Delay" value="1"></Action>
+
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+      </Step>
+      <Step name="9.输入观察结果">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="16/sound_6.wav" icon="true" ></Action>
+
+            <Action type="Input" title="请输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
+       
               <Input name="牛眼干涉图:"  answer="一轴晶"></Input>
+          
+              <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
+            </Action>
+            <Condition type="StrEvent" value="UI关闭事件通知用StrEvent接收"></Condition>
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+      </Step>
+
+      <Step name="10.放置宝石">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请将已经经过清理的均质体宝石，放置在玻璃载物台上。" time="-1"  audio="16/sound_3.wav" icon="true" ></Action>
+
+
+
+            <Action type="Rotate" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" to="270,-1.866933E-05,0" time="0"></Action>
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi1" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi2" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi3" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+
+            <Action type="Anim" value="CustomParent/2" animName="PianGuangJing_2" frame="1"></Action>
+            <Action type="Anim" value="SM_PianGuangJing 1/SM_ZaiWuTai_Jing" animName="PianGuangJing_ZaiWuTaiJing" frame="1"></Action>
+            <Action type="TimeLine" value="TimeLineManager/ZhuiGuangJingYiDong" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="1"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/黑十字干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/牛眼干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/单臂干涉图"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/双臂干涉图"  isShow="false" isDevice="false"></Action>
+            
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石1"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石2"  isShow="false" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石3"  isShow="false" isDevice="false"></Action>
+            
+            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2"></Condition>
+            <Action type="HighLightFlash" value="ChangJing/SM_BaoShi/BaoShi2Group/baoshi2" isHigh="false"></Action>
+            <Action type="TimeLine" value="TimeLineManager/FangZhiBaoShi2" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>-->
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+
+
+      </Step>
+      <Step name="11.寻找宝石的干涉色">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请通过旋转载物台，观察宝石干涉色。" time="-1"  audio="16/sound_4.mp3" icon="true" ></Action>
+
+
+            <Action type="Show" value="CustomParent/2" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景" isShow="true"></Action>
+            <Action type="Show" value="CustomParent/3DCanvas/背景/宝石3" isShow="true"></Action>
+
+            <Action type="HighLightFlash" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="SM_PianGuangJing 1/SM_ShangPianGuangPian"></Condition>
+            <Action type="HighLightFlash" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" isHigh="false"></Action>
+
+
+            <Action type="Rotate" value="SM_PianGuangJing 1/SM_ShangPianGuangPian" to="270,0,0" time="1.5"></Action>
+            <Action type="Anim" value="CustomParent/2" animName="PianGuangJing_2" speed="1"></Action>
+
+            <Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="false"></Action>
+
+
+            <Action type="Anim" value="SM_PianGuangJing 1/SM_ZaiWuTai_Jing" animName="PianGuangJing_ZaiWuTaiJing" speed="1"></Action>
+            <Action type="Show" value="CustomParent/2" isShow="true"></Action>
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+
+      </Step>
+      <Step name="12.用锥光镜观察宝石干涉图">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请使用锥光镜观察宝石的干涉图。" time="-1"  audio="16/sound_5.mp3" icon="true" ></Action>
+
+            <Action type="HighLightFlash" value="ChangJing/ZhuiGuangJing" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
+            <Condition type="ObjClick" value="ChangJing/ZhuiGuangJing"></Condition>
+            <Action type="HighLightFlash" value="ChangJing/ZhuiGuangJing" isHigh="false"></Action>
+
+
+            <Action type="TimeLine" value="TimeLineManager/ZhuiGuangJingYiDong" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="120"></Action>
+
+            <Action type="Show" value="CustomParent/2DCanvas"  isShow="true" isDevice="false"></Action>
+
+
+          
+            <Action type="Show" value="CustomParent/2DCanvas/单臂干涉图"  isShow="true" isDevice="false"></Action>
+            <Action type="Show" value="CustomParent/2DCanvas/双臂干涉图"  isShow="true" isDevice="false"></Action>
+            <Action type="Delay" value="1"></Action>
+
+
+
+            <Action type="NextOperation"></Action>
+          </Action>
+        </Start>
+
+      </Step>
+      <Step name="13.输入观察结果">
+        <Start>
+          <Action type="Sequence">
+            <Action type="Hint" value="请根据观察现象，输入观察结果。" time="-1"  audio="16/sound_6.wav" icon="true" ></Action>
+
+            <Action type="Input" title="请输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
               <Input name="单臂干涉图:"  answer="二轴晶"></Input>
               <Input name="双臂干涉图:"  answer="二轴晶"></Input>
               <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
@@ -226,12 +439,7 @@
       </Step>
 
 
-
+      <Step name="14.实验完成">
-
-
-
-
-      <Step name="6.实验完成">
         <Start>
           <Action type="Sequence">
             <Action type="TipWindow" value="恭喜您完成锥光镜鉴定宝石任务，点击确定按钮，返回模块导航页。"  btns="确定"  audio="16/sound_7.mp3"></Action>

Data/Xml/17XianWeiJingDeShiYongAnYuZhaoMingFa.xml

@@ -166,8 +166,8 @@
       
 
           <Action type="Input" title="观察宝石内部特征，输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
-            <Input name="暗域照明法是观察宝石（）:"  answer="内部特征"></Input>
+            <Input name="暗域照明法是观察宝石:"  answer="内部特征"></Input>
-            <Input name="在暗色的背景下，显得十分清晰，是常用的一种照明方法。而且有利于（）的观察:"  answer="长时间"></Input>
+            <Input name="在暗色的背景下，显得十分清晰，是常用的一种照明方法。而且有利于:"  answer="长时间|长时间观察"></Input>
             <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
        
           </Action>

Data/Xml/18XianWeiJingDeShiYongLiangYuZhaoMingFa.xml

@@ -108,9 +108,9 @@
           <Condition type="ObjClick" value="ChangJing/SM_XianWeiJing/SM_ZheGuangJing/DangGuangBan" isRight="true"></Condition>
           <Action type="HighLightFlash" value="ChangJing/SM_XianWeiJing/SM_ZheGuangJing/DangGuangBan" isHigh="false"></Action>
 
-          <Action type="Rotate" value="ChangJing/SM_XianWeiJing/SM_DiGuang" to="315,180,274.8561" time="0"></Action>
+          <Action type="Rotate" value="ChangJing/SM_XianWeiJing/SM_DiGuang" to="315,180,0.3001276" time="0"></Action>
           <Action type="Parallel">
-            <Action type="Rotate" value="ChangJing/SM_XianWeiJing/SM_ZheGuangJing/DangGuangBan" to="315,180,0.3001276" time="1.0"></Action>
+            <Action type="Rotate" value="ChangJing/SM_XianWeiJing/SM_ZheGuangJing/DangGuangBan" to="315,180.0001,274.8561" time="1.0"></Action>
             <!--<Action type="Anim" value="CustomParent/BottomLight" animName="XianWeiJing_BottomLight" speed="1"></Action>-->
           </Action>
 
@@ -165,9 +165,9 @@
 
 
 
-          <Action type="Input" title="亮域照明法适合观察宝石（）（）特征，输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
+          <Action type="Input" title="亮域照明法适合观察宝石 特征，输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
-            <Input name="特征:"  answer="色带"></Input>
+            <Input name=""  answer="色带"></Input>
-            <Input name="特征:"  answer="生长纹"></Input>
+            <Input name=""  answer="生长纹"></Input>
             <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
 
           </Action>

Data/Xml/19XianWeiJingDeShiYongDingGuangYuanZhaoMingFa.xml

@@ -123,8 +123,8 @@
           <Action type="Hint" value="请观察宝石的表面及近表面的特征。" time="-1"  audio="19/DBZM_4.mp3" icon="true" ></Action>
 
           <Action type="Parallel">
-            <Action type="Move" value="FlyCamera" to="0.309,1.582,2.1508" time="1.0"></Action>
+            <Action type="Move" value="FlyCamera" to="0.2997,1.2687,2.2927" time="1.0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="24.803,359.162,1.469582E-08" time="1.0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="49.52937,353.0206,3.288509E-07" time="1.0"></Action>
           </Action>
 
 
@@ -141,8 +141,8 @@
 
 
           <Action type="Input" title="请观察宝石的表面及近表面的特征，输入观察结果" finishedEvent="UI关闭事件通知用StrEvent接收">
-            <Input name="顶部照明法，适用于观察宝石的特征1:"  answer="表面"></Input>
+            <Input name="顶部照明法，适用于观察宝石的:"  answer="表面"></Input>
-            <Input name="特征2:"  answer="近表面"></Input>
+            <Input name=""  answer="近表面"></Input>
             <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="1"  ></Btn>
 
           </Action>