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/Projects/AnHui/ShuiReFa/UI/XianWeiJingImage.jpg.meta

@@ -1,179 +0,0 @@
-fileFormatVersion: 2
-guid: a65e416de1ecfb6449e6b63c68170580
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 2
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 8192
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity

@@ -915,81 +915,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 149359335}
   m_CullTransparentMesh: 1
---- !u!1 &173883234
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 173883235}
-  - component: {fileID: 173883237}
-  - component: {fileID: 173883236}
-  m_Layer: 5
-  m_Name: FangDaImage
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &173883235
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 173883234}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.1857, y: 1.1857, z: 1.1857}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 816782630}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &173883236
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 173883234}
-  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: a65e416de1ecfb6449e6b63c68170580, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &173883237
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 173883234}
-  m_CullTransparentMesh: 1
 --- !u!1 &216173757
 GameObject:
   m_ObjectHideFlags: 0
@@ -4773,7 +4698,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 443185733}
-  - {fileID: 173883235}
   m_Father: {fileID: 523916024}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}

Assets/Scenes/ExameScene/ZhuBaoJianDingGuangXueYiQi.unity

@@ -3323,7 +3323,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8, g: 0.8, b: 0.8, a: 1}
+  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

Assets/Scripts/UI/UIInput_AnHuiBaoShi.cs

@@ -97,9 +97,6 @@ namespace QFramework.Example
             tMP_InputField2.onEndEdit.AddListener(CheacktMP_InputField2String);
             tMP_InputField3.onEndEdit.AddListener(CheacktMP_InputField3String);
 
-            tMP_InputField1.gameObject.SetActive(true);
-            tMP_InputField2.gameObject.SetActive(true);
-            tMP_InputField3.gameObject.SetActive(true);
         }
         public void CheackAllInputField()
         {

Data/Xml/16PianGuangJingZhuiGuangJing.xml

@@ -218,10 +218,10 @@
 
 
             <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="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="0"></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>
@@ -333,9 +333,9 @@
 
 
             <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="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="0"></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="0"></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>

Data/Xml/18XianWeiJingDeShiYongLiangYuZhaoMingFa.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/PianGuangJing.xml

@@ -160,7 +160,7 @@
           <Action type="Show" value="2DCanvas" isShow="true"></Action>
           <Action type="Show" value="2DCanvas/Bg" isShow="true"></Action>
           <Action type="Show" value="2DCanvas/Bg/YiChangXiaoGuang" isShow="true"></Action>
-          <Action type="Show" value="2DCanvas/Bg/QuanAn" isShow="false"></Action>
+          <Action type="Show" value="2DCanvas/Bg/QuanAn" isShow="true"></Action>
           <Action type="Show" value="2DCanvas/Bg/QuanLiang" isShow="false"></Action>
           <Action type="Show" value="2DCanvas/Bg/SiMingSIAn" isShow="false"></Action>
          
@@ -319,11 +319,10 @@
 					</Action>
 
 					<Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="false"></Action>
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/diaozhui" isShow="false"></Action>
 
 
 
-          <Action type="Show" value="ChangJing/SM_BaoShi/SM_DiaoZhui/diaozhui" isShow="true"></Action>
-
 
           <Action type="Show" value="2DCanvas" isShow="true"></Action>
           <Action type="Show" value="2DCanvas/Bg" isShow="true"></Action>

Data/Xml/ShuiReFaHeCheng.xml

@@ -121,9 +121,6 @@
           <Action type="Show" value="Main/SM_GanSHeQiu"  isShow="false" ></Action>
           <Action type="Show" value="CustomParent/Canvas"  isShow="false" ></Action>
 
-          <Action type="Show" value="CustomParent/Canvas/YuanKuang/Mask/FangDaImage" isShow="false" ></Action>
-
-
 
 
           <!--台面视角-->
@@ -599,7 +596,7 @@
             <Action type="Anim" value="Main/SM_XianWeiJing/SM_DiZuo/SM_JiaZi" animName="XianWeiJing_SM_JiaZi2" speed="1"></Action>
           </Action>
 
-          <Action type="Show" value="CustomParent/Canvas/YuanKuang/Mask/FangDaImage" isShow="true" ></Action>
+
 
           <!--步骤7-->
 
@@ -613,10 +610,6 @@
           <Condition type="ObjClick" value="Main/SM_XianWeiJing/SM_DiZuo/SM_JiaZi/SM_Qiu/SM_JiaBang/SM_HaiLanBaoShi (1)" ></Condition>
           <Action type="HighLightFlash" value="Main/SM_XianWeiJing/SM_DiZuo/SM_JiaZi/SM_Qiu/SM_JiaBang/SM_HaiLanBaoShi (1)" isHigh="false" color="255,0,0,255"></Action>
 
-          
-          <Action type="Show" value="CustomParent/Canvas" isShow="false" ></Action>
-
-
           <Action type="TimeLine" value="TimeLines/XianWeiJingNaChuBaoShi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="180"></Action>
 
 

Data/Xml/XianWeiJing.xml

@@ -36,8 +36,6 @@
 		<Step name="1.打开显微镜电源，调焦">
 			<Start>
 				<Action type="Sequence">
-          <Action type="Show" value="CustomParent/Canvas" isShow="false"></Action>
-          
           <Action type="Move" value="FlyCamera" to="0.589941,1.875946,3.171882" time="0"></Action>
           <Action type="Rotate" value="FlyCamera" to="38.01199,179.3696,-1.693174E-08" time="0"></Action>
 
@@ -125,7 +123,7 @@
 					<Action type="HighLightFlash" value="ChangJing/SM_XianWeiJing/SM_DiZuo/SM_JiaZi/SM_Qiu/SM_JiaBang/SM_HaiLanBaoShi (1)" isHigh="false"></Action>
 
 					<Action type="Anim" value="ChangJing/SM_XianWeiJing/SM_DiZuo/SM_JiaZi" animName="XianWeiJing_SM_JiaZi" speed="1"></Action>
-          <Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
+
 					<Action type="NextOperation"></Action>
 				</Action>
 			</Start>

Data/Xml/YuDiaoDeZhiZuo.xml

@@ -59,14 +59,14 @@
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/ZuanKongTuoJu</Path>
     <Tip>钻孔砣具</Tip>
-    <Icon>工具/钻孔砣具.png</Icon>
+    <Icon>工具/钻孔坨具.png</Icon>
   </Device>
   <Device>
     <Name>修角砣具</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/XiuJiaoTuoJu</Path>
     <Tip>修角砣具</Tip>
-    <Icon>工具/修角砣具.png</Icon>
+    <Icon>工具/修角坨具.png</Icon>
   </Device>
   <Device>
     <Name>纹饰砣具</Name>
@@ -80,7 +80,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/PingTouTuoJu</Path>
     <Tip>平头砣具</Tip>
-    <Icon>工具/平头砣具.png</Icon>
+    <Icon>工具/平头坨具.png</Icon>
   </Device>
   <Device>
     <Name>布轮</Name>
@@ -94,7 +94,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/QieGeTuoJu</Path>
     <Tip>切割砣具</Tip>
-    <Icon>工具/切割砣具.png</Icon>
+    <Icon>工具/切割坨具.png</Icon>
   </Device>
 
 
@@ -204,7 +204,7 @@
       <Start>
         <Action type="Sequence">
 
-          <Action type="Hint" value="请选择合适的砣具进行安装，之后开启玉雕横机电源，调整转速，对玉石原料进行切割" time="-1"  audio="sound_130.mp3" icon="true" ></Action>
+          <Action type="Hint" value="请选择合适的坨具进行安装，之后开启玉雕横机电源，调整转速，对玉石原料进行切割" time="-1"  audio="sound_130.mp3" icon="true" ></Action>
 
           <Action type="Move" value="FlyCamera" to="1.28497,0.9686968,-2.982236" time="0"></Action>
           <Action type="Rotate" value="FlyCamera" to="21.613,176.482,0" time="0"></Action>
@@ -212,7 +212,7 @@
           <!--模块初始化-->
           <Action type="Show" value="Main/YuShi_DingZhongXian" isShow="false"></Action>
 
-          <!--机器，无安装任何砣具状态-->
+          <!--机器，无安装任何坨具状态-->
 
           <Action type="Show" value="Main/YuShiYuanLiao" isShow="true"></Action>
           <Action type="Show" value="Env/SM_YuDiaoJi/QieGeTuoJu" isShow="false"></Action>
@@ -346,7 +346,7 @@
       <Start>
         <Action type="Sequence">
 
-          <Action type="Hint" value="请选择合适的砣具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行钻孔" time="-1" audio="sound_132.mp3" icon="true" ></Action>
+          <Action type="Hint" value="请选择合适的坨具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行钻孔" time="-1" audio="sound_132.mp3" icon="true" ></Action>
 
           <Action type="Show" value="Env/SM_YuDiaoJi/ZuanKongTuoJu" isShow="false"></Action>
           <Action type="Show" value="Env/SM_YuDiaoJi/ZuanKongTuoJu/ZaoHuZhenTou" isShow="false"></Action>
@@ -387,7 +387,7 @@
           <Action type="UIShow" value="UITools" isShow="false"></Action>
 
 
-          <!--安装，钻孔砣具-->
+          <!--安装，钻孔坨具-->
           <Action type="TimeLine" value="TimeLines/AnZhuangZuanKongTuoJu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="80"></Action>
 
 
@@ -510,7 +510,7 @@
 
           <Action type="Sequence">
 
-            <Action type="Hint" value="请选择合适的砣具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行修角加工" time="-1" audio="sound_133.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请选择合适的坨具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行修角加工" time="-1" audio="sound_133.mp3" icon="true" ></Action>
 
             <Action type="Move" value="FlyCamera" to="1.4381,0.9682747,-2.87194" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="16.885,179.673,0" time="0"></Action>
@@ -557,7 +557,7 @@
             <Action type="Move" value="FlyCamera" to="1.4381,0.9682747,-2.87194" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="16.885,179.673,0" time="0"></Action>
 
-            <!--修角砣具，进行修角-->
+            <!--修角坨具，进行修角-->
             <Action type="TimeLine" value="TimeLines/XiuJiao_YuShi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="550"></Action>
 
 
@@ -572,7 +572,7 @@
           <!--纹饰针头-->
           <Action type="Sequence">
 
-            <Action type="Hint" value="请选择合适的砣具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行纹饰雕琢" time="-1" audio="sound_134.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请选择合适的坨具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行纹饰雕琢" time="-1" audio="sound_134.mp3" icon="true" ></Action>
 
             <Action type="Move" value="FlyCamera" to="1.4381,0.9682747,-2.87194" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="16.885,179.673,0" time="0"></Action>
@@ -646,14 +646,14 @@
 
 
 
-    <!--平头砣具-->
+    <!--平头坨具-->
     <Step name="6.细雕">
       <Start>
         <Action type="Sequence">
 
           <Action type="Sequence">
 
-            <Action type="Hint" value="请选择合适的砣具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料细节进行雕琢" time="-1"  audio="sound_135.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请选择合适的坨具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料细节进行雕琢" time="-1"  audio="sound_135.mp3" icon="true" ></Action>
 
             <Action type="Move" value="FlyCamera" to="1.4381,0.9682747,-2.87194" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="16.885,179.673,0" time="0"></Action>
@@ -721,7 +721,7 @@
     </Step>
 
 
-    <!--布轮砣具-->
+    <!--布轮坨具-->
     <Step name="7.打磨、抛光">
       <Start>
         <Action type="Sequence">
@@ -729,7 +729,7 @@
 
           <Action type="Sequence">
 
-            <Action type="Hint" value="请选择合适的砣具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行抛光" time="-1" audio="sound_136.mp3" icon="true" ></Action>
+            <Action type="Hint" value="请选择合适的坨具进行更换，之后开启玉雕横机电源，调整转速，对玉石原料进行抛光" time="-1" audio="sound_136.mp3" icon="true" ></Action>
 
             <Action type="Move" value="FlyCamera" to="1.4381,0.9682747,-2.87194" time="0"></Action>
             <Action type="Rotate" value="FlyCamera" to="16.885,179.673,0" time="0"></Action>

Data/Xml/ZheSheYi.xml

@@ -75,7 +75,7 @@
 
   </Score>
 
-  <Operation moduleType="All"  freeStep="true">
+  <Operation moduleType="Study"  freeStep="true">
 
 
     <!--<Step name="折射仪的使用">-->