修改反馈内容完成

Assets/Art/UIPrefab/UIHint.prefab

@@ -431,15 +431,15 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 25
+  m_fontSize: 17
   m_fontSizeBase: 15
   m_fontWeight: 400
   m_enableAutoSizing: 1
   m_fontSizeMin: 15
-  m_fontSizeMax: 25
+  m_fontSizeMax: 17
   m_fontStyle: 0
   m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
+  m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
   m_wordSpacing: 0

Assets/Art/UIPrefab/UIInput.prefab

@@ -1740,7 +1740,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: 600
-  m_MinHeight: 450
+  m_MinHeight: 400
   m_PreferredWidth: -1
   m_PreferredHeight: -1
   m_FlexibleWidth: 800

Assets/Art/UIPrefab/UIModeSelect.prefab

@@ -294,8 +294,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 90.36
+  m_fontSize: 100
-  m_fontSizeBase: 90.36
+  m_fontSizeBase: 100
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -401,7 +401,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 0d78c6ec7d51a504b956ab9d37b2ad3a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: af2b4d9494108bc45a95dd3a2eb98974, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -447,7 +447,7 @@ RectTransform:
   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: 267}
+  m_AnchoredPosition: {x: 0, y: 210}
   m_SizeDelta: {x: 1729, y: 99}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3922333369959595232
@@ -534,8 +534,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4072267013626064002}
-  - {fileID: 6095085658365830249}
   - {fileID: 6169462885626948174}
+  - {fileID: 6095085658365830249}
   - {fileID: 7515753778195365010}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -847,7 +847,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6169462885626948174
 RectTransform:
   m_ObjectHideFlags: 0
@@ -857,15 +857,15 @@ RectTransform:
   m_GameObject: {fileID: 8663699119929632003}
   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_LocalScale: {x: 2.0784, y: 2.0784, z: 2.0784}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3000090787083124518}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 273, y: -49}
+  m_AnchoredPosition: {x: 959, y: -145}
-  m_SizeDelta: {x: 546, y: 98}
+  m_SizeDelta: {x: 105, y: 105}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1007982851582153361
 CanvasRenderer:
@@ -895,7 +895,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: b1bb33f931d0e6e449c9b79cdf4878d7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Projects/LanZhou/Doc开发文档/~$矿井通风脚本.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d1f8c2265c3962e4192ece13cd822cee
+guid: 445896c5ffa96dd419fd352ddb736254
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Projects/LanZhou/Model/矿井通风模型动画/道具动画/Aim_guangxuewajiayi_co2.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6341bbc0d5b36cd49b5b7a59bf27f093
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Projects/LanZhou/Playable/guangxuewajiayi_Co2.playable

@@ -0,0 +1,482 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-8372859608327900725
+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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+  m_Name: AnimationPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 4077487833476631646, guid: 6c8b61d495d490542a1c5208de277822, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &-4591396378816822980
+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: 648681636286019533}
+    m_Duration: 9.125
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -4591396378816822980}
+    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
+  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: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: guangxuewajiayi_Co2
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks:
+  - {fileID: 8162851692331204608}
+  - {fileID: 8452503064587653087}
+  - {fileID: 6937433229643241266}
+  - {fileID: -4591396378816822980}
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}
+--- !u!114 &648681636286019533
+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 &4589118273860697543
+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: 030f85c3f73729f4f976f66ffb23b875, type: 3}
+  m_Name: AnimationPlayableAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 7400000, guid: 6341bbc0d5b36cd49b5b7a59bf27f093, type: 2}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &6937433229643241266
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: 4589118273860697543}
+    m_Duration: 9.125
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 6937433229643241266}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: []
+      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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Aim_guangxuewajiayi_co2
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &7460848990125955760
+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 &8162851692331204608
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: -8372859608327900725}
+    m_Duration: 9.125
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8162851692331204608}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Aim_chuangxuewajianyi
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &8452503064587653087
+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: 7460848990125955760}
+    m_Duration: 9.125
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 8452503064587653087}
+    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

Assets/Projects/LanZhou/Playable/guangxuewajiayi_Co2.playable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccb4cc7677d9049408cbfba3db8b1bf3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Projects/首页.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f320d2f23b8ae7d45bb9a30cd61cf3c6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Projects/首页/logo.png.meta

@@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: b1bb33f931d0e6e449c9b79cdf4878d7
+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/Projects/首页/首页-BJ.png.meta

@@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: af2b4d9494108bc45a95dd3a2eb98974
+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/Scripts/UI/UIResultTip.cs

@@ -45,6 +45,7 @@ namespace QFramework.Example
                 obj = Wrong.gameObject;
             }
             obj.SetActive(true);
+      
           var text = obj.transform.Find("Bg/Label").GetComponent<TextMeshProUGUI>();
             text.text = Regex.Unescape(mData.label);
             if (mData.autoHideTime == -1)
@@ -74,6 +75,7 @@ namespace QFramework.Example
         }
         protected override void OnShow()
         {
+            transform.SetAsLastSibling();
         }
 
         protected override void OnHide()

Data/Xml/02_KuangJingTongFeng.xml

@@ -33,8 +33,7 @@
           <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="false" ></Action>
           <Action type="Show" value="2DCanvas/DuoCanShuQiTiCeDingQi"  isShow="false" ></Action>
           <Action type="Show" value="2DCanvas/WenShiDu"  isShow="false" ></Action>
-          <Action type="Show" value="2DCanvas/CH4"  isShow="false" ></Action>
+      
-          <Action type="Show" value="2DCanvas/CO2"  isShow="false" ></Action>
           <Action type="Show" value="2DCanvas/DaQiYaParent"  isShow="false" ></Action>
           <Action type="Show" value="2DCanvas/ShuJu1"  isShow="false" ></Action>
           <Action type="Show" value="2DCanvas/ShuJu2"  isShow="false" ></Action>
@@ -326,11 +325,11 @@
             <!--点击光学瓦检仪、瓦斯探仗-->
             <Action type="Sequence">
               <Action type="Hint" value="请获取“光学瓦检仪、瓦斯探仗”，完成准备工器具任务检查前准备
-\n第一：药品性能检查根据药品使用时间和变化程度确定，药品颗粒大小以3~5mm为合适。钠石灰由淡粉红色变为白色为失效。硅胶由蓝色变为淡粉色或淡蓝色为失效。
+第一：药品性能检查根据药品使用时间和变化程度确定，药品颗粒大小以3~5mm为合适。钠石灰由淡粉红色变为白色为失效。硅胶由蓝色变为淡粉色或淡蓝色为失效。
-\n第二：气密性检查用手指将仪器进气孔堵严，另一手挤压气球将气排出，一分钟气球不还原为合格。
+第二：气密性检查用手指将仪器进气孔堵严，另一手挤压气球将气排出，一分钟气球不还原为合格。
-\n第三：检查干涉条纹是否清晰按下按扭，由目镜观察，旋转保护玻动框调整视度达到数字清晰，再看干涉条纹是否清晰，如不清晰可打开光源盖，转动灯泡座调整灯泡的位置直到清晰为止。
+第三：检查干涉条纹是否清晰按下按扭，由目镜观察，旋转保护玻动框调整视度达到数字清晰，再看干涉条纹是否清晰，如不清晰可打开光源盖，转动灯泡座调整灯泡的位置直到清晰为止。
-\n第四：用新鲜空气清洗气室应在与使用地点温度相差不超过10摄氏度的新鲜空气地点清洗气室(一般在井底车场清洗)。
+第四：用新鲜空气清洗气室应在与使用地点温度相差不超过10摄氏度的新鲜空气地点清洗气室(一般在井底车场清洗)。
-\n第五：干涉条纹的零位调整按上按扭，同时转动测微手轮使刻度盘的零位与指标线重合;
+第五：干涉条纹的零位调整按上按扭，同时转动测微手轮使刻度盘的零位与指标线重合;
 然后按下按扭，同时转动粗动手轮，把两条黑色干涉条纹中的任一条对准分划板上的零位线，旋上保护盖。" time="-1" icon="false" audio="sound_11.mp3"></Action>
 
               <Action type="Collider" value="Main/Aim_Kuanggong/SM_chuangxuewajianyi"  colliderType="AddBox" args="-0.009526014,-0.1357991,0.01680448|0.119052,0.2334658,0.1336089"></Action>
@@ -363,6 +362,12 @@
 
               <!--检查前准备-->
               <!--第一：药品性能检查-->
+              <Action type="TextTip" title="检查前准备" value="第一:药品性能检查
+根据药品使用时间和变化程度确定，药品颗粒大小以 3~5mm 为合适。
+钠石灰由淡粉红色变为白色为失效。硅胶由蓝色变为淡粉色或淡蓝色为失效。"  audio="sound_11_1.mp3" btns="确定" alpha="0.5"/>
+              <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
+
+
               <Action type="Parallel">
                 <Action type="Move" value="FlyCamera" to="-15.684,1.036,3.431" time="0"></Action>
                 <Action type="Rotate" value="FlyCamera" to="14.49924,187.5017,1.102325E-07" time="0"></Action>
@@ -374,39 +379,38 @@
               </Action>
               <Action type="Delay" value="2"></Action>
               <!--第二：气密性检查 用手指将仪器进气孔堵严，另一手挤压气球将气排出，一分钟气球不还原为合格-->
-              <Action type="Parallel">
+              <Action type="TextTip" title="检查前准备" value="第二:气密性检查
-                <Action type="Move" value="FlyCamera" to="-15.63863,1.064328,3.79175" time="0"></Action>
+用手指将仪器进气孔堵严，另一手挤压气球将气排出，一分钟气球不还原为合格。"  audio="sound_11_2.mp3" btns="确定" alpha="0.5"/>
-                <Action type="Rotate" value="FlyCamera" to="14.25528,189.2095,1.101123E-07" time="0"></Action>
+              <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
-              </Action>
+              
-              <!--点击气球-->
-              <Action type="HighLight"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isHigh="true" color="0,255,0,255" isIndependent="true" visibility="Normal"></Action>
-              <Condition type="ObjClick"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isRight="true"></Condition>
-              <Action type="HighLight"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isHigh="false" color="0,255,0,255" isIndependent="true" visibility="Normal"></Action>
       
               <Action type="Parallel">
-                <Action type="Move" value="FlyCamera" to="-15.672,0.954,3.423" time="0"></Action>
+                <Action type="Move" value="FlyCamera" to="-17.22956,1.595032,2.747936" time="0"></Action>
-                <Action type="Rotate" value="FlyCamera" to="35.16063,195.202,5.221596E-07" time="0"></Action>
+                <Action type="Rotate" value="FlyCamera" to="56.13818,312.3871,3.064559E-06" time="0"></Action>
               </Action>
 
-              <Action type="TimeLine" value="TimeLineManagers/NieQiQiu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
 
-              <!--<Action type="TimeTip" value="等待1分钟后&lt;color=#FF00FF&gt;&lt;/color&gt;-{1}" time="5" values="0,60" format="{0:F1}" finishedEvent="close" needClick="false" reverse="false" ></Action>-->
+
+              <Action type="Show" value="Main/Aim_jianchawajianyi" isShow="true" ></Action>
+              <Action type="Show" value="Main/Aim_jianchawajianyi/hand_r" isShow="true" ></Action>
+              <Action type="Show" value="Main/Aim_jianchawajianyi/huand_l" isShow="true" ></Action>
+
+              <Action type="Anim" value="Main/Aim_jianchawajianyi" animName="Take 001"  frame="0" ></Action>
+              <Action type="Anim" value="Main/Aim_jianchawajianyi" animName="Take 001"   speed="1"></Action>
               <Action type="TimeTip" value="等待1分钟后&lt;color=#FF00FF&gt;{0}&lt;/color&gt;秒" time="5" values="0,60" format="{0:F1}" finishedEvent="close" needClick="false" reverse="true" ></Action>
-
-
-
               <Condition type="StrEvent" value="close"></Condition>
 
-              <Action type="Parallel">
+              <Action type="Anim" value="Main/Aim_jianchawajianyi" animName="Take 001"   speed="-1"></Action>
-                <Action type="Move" value="FlyCamera" to="-15.672,0.954,3.423" time="0"></Action>
-                <Action type="Rotate" value="FlyCamera" to="35.16063,195.202,5.221596E-07" time="0"></Action>
-              </Action>
 
-              <Action type="TimeLine" value="TimeLineManagers/GuQiQiu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
+              <Action type="Show" value="Main/Aim_jianchawajianyi" isShow="false" ></Action>
        
 
+              <Action type="Delay" value="2"></Action>
+
               <!--第三：检查干涉条纹是否清晰-->
 
+              <Action type="TextTip" title="检查前准备" value="第三:检查干涉条纹是否清晰按下按扭，由目镜观察，旋转保护玻动框调整视度达到数字清晰，再看干涉条纹是否清晰如不清晰可打开光源盖，转动灯泡座调整灯泡的位置直到清晰为止。"  audio="sound_11_3.mp3" btns="确定" alpha="0.5"/>
+              <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 
 
               <!--点击 盖子-->
@@ -461,22 +465,51 @@
 
 
               <!--第四 用新鲜空气清洗气室应在与使用地点温度相差不超过10摄氏度的新鲜空气地点清洗气室(一般在井底车场清洗)。-->
+          <Action type="TextTip" title="检查前准备" value="
+第四：用新鲜空气清洗气室应在与使用地点温度相差不超过10摄氏度的新鲜空气地点清洗气室(一般在井底车场清洗)。"  audio="sound_11_4.mp3" btns="确定" alpha="0.5"/>
+              <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
+
 
               <Action type="Parallel">
-                <Action type="Move" value="FlyCamera" to="-17.22956,1.595032,2.747936" time="0"></Action>
+                <Action type="Move" value="FlyCamera" to="-15.63863,1.064328,3.79175" time="0"></Action>
-                <Action type="Rotate" value="FlyCamera" to="56.13818,312.3871,3.064559E-06" time="0"></Action>
+                <Action type="Rotate" value="FlyCamera" to="14.25528,189.2095,1.101123E-07" time="0"></Action>
+              </Action>
+              <!--点击气球-->
+              <Action type="HighLight"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isHigh="true" color="0,255,0,255" isIndependent="true" visibility="Normal"></Action>
+              <Condition type="ObjClick"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isRight="true"></Condition>
+              <Action type="HighLight"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi/group19/pSphere5" isHigh="false" color="0,255,0,255" isIndependent="true" visibility="Normal"></Action>
+
+
+              <Action type="Parallel">
+                <Action type="Move" value="FlyCamera" to="-15.672,0.954,3.423" time="0"></Action>
+                <Action type="Rotate" value="FlyCamera" to="35.16063,195.202,5.221596E-07" time="0"></Action>
               </Action>
 
-              <Action type="Show" value="Main/Aim_jianchawajianyi" isShow="true" ></Action>
+              <Action type="TimeLine" value="TimeLineManagers/NieQiQiu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
-              <Action type="Show" value="Main/Aim_jianchawajianyi/hand_r" isShow="true" ></Action>
+
-              <Action type="Show" value="Main/Aim_jianchawajianyi/huand_l" isShow="true" ></Action>
+
+
+
+              <Action type="Delay" value="1"></Action>
+              
+              <Action type="Parallel">
+                <Action type="Move" value="FlyCamera" to="-15.672,0.954,3.423" time="0"></Action>
+                <Action type="Rotate" value="FlyCamera" to="35.16063,195.202,5.221596E-07" time="0"></Action>
+              </Action>
+
+              <Action type="TimeLine" value="TimeLineManagers/GuQiQiu" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="60"></Action>
+
+
            
-              <Action type="Anim" value="Main/Aim_jianchawajianyi" animName="Take 001"  frame="0" ></Action>
-              <Action type="Anim" value="Main/Aim_jianchawajianyi" animName="Take 001"   speed="1"></Action>
 
               <Action type="Delay" value="1"></Action>
 
               <!--第五：干涉条纹的零位调整 按上按扭，同时转动测微手轮使刻度盘的零位与指标线重合; 然后按下按扭，同时转动粗动手轮，把两条黑色干涉条纹中的任一条对准分划板上的零位线，旋上保护盖。-->
+              <Action type="TextTip" title="检查前准备" value="第五：干涉条纹的零位调整
+按上按扭，同时转动测微手轮使刻度盘的零位与指标线重合;
+然后按下按扭，同时转动粗动手轮，把两条黑色干涉条纹中的任一条对准分划板上的零位线，旋上保护盖。"  audio="sound_11_5.mp3" btns="确定" alpha="0.5"/>
+              <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
+
 
               <Action type="Parallel">
                 <Action type="Move" value="FlyCamera" to="-17.4035,1.4819,2.8195" time="0"></Action>
@@ -628,7 +661,7 @@
                 <Input name="甲烷:"  answer="0.24"  unit="%"></Input>
                 <Input name="一氧化碳:"  answer="11"  unit="ppm"></Input>
                 <Input name="硫化氢:"  answer="0"  unit="ppm"></Input>
-                <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="-1"  scoreStepName="" rightScore="0" wrongScore="-1"></Btn>
+                <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="3"  scoreStepName="" rightScore="0" wrongScore="-1"></Btn>
 
               </Action>
               <Condition type="StrEvent" value="Input关闭"></Condition>
@@ -661,6 +694,7 @@
         </Finished>
 
       </Step>
+  
       <Step name="瓦斯、二氧化碳测定">
         <Reset>
           <Action type="Sequence">
@@ -671,15 +705,7 @@
           <Action type="Sequence">
             <Action type="Sequence">
 
-              <Action type="Hint" value="请获取“光学瓦检仪、瓦斯探仗”检测甲烷浓度任务。
+              <Action type="Hint" value="请获取“光学瓦检仪、瓦斯探仗”检测甲烷浓度任务。" time="-1" icon="false" audio="sound_14.mp3"></Action>
-清洗气室：应选择在与待测地点温度相近，标高基本相同的附近，进风巷道中进行；
-首先连接二氧化碳吸收管，在新鲜空气中捏放气球5-7次，吸收新鲜空气，清洗瓦斯气室。
-对零调零：首先校小数 回零位；然后大数 回零位；盖好主调螺旋盖
-\n1.测瓦斯方法:
-\n(1)、将仪器进气口伸向距顶板200-300毫米，捏放气球5至7次，将待测气体吸入瓦斯室，读出瓦斯数值，连续测定3次，取最大值;
-\n2.测C02的方法:
-\n(1)、测定二氧化碳浓度时，将仪器进气口伸向距离底板200-300毫米，将待测气体吸入瓦斯室，读出下部的瓦斯数值，然后去掉二氧化碳吸收管，接入进气管，将进气口伸向下部，同一测点，捏放气球，5至7次 将待测气体吸入瓦斯室，读出下部的混合气体数值，读数下部混合气体数值减去下部瓦斯除以0.955，校正系数 就是要测定的二氧化碳数值
-用这样的方法连续测定三次 取最大值" time="-1" icon="false" audio="sound_14.mp3"></Action>
 
               <Action type="Show" value="Main/Aim_Kuanggong"  isShow="true" ></Action>
 
@@ -693,6 +719,9 @@
 
               <Action type="Collider" value="Main/Aim_Kuanggong/SM_chuangxuewajianyi"  colliderType="AddBox" args="-0.009526014,-0.1357991,0.01680448|0.119052,0.2334658,0.1336089"></Action>
 
+              <Action type="Hint" value="清洗气室：应选择在与待测地点温度相近，标高基本相同的附近，进风巷道中进行；
+首先连接二氧化碳吸收管，在新鲜空气中捏放气球5-7次，吸收新鲜空气，清洗瓦斯气室。" time="-1" icon="false" audio="sound_14_1.mp3"></Action>
+
 
               <Action type="HighLight"  value="Main/Aim_Kuanggong/SM_chuangxuewajianyi" isHigh="true" color="0,255,0,255" isIndependent="true" visibility="Normal"></Action>
               <Condition type="ObjClick" value="Main/Aim_Kuanggong/SM_chuangxuewajianyi" isRight="true"></Condition>
@@ -712,6 +741,10 @@
               <!--显示标高。200-300米处-->
               <Action type="Show" value="Main/Aim_Kuanggong"  isShow="false" ></Action>
 
+
+
+              <Action type="Hint" value="1.测瓦斯方法:(1)、将仪器进气口伸向距顶板200-300毫米，捏放气球5至7次，将待测气体吸入瓦斯室，读出瓦斯数值，连续测定3次，取最大值;" time="-1" icon="false" audio="sound_14_3.mp3"></Action>
+
               <Action type="TimeLine" value="TimeLineManagers/guangxuewajiayi" isShow="true" finishedEvent="播放完毕"  isWait="true" frame="0" endFrame="1"></Action>
 
 
@@ -740,21 +773,62 @@
               </Action>
 
  
+              <Action type="Show" value="2DCanvas"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/CH4"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/CH4/Image"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/CH4/GanSheTiaoWen (1)"  isShow="true" ></Action>
 
               <Action type="TimeLine" value="TimeLineManagers/guangxuewajiayi" isShow="true" finishedEvent="播放完毕"  isWait="true" frame="0" endFrame="542"></Action>
 
+
+              <Action type="Delay" value="1"></Action>
+           
+              <!--2DUI-->
+              <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/CH4"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/CH4/Image"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/CH4/GanSheTiaoWen (1)"  isShow="false" ></Action>
+
+
+
+
+              <Action type="Delay" value="1"></Action>
+              
+              <Action type="Hint" value="2.测C02的方法:
+(1)、测定二氧化碳浓度时，将仪器进气口伸向距离底板200-300毫米，将待测气体吸入瓦斯室，读出下部的瓦斯数值，然后去掉二氧化碳吸收管，接入进气管，将进气口伸向下部，同一测点，捏放气球，5至7次 将待测气体吸入瓦斯室，读出下部的混合气体数值，读数下部混合气体数值减去下部瓦斯除以0.955，校正系数 就是要测定的二氧化碳数值
+用这样的方法
+连续测定三次 取最大值
+" time="-1" icon="false" audio="sound_14_4.mp3"></Action>
+
+
+
+              <Action type="Parallel">
+                <Action type="Move" value="FlyCamera" to="-17.24658,1.548376,3.219359" time="1"></Action>
+                <Action type="Rotate" value="FlyCamera" to="12.71251,146.5079,0" time="1"></Action>
+              </Action>
+
+              <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/HunHeQiTi"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/HunHeQiTi/Image"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/HunHeQiTi/GanSheTiaoWen (2)"  isShow="true" ></Action>
+              
+              <Action type="TimeLine" value="TimeLineManagers/guangxuewajiayi" isShow="true" finishedEvent="播放完毕"  isWait="true" frame="0" endFrame="542"></Action>
               <Action type="Delay" value="2"></Action>
 
+              <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/HunHeQiTi"  isShow="false" ></Action>
+
+
+
+              <Action type="Delay" value="1"></Action>
+
               <!--2DUI-->
               <Action type="Show" value="2DCanvas"  isShow="true" ></Action>
-              <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2"  isShow="true" ></Action>
-              <Action type="Show" value="2DCanvas/DuoCanShuQiTiCeDingQi"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2/CO2"  isShow="true" ></Action>
-              <Action type="Delay" value="3"></Action>
+              <Action type="Show" value="2DCanvas/Co2/CH4"  isShow="true" ></Action>
-              <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/Co2/GongShi"  isShow="true" ></Action>
-              <Action type="Delay" value="1"></Action>
+
-              <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/CH4"  isShow="true" ></Action>
-              <Action type="Show" value="2DCanvas/CO2"  isShow="true" ></Action>
 
 
 
@@ -769,20 +843,19 @@
               <Condition type="StrEvent" value="Input关闭"></Condition>
 
 
+              <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2/CO2"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2/CH4"  isShow="false" ></Action>
+              <Action type="Show" value="2DCanvas/Co2/GongShi"  isShow="false" ></Action>
+
+
+
 
               <Action type="Show" value="Main/Aim_Kuanggong"  isShow="true" ></Action>
 
-              <!--2DUI-->
-              <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/DuoCanShuQiTiCeDingQi"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/TianWenKuang"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/CH4"  isShow="false" ></Action>
-              <Action type="Show" value="2DCanvas/CO2"  isShow="false" ></Action>
-           
-
-              <Action type="Show" value="guangxuewajiayi_daoju"  isShow="false" ></Action>
               <Action type="Show" value="Kuanggong"  isShow="false" ></Action>
+              <Action type="Show" value="guangxuewajiayi_daoju"  isShow="false" ></Action>
               
               
               <Action type="Delay" value="1"></Action>
@@ -861,9 +934,10 @@
 
               <Action type="Show" value="2DCanvas"  isShow="true" ></Action>
               <Action type="Show" value="2DCanvas/ShiDuChaSuanBiaoParent"  isShow="true" ></Action>
-              <Action type="Show" value="2DCanvas/ShiDuChaSuanBiaoParent/ShiDuChaSuanBiao/查看完毕"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/ShiDuChaSuanBiaoParent/查看完毕"  isShow="true" ></Action>
+              <Action type="Show" value="2DCanvas/WenShiDu"  isShow="false" ></Action>
 
-              <Condition type="UIClick" value="2DCanvas/ShiDuChaSuanBiaoParent/ShiDuChaSuanBiao/查看完毕"></Condition>
+              <Condition type="UIClick" value="2DCanvas/ShiDuChaSuanBiaoParent/查看完毕"></Condition>
 
               <Action type="Show" value="2DCanvas"  isShow="false" ></Action>
               <Action type="Show" value="2DCanvas/ShiDuChaSuanBiaoParent"  isShow="false" ></Action>
@@ -922,7 +996,7 @@
             <Action type="Sequence">
 
 
-              <Action type="Hint" value="请获取“空盒气压表”检测大气压测定任务。根据右下角显示观察大气压、温度测试结果，左侧鉴定结果表，输入参数，计算大气压。" time="-1" icon="false" audio="sound_17.mp3"></Action>
+              <Action type="Hint" value="请获取“空盒气压表”检测大气压测定任务。根据右下角显示观察大气压、温度测试结果，左侧鉴定结果表，输入参数，计算大气压。" time="-1" icon="false" audio="sound_16.mp3"></Action>
 
 
               <Action type="Show" value="Main/Aim_Kuanggong"  isShow="true" ></Action>
@@ -1060,7 +1134,7 @@
 
 
               <Action type="Input" title="请根据右侧公式及检测结果，输入数据" finishedEvent="Input关闭">
-                <Input name="检测数据是否有效"  answer="0.38"  unit="n"></Input>
+                <Input name="检测数据是否有效"  answer="0.38"  unit=""></Input>
 
                 <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="-1"  scoreStepName="" rightScore="0" wrongScore="-1"></Btn>
 
@@ -1072,7 +1146,7 @@
               <Action type="Show" value="2DCanvas/ShuJu2"  isShow="true" ></Action>
 
               <Action type="Input" title="请根据右侧公式及检测结果，输入数据" finishedEvent="Input关闭">
-                <Input name="计算风表的平均读数"  answer="0.38"  unit="n"></Input>
+                <Input name="计算风表的平均读数"  answer="184"  unit=" m/min"></Input>
 
                 <Btn name="确定" clickEvent="确定点击" checkAnswer="true" wrongLabel="输入错误" wrongCount="3" autoHide="-1"  scoreStepName="" rightScore="0" wrongScore="-1"></Btn>
 
@@ -1135,7 +1209,7 @@
         </Finished>
       </Step>
 
-      <Step name="记录检测风速">
+      <!--<Step name="记录检测风速">
 
         <Reset>
           <Action type="Log" value="记录检测风速"></Action>
@@ -1149,7 +1223,7 @@
 
               <Action type="Show" value="Main/Aim_Kuanggong"  isShow="true" ></Action>
 
-              <!--身上-->
+              --><!--身上--><!--
               <Action type="Parallel">
                 <Action type="Move" value="FlyCamera" to="-15.9956,1.10296,2.6679" time="0"></Action>
                 <Action type="Rotate" value="FlyCamera" to="6.887899,357.4208,0" time="0"></Action>
@@ -1191,7 +1265,7 @@
 
           </Action>
         </Finished>
-      </Step>
+      </Step>-->
 
       <Step name="测量巷道断面">
         <Reset>
@@ -1416,11 +1490,16 @@
               <Action type="Anim" value="Aim_baibangbi"  animName="Take 001"   speed="1"></Action>
               <Action type="Show" value="Aim_baibangbi"  isShow="false" ></Action>
 
-              
+              <Action type="Parallel">
+                <Action type="Move" value="FlyCamera" to="-17.73656,1.317549,4.392062" time="0"></Action>
+                <Action type="Rotate" value="FlyCamera" to="345.9089,269.1187,-4.401304E-07" time="0"></Action>
+              </Action>
               
               <Action type="Show" value="Main/SM_changjing/SM_jilupai/CeFengPaiCanvas"  isShow="true" ></Action>
 
 
+
+              <Action type="Delay" value="4"></Action>
               <Action type="TipWindow" value="恭喜你完成矿井通风测风实验" btns="确定" ></Action>
               <Condition type="UIClick" value="UIRoot/PopUI/UITipWindow/Mask/Connnet/BtnContent/确定"></Condition>