修改黄金模块分数

Assets/Art/UIPrefab/UIRightTop.prefab

@@ -638,7 +638,7 @@ MonoBehaviour:
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_PressedColor: {r: 0.6528301, g: 0.6528301, b: 0.6528301, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1

Assets/Art/UIPrefab/UITextTip.prefab

@@ -677,7 +677,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.29803923}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.8}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Projects/AnHui/ZheSheYi/TimeLine/CaBaoShiLengJing.playable

@@ -304,6 +304,111 @@ AnimationClip:
   m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!114 &-7379402241934985380
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 8831944972594176507}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7379402241934985380}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
+--- !u!114 &-7206274616313354889
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-5396303937980345622
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -571,6 +676,99 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!114 &-1847298947215648895
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track (1)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 4901392124122027439}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -1847298947215648895}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -588,12 +786,108 @@ MonoBehaviour:
   - {fileID: -8896583756985351548}
   - {fileID: -5396303937980345622}
   - {fileID: 2503104651524110036}
+  - {fileID: -7379402241934985380}
+  - {fileID: -1847298947215648895}
+  - {fileID: 2496255023901283875}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
+--- !u!114 &2496255023901283875
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -7206274616313354889}
+    m_Duration: 5
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2496255023901283875}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &2503104651524110036
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2302,3 +2596,27 @@ AnimationClip:
   m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
   m_Events: []
+--- !u!114 &4901392124122027439
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
+--- !u!114 &8831944972594176507
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 

Assets/Projects/AnHui/ZheSheYi/TimeLine/NaChuBaoShi.playable

@@ -25,7 +25,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 1892651130311942198}
-    m_Duration: 2.466666666666667
+    m_Duration: 2.9833333333333334
     m_TimeScale: 1
     m_ParentTrack: {fileID: -8824353914716363173}
     m_EaseInDuration: 0
@@ -917,7 +917,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -6518890080538139574}
-    m_Duration: 2.466666666666667
+    m_Duration: 2.9833333333333334
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2639319448839527874}
     m_EaseInDuration: 0

Assets/Scenes/ExameScene/HuangJinShouShiJiaGong.unity

@@ -16411,7 +16411,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1973408623769690845, guid: ca8d7b8b3fb0698468901debdbb7d9db, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4664036934422802609, guid: ca8d7b8b3fb0698468901debdbb7d9db, type: 3}
       propertyPath: m_Name

Assets/Scenes/ExameScene/ShuiReFaHeCheng.unity

@@ -1040,6 +1040,133 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &231369159
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 231369160}
+  - component: {fileID: 231369164}
+  - component: {fileID: 231369163}
+  - component: {fileID: 231369162}
+  - component: {fileID: 231369161}
+  m_Layer: 0
+  m_Name: SM_HaiLanBaoShi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &231369160
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231369159}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: -0.0007, y: -0.0045, z: 0.0049}
+  m_LocalScale: {x: 0.0009999997, y: 0.0009999997, z: 0.0009999999}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 410997922}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
+--- !u!95 &231369161
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231369159}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!65 &231369162
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231369159}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 6.2955675, y: 4.7707753, z: 2.1748772}
+  m_Center: {x: 1.7900553, y: -0.00061774265, z: -1.0874939}
+--- !u!23 &231369163
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231369159}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 33cab5c165c77db4b9cbde71b13130e4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &231369164
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 231369159}
+  m_Mesh: {fileID: -3601519367124661431, guid: 7180576e706b6b443ab13625ed252f14, type: 3}
 --- !u!1001 &236931594
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2049,7 +2176,10 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: 609435b9aacd45b42a8a8ab9c210f2b4, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 231369160}
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 6087053369038394149, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
       insertIndex: -1
@@ -2108,6 +2238,11 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.010655683, y: 0.017296273, z: 0.008521337}
   m_Center: {x: 0.000007074795, y: 0.003100199, z: -0.0006238865}
+--- !u!4 &410997922 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+  m_PrefabInstance: {fileID: 410997917}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &423549101
 GameObject:
   m_ObjectHideFlags: 0
@@ -8038,6 +8173,12 @@ PlayableDirector:
     value: {fileID: 1495653728}
   - key: {fileID: 2503104651524110036, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2}
     value: {fileID: 680014621}
+  - key: {fileID: -7379402241934985380, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2}
+    value: {fileID: 236931596}
+  - key: {fileID: -1847298947215648895, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2}
+    value: {fileID: 1495653727}
+  - key: {fileID: 2496255023901283875, guid: 08c8ba9f4df283642be17b13b0b66e8e, type: 2}
+    value: {fileID: 680014620}
   m_ExposedReferences:
     m_References: []
 --- !u!1 &1194893377
@@ -13287,7 +13428,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2103968844
 Transform:
   m_ObjectHideFlags: 0

Assets/Scenes/Main.unity

@@ -283,13 +283,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 547432235}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.059811153, y: 0.9234663, z: -0.16098467, w: 0.34309843}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.2800546, y: 3.0786743, z: 3.6917665}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 19.976, y: 11.67, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &547432244
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/PianGuangJing.unity

@@ -273,6 +273,128 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &291551056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 291551057}
+  - component: {fileID: 291551061}
+  - component: {fileID: 291551060}
+  - component: {fileID: 291551059}
+  - component: {fileID: 291551058}
+  m_Layer: 0
+  m_Name: pianguangjing
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &291551057
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291551056}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -1, w: 0.00000016292068}
+  m_LocalPosition: {x: -0.0007341858, y: 0.0009998064, z: 0.0069854558}
+  m_LocalScale: {x: 0.0009999998, y: 0.001, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 763292887}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!111 &291551058
+Animation:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291551056}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Animation: {fileID: 7400000, guid: 277afdf14be73784cb7bad4b51f9c285, type: 2}
+  m_Animations:
+  - {fileID: 7400000, guid: 277afdf14be73784cb7bad4b51f9c285, type: 2}
+  m_WrapMode: 0
+  m_PlayAutomatically: 0
+  m_AnimatePhysics: 0
+  m_CullingType: 0
+--- !u!65 &291551059
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291551056}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 8.647987, y: 8.652951, z: 5.2752957}
+  m_Center: {x: 0.0008778572, y: 0.000090122245, z: -2.1095905}
+--- !u!23 &291551060
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291551056}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e8278a8aa6094474c973f8442b7eae45, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &291551061
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 291551056}
+  m_Mesh: {fileID: 8055559493580141820, guid: 7180576e706b6b443ab13625ed252f14, type: 3}
 --- !u!1 &297041520
 GameObject:
   m_ObjectHideFlags: 0
@@ -351,6 +473,128 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: -270935532989386305, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+--- !u!1 &373240649
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 373240650}
+  - component: {fileID: 373240654}
+  - component: {fileID: 373240653}
+  - component: {fileID: 373240652}
+  - component: {fileID: 373240651}
+  m_Layer: 0
+  m_Name: diaozhui
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &373240650
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373240649}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.70710677, y: -0.00000024234444, z: -0.00000024234447, w: -0.7071069}
+  m_LocalPosition: {x: 0.00256, y: 0.0005, z: 0.0053999713}
+  m_LocalScale: {x: 0.007999997, y: 0.0079999985, z: 0.0079999985}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 763292887}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: -360}
+--- !u!111 &373240651
+Animation:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373240649}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Animation: {fileID: 7400000, guid: 45cfe7bcbe11eb04491b4ffd0c131c0c, type: 2}
+  m_Animations:
+  - {fileID: 7400000, guid: 45cfe7bcbe11eb04491b4ffd0c131c0c, type: 2}
+  m_WrapMode: 0
+  m_PlayAutomatically: 0
+  m_AnimatePhysics: 0
+  m_CullingType: 0
+--- !u!65 &373240652
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373240649}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2.2921896, y: 1.1370693, z: 5.5932536}
+  m_Center: {x: -0.0000004172325, y: -0.000001102686, z: 0.0000218153}
+--- !u!23 &373240653
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373240649}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 703823244ef53a746b7b3cc3d7726bcb, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &373240654
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373240649}
+  m_Mesh: {fileID: 6774637775579592750, guid: 7180576e706b6b443ab13625ed252f14, type: 3}
 --- !u!1 &374234368
 GameObject:
   m_ObjectHideFlags: 0
@@ -787,7 +1031,16 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: 609435b9aacd45b42a8a8ab9c210f2b4, type: 2}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 291551057}
+    - targetCorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1924932754}
+    - targetCorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 373240650}
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 6087053369038394149, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
       insertIndex: -1
@@ -878,6 +1131,11 @@ 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!4 &763292887 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7599228873923023265, guid: eda6779409a1f2a499af6443c90350cd, type: 3}
+  m_PrefabInstance: {fileID: 763292877}
+  m_PrefabAsset: {fileID: 0}
 --- !u!95 &763292888
 Animator:
   serializedVersion: 5
@@ -2299,6 +2557,128 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 2.2921896, y: 1.1370693, z: 5.5932536}
   m_Center: {x: -0.0000004172325, y: -0.000001102686, z: 0.0000218153}
+--- !u!1 &1924932753
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1924932754}
+  - component: {fileID: 1924932758}
+  - component: {fileID: 1924932757}
+  - component: {fileID: 1924932756}
+  - component: {fileID: 1924932755}
+  m_Layer: 0
+  m_Name: SM_HaiLanBaoShi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &1924932754
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1924932753}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -1, w: 0.00000016292068}
+  m_LocalPosition: {x: 0.00095, y: 0.0005, z: 0.0054}
+  m_LocalScale: {x: 0.0009999998, y: 0.001, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 763292887}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!111 &1924932755
+Animation:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1924932753}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Animation: {fileID: 7400000, guid: da968b4c00684534d8ab28495c4b0448, type: 2}
+  m_Animations:
+  - {fileID: 7400000, guid: da968b4c00684534d8ab28495c4b0448, type: 2}
+  m_WrapMode: 0
+  m_PlayAutomatically: 0
+  m_AnimatePhysics: 0
+  m_CullingType: 0
+--- !u!65 &1924932756
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1924932753}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 6.2955675, y: 4.7707753, z: 2.1748772}
+  m_Center: {x: 1.7900553, y: -0.00061774265, z: -1.0874939}
+--- !u!23 &1924932757
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1924932753}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 905ff5f1d2aae384980ca186f1efde91, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1924932758
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1924932753}
+  m_Mesh: {fileID: -3601519367124661431, guid: 7180576e706b6b443ab13625ed252f14, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0

Assets/Scripts/UI/UITextTip.Designer.cs

@@ -10,8 +10,8 @@ namespace QFramework.Example
 	{
 		public const string Name = "UITextTip";
 		
-		[SerializeField]
+		//[SerializeField]
-		public UnityEngine.UI.Image Mask;
+	//	public UnityEngine.UI.Image Mask;
 		[SerializeField]
 		public TMPro.TextMeshProUGUI Title;
 		[SerializeField]
@@ -25,7 +25,7 @@ namespace QFramework.Example
 		
 		protected override void ClearUIComponents()
 		{
-			Mask = null;
+		//	Mask = null;
 			Title = null;
 			Des = null;
 			BtnContent = null;

Assets/Scripts/UI/UITextTip.cs

@@ -65,9 +65,9 @@ namespace QFramework.Example
                 loader.LoadAsync();
             }
             Title.text = mData.title;
-            Color color = Mask.color;
+          //  Color color = Mask.color;
-            color.a = mData.alpha;
+          //  color.a = mData.alpha;
-            Mask.color = color;
+           // Mask.color = color;
         }
 
         protected override void OnShow()

Data/Xml/FenGuangJing.xml

@@ -169,7 +169,7 @@
 					
 					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
 					<Action type="Delay" value="2"></Action>
-					<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></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>
@@ -235,7 +235,7 @@
 					
 					<Action type="Show" value="CustomParent/Canvas" isShow="true"></Action>
 					<Action type="Delay" value="2"></Action>
-					<Action type="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></Action>
+          <Action type="TipWindow" value="重新选择宝石" btns="确定" audio=""></Action>
 					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
 

Data/Xml/HuangJinShouShiJiaGong.xml

@@ -170,7 +170,6 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/SM_ZhuChangJing/SM_ZhuBaoGongZuoTai/SM_ShuiZhong</Path>
     <Tip>冷却水</Tip>
-    <Icon>工具/骨刀.png</Icon>
   </Device>
 
   <Device>
@@ -231,17 +230,17 @@
 
 
 
-    <Item step="黄金首饰加工工艺" name="1.称重" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="1.称重" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="2.验金" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="2.验金" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="3.熔料" sum="31.2" bind=""/>
+    <Item step="黄金首饰加工工艺" name="3.熔料" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="4.压料" sum="15.6" bind=""/>
+    <Item step="黄金首饰加工工艺" name="4.压料" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="5.整形" sum="10.52" bind=""/>
+    <Item step="黄金首饰加工工艺" name="5.整形" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="6.焊接" sum="10.4" bind=""/>
+    <Item step="黄金首饰加工工艺" name="6.焊接" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="7.锉修" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="7.锉修" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="8.压光" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="8.压光" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="9.标识印记" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="9.标识印记" sum="10" bind=""/>
-    <Item step="黄金首饰加工工艺" name="10.称重" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="10.称重" sum="5" bind=""/>
-    <Item step="黄金首饰加工工艺" name="11.装盒出货" sum="5.26" bind=""/>
+    <Item step="黄金首饰加工工艺" name="11.装盒出货" sum="5" bind=""/>
 
 
   </Score>
@@ -304,7 +303,7 @@
                wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                rightEvent="物品准备通过"
                wrongEvent=""
-               rightScore="5.2"
+               rightScore="10"
                wrongScore=""
                      random="true"
                scoreStepName="黄金首饰加工工艺1.称重"
@@ -354,7 +353,7 @@
                          wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                          rightEvent="物品准备通过"
                          wrongEvent=""
-                         rightScore="5.2"
+                  rightScore="10"
                          wrongScore=""
                      random="true"
                          scoreStepName="黄金首饰加工工艺2.验金"
@@ -415,7 +414,7 @@
                          wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                          rightEvent="物品准备通过"
                          wrongEvent=""
-                         rightScore="5.2"
+                          rightScore="5"
                          wrongScore=""
                      random="true"
                          scoreStepName="黄金首饰加工工艺3.熔料"
@@ -453,7 +452,7 @@
                       wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                       rightEvent="物品准备通过"
                       wrongEvent=""
-                      rightScore="5.2"
+                      rightScore="3"
                       wrongScore=""
                        random="true"
                       scoreStepName="黄金首饰加工工艺3.熔料"
@@ -566,7 +565,7 @@
           wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
           rightEvent="物品准备通过"
           wrongEvent=""
-          rightScore="5.2"
+          rightScore="2"
           wrongScore=""
            random="true"
           scoreStepName="黄金首饰加工工艺3.熔料"
@@ -630,7 +629,7 @@
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
                   wrongEvent=""
-                  rightScore="5.2"
+                rightScore="3"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
@@ -669,7 +668,7 @@
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
                   wrongEvent=""
-                  rightScore="5.2"
+                     rightScore="2"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
@@ -705,7 +704,7 @@
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
                   wrongEvent=""
-                  rightScore="5.2"
+                rightScore="5"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺4.压料"
@@ -761,7 +760,7 @@
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
                   wrongEvent=""
-                  rightScore="5.2"
+                  rightScore="5"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺5.整形"
@@ -804,7 +803,7 @@
                     wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                     rightEvent="物品准备通过"
                     wrongEvent=""
-                    rightScore="5.2"
+                       rightScore="5"
                     wrongScore=""
                        random="true"
                     scoreStepName="黄金首饰加工工艺5.整形"
@@ -861,7 +860,7 @@
                   wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
                   rightEvent="物品准备通过"
                   wrongEvent=""
-                  rightScore="5.2"
+                    rightScore="10"
                   wrongScore=""
                      random="true"
                   scoreStepName="黄金首饰加工工艺6.焊接"
@@ -983,13 +982,13 @@
             <Action type="Rotate" value="FlyCamera" to="34.2266693,171.029144,0" time="0"></Action>
 
 
-            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,冷却水,锉刀" answers="锉刀"
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,锉刀" answers="锉刀"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
              wrongEvent=""
-             rightScore="5.2"
+                 rightScore="10"
              wrongScore=""
                      random="true"
              scoreStepName="黄金首饰加工工艺7.锉修"
@@ -1036,13 +1035,13 @@
 
 
 
-            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,冷却水,锉刀,玛瑙刀" answers="玛瑙刀"
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,锉刀,玛瑙刀" answers="玛瑙刀"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
              wrongEvent=""
-             rightScore="5.2"
+               rightScore="10"
              wrongScore=""
                      random="true"
              scoreStepName="黄金首饰加工工艺8.压光"
@@ -1080,13 +1079,13 @@
 
 
 
-            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,冷却水,锉刀,玛瑙刀,钢印" answers="钢印"
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,锉刀,玛瑙刀,钢印" answers="钢印"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
              wrongEvent=""
-             rightScore="5.2"
+               rightScore="10"
              wrongScore=""
                      random="true"
              scoreStepName="黄金首饰加工工艺9.标识印记"
@@ -1141,13 +1140,13 @@
             <Action type="TimeLine" value="TimeLine/JinLiaoDaoCeLiangDian" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="100"></Action>
 
             
-            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,冷却水,锉刀,玛瑙刀,钢印" answers="电子秤"
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,锉刀,玛瑙刀,钢印" answers="电子秤"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
              wrongEvent=""
-             rightScore="5.2"
+             rightScore="5"
              wrongScore=""
                      random="true"
              scoreStepName="黄金首饰加工工艺10.称重"
@@ -1189,13 +1188,13 @@
 
 
 
-            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,冷却水,锉刀,玛瑙刀,钢印,珠宝盒" answers="珠宝盒"
+            <Action type="UITools" devices="电子秤,荧光光谱仪,坩埚,液化气罐,制氧机,焊枪,模具,铁锤,圆盘,木桩,压片机,拉线凳,圆锥模具,胶锤,珠宝钳,锉刀,玛瑙刀,钢印,珠宝盒" answers="珠宝盒"
              setActive="true"
              rightLabel="提示：物品选择正确。"
              wrongLabel="提示：物品选择错误,当前模块中，不需要该物品。"
              rightEvent="物品准备通过"
              wrongEvent=""
-             rightScore="5.2"
+             rightScore="5"
              wrongScore=""
              random="true"
              scoreStepName="黄金首饰加工工艺11.装盒出货"
@@ -1215,9 +1214,10 @@
             <!--金手镯，装入宝石盒-->
             <Action type="TimeLine" value="TimeLine/HuangJinShouZhuoZhuangZhuBaoHe" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="100"></Action>
 
+            <Action type="TipWindow" value="恭喜你完成当前模块 得分:{Score}" btns="确定" ></Action>
+            <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 
-
+            <!--<Action type="UIShow" value="UIScore" isShow="true"></Action>-->
-            <Action type="UIShow" value="UIScore" isShow="true"></Action>
             
             <Action type="NextOperation"></Action>
           </Action>

Data/Xml/PianGuangJing.xml

@@ -38,9 +38,16 @@
 		<Step name="1.打开偏光镜电源">
 			<Start>
 				<Action type="Sequence">
+          
           <Action type="Move" value="FlyCamera" to="0.115,1.43,2.213" time="0"></Action>
           <Action type="Rotate" value="FlyCamera" to="39.7456,0,0" time="0"></Action>
 
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/pianguangjing" isShow="false"></Action>
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/SM_HaiLanBaoShi" isShow="false"></Action>
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/diaozhui" isShow="false"></Action>
+
+
+
           <Action type="TextTip" title="实验说明" value="偏光镜是常规鉴定仪器中，往往是首先使用的仪器，因为它可以非常快速的确定宝石是否为均质体、非均质体，因此在宝石鉴定仪器中具有非常重要的地位。偏光镜的结构包括上下两个偏光片，光源、开关。下偏光片固定不动的，它的上面加装一个可以旋转的玻璃片，称为载物台。避免宝石与偏光片直接接触，影响仪器的使用寿命。"  btns="确定"/>
 					<Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 					
@@ -101,6 +108,11 @@
 
 					<Action type="Anim" value="ChangJing/SM_BaoShi/SM_PGJ_ShiYong/pianguangjing" animName="PianGuangJing_pianguangjing" speed="1"></Action>
 
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/pianguangjing" isShow="true"></Action>
+
+          <Action type="Show" value="ChangJing/SM_BaoShi/SM_PGJ_ShiYong/pianguangjing" isShow="false"></Action>
+
+
           <Action type="NextOperation"></Action>
 				</Action>
 			</Start>
@@ -110,6 +122,7 @@
 				<Action type="Sequence">
 					<Action type="Hint" value="请通过旋转载物台，观察均质体宝石的消光现象" time="-1" audio="sound_4.mp3" icon="true" ></Action>
 
+      
           <Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="true"></Action>
 					<Action type="Show" value="CustomParent/2/AllLight" isShow="false"></Action>
 					<Action type="Show" value="CustomParent/2/NoLight" isShow="false"></Action>
@@ -137,6 +150,7 @@
 					
 					<Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="false"></Action>
 
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/pianguangjing" isShow="false"></Action>
 					<Action type="NextOperation"></Action>
 				</Action>
 			</Start>
@@ -161,7 +175,8 @@
 					<Action type="HighLightFlash" value="ChangJing/SM_BaoShi/SM_HaiLanBaoShi/SM_HaiLanBaoShi" isHigh="false"></Action>
 
 					<Action type="Anim" value="ChangJing/SM_BaoShi/SM_HaiLanBaoShi/SM_HaiLanBaoShi" animName="PianGuangJing_SM_HaiLanBaoShi" speed="1"></Action>
-
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/SM_HaiLanBaoShi" isShow="true"></Action>
+          <Action type="Show" value="ChangJing/SM_BaoShi/SM_HaiLanBaoShi/SM_HaiLanBaoShi" isShow="false"></Action>
           <Action type="NextOperation"></Action>
 				</Action>
 			</Start>
@@ -190,6 +205,7 @@
 					</Action>
 					
 					<Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="false"></Action>
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/SM_HaiLanBaoShi" isShow="false"></Action>
 					<Action type="NextOperation"></Action>
 				</Action>
 			</Start>
@@ -212,7 +228,8 @@
 					<Action type="HighLightFlash" value="ChangJing/SM_BaoShi/SM_DiaoZhui/diaozhui" isHigh="false"></Action>
 
 					<Action type="Anim" value="ChangJing/SM_BaoShi/SM_DiaoZhui/diaozhui" animName="PianGuangJing_diaozhui" speed="1"></Action>
-
+          <Action type="Show" value="SM_PianGuangJing 1/SM_ZaiWuTai/diaozhui" isShow="true"></Action>
+          <Action type="Show" value="ChangJing/SM_BaoShi/SM_DiaoZhui/diaozhui" isShow="false"></Action>
 					<Action type="NextOperation"></Action>
 				</Action>
 			</Start>
@@ -241,7 +258,7 @@
 					</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="TipWindow" value="恭喜你完成当前模块" btns="确定" audio=""></Action>
 					<Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>
 				</Action>

Data/Xml/ShuiReFaHeCheng.xml

@@ -114,7 +114,7 @@
             <Action type="Show" value="Main/SM_HaiLanBaoShiParent"  isShow="false" ></Action>
             <Action type="Show" value="Main/SM_BianShi_ZSY"  isShow="false" ></Action>
             <Action type="Show" value="Main/SM_HaiLanBaoShi (1)_DaiZi"  isShow="false" ></Action>
-
+            <Action type="Show" value="Main/SM_PianGuangJing/SM_ZaiWuTai/SM_HaiLanBaoShi" isShow="false"></Action>
             <!--隐藏物体-->
             <Action type="Show" value="Main/SM_LengShiFenGuangJing"  isShow="false" ></Action>
             <Action type="Show" value="Main/SM_GuangShanFenGuangJing"  isShow="false" ></Action>
@@ -196,10 +196,9 @@
             <Action type="Show" value="CustomParent/2/NoLight" isShow="true"></Action>
             <Action type="Show" value="CustomParent/4" isShow="false"></Action>
 
-            <Action type="Parallel">
+            <Action type="Move" value="FlyCamera" to="0.1127885,1.404583,2.229781" time="0"></Action>
-              <Action type="Move" value="FlyCamera" to="0.1204406,1.418733,2.278147" time="1.0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="45.24144,359.2496,0" time="0"></Action>
-              <Action type="Rotate" value="FlyCamera" to="49.55647,358.8118,0" time="1.0"></Action>
+            
-            </Action>
             
             <Action type="Show" value="Main/SM_HaiLanBaoShiParent" isShow="true"></Action>
             <Action type="Show" value="Main/SM_HaiLanBaoShiParent/SM_HaiLanBaoShi" isShow="true"></Action>
@@ -214,27 +213,34 @@
                         <!--放入海蓝宝石-->
             <Action type="TimeLine" value="TimeLines/FangRuPianGuangJing" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
 
+            <Action type="Show" value="Main/SM_HaiLanBaoShiParent/SM_HaiLanBaoShi" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_PianGuangJing/SM_ZaiWuTai/SM_HaiLanBaoShi" isShow="true"></Action>
+
+            
             <!--6.旋转载物台，观察消光现象-->
 
 				<Action type="Hint" value="请通过旋转载物台，观察非均质体单晶类宝石四明四暗的消光现象" time="-1"  icon="true" ></Action>				
 					<Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="true"></Action>
 					<Action type="Show" value="CustomParent/2/NoLight" isShow="false"></Action>
 					<Action type="Show" value="CustomParent/6" isShow="true"></Action>
-					<Action type="Rotate" value="Main/SM_PianGuangJing/SM_ShangPianGuangPian" to="270,0,0" time="0"></Action>
+            
+            <Action type="Rotate" value="Main/SM_PianGuangJing/SM_ZaiWuTai" to="270,0,0" time="0"></Action>
+			
+            
             <Action type="Anim" value="CustomParent/6/SiMingSiAn" animName="PianGuangJing_SiMingSiAn" frame="0" speed="1"></Action>
-					<Action type="Parallel">
+         
-						<Action type="Move" value="FlyCamera" to="0.115,1.43,2.352" time="1.0"></Action>
+            <Action type="Move" value="FlyCamera" to="0.1127885,1.404583,2.229781" time="0"></Action>
-						<Action type="Rotate" value="FlyCamera" to="90,0,0" time="1.0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="45.24144,359.2496,0" time="0"></Action>
-					</Action>
 
             <Action type="Show" value="CustomParent/2" isShow="true"></Action>
             <Action type="Show" value="CustomParent/2/ShunShiZhen" isShow="true"></Action>
             <Action type="HighLightFlash" value="Main/SM_PianGuangJing/SM_ZaiWuTai" isHigh="true" color="255,0,0,255" time="1" count="-1"></Action>
 					<Condition type="ObjClick" value="Main/SM_PianGuangJing/SM_ZaiWuTai"></Condition>
+            
 					<Action type="HighLightFlash" value="Main/SM_PianGuangJing/SM_ZaiWuTai" isHigh="false"></Action>
 					
 					<Action type="Parallel">
-						<Action type="Rotate" value="Main/SM_PianGuangJing/SM_ShangPianGuangPian" to="270,180,0" time="3.0"></Action>
+            <Action type="Rotate" value="Main/SM_PianGuangJing/SM_ZaiWuTai" to="270,180,0" time="3.0"></Action>
 						<Action type="Anim" value="CustomParent/6/SiMingSiAn" animName="PianGuangJing_SiMingSiAn" speed="1"></Action>
 					</Action>
 					
@@ -244,7 +250,7 @@
 
 
             <Action type="Show" value="Main/SM_PianGuangJing" isShow="false"></Action>
-
+            <Action type="Show" value="CustomParent/6/SiMingSiAn" isShow="false"></Action>
             
 
             <Action type="NextOperation"></Action>
@@ -456,10 +462,6 @@
 
 
 
-            <Action type="Show" value="Main/SM_ZHeSheYi" isShow="false"></Action>
-            <Action type="Show" value="Main/SM_MianQian" isShow="false"></Action>
-            <Action type="Show" value="Main/SM_BianShi_ZSY" isShow="false"></Action>
-            
             
             
             
@@ -479,6 +481,10 @@
             <Action type="Rotate" value="FlyCamera" to="31.0566,355.0971,-1.245791E-07" time="0"></Action>
 
 
+            <Action type="Show" value="Main/SM_ZHeSheYi" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_MianQian" isShow="false"></Action>
+            <Action type="Show" value="Main/SM_BianShi_ZSY" isShow="false"></Action>
+
 
             <Action type="Hint" value="请选择合适的工具，检测祖母绿内部是否包含愈合裂隙、包裹体，籽晶片，锯齿状、水波纹状或“V”形生长纹" time="-1" audio="sound_41.mp3" icon="true" ></Action>
             <Action type="UITools" devices="宝石镊子,偏光镜,折射仪,显微镜,密度仪,紫外荧光灯" answers="显微镜"
@@ -714,7 +720,7 @@
 
             <Action type="Show" value="Main/SM_MiDuYi" isShow="false" ></Action>
             <Action type="Show" value="Main/SM_HaiLanBaoShi_MiDuYi" isShow="false" ></Action>
-
+            <Action type="Show" value="CustomParent/DiZuoxianshipin" isShow="false" ></Action>
             
 
             <Action type="NextOperation"></Action>
@@ -744,7 +750,9 @@
             </Action>
             <Condition type="StrEvent" value="物品准备通过"></Condition>
             <Action type="UIShow" value="UITools" isShow="false"></Action>
-      
+            <Action type="Show" value="Main/SM_FGJ_ShiYong"  isShow="true" ></Action>
+            <Action type="Show" value="Main/SM_FGJ_ShiYong/yudishi"  isShow="true" ></Action>
+            <Action type="Show" value="Main/SM_FGJ_ShiYong/SM_DiaZi004"  isShow="false" ></Action>
             
             <!--1.放宝石到暗门-->