diff --git a/Assets/Art/Timeline/检查套囊气密性1_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性1_TimeLine.playable index 280f7b3..19a6474 100644 --- a/Assets/Art/Timeline/检查套囊气密性1_TimeLine.playable +++ b/Assets/Art/Timeline/检查套囊气密性1_TimeLine.playable @@ -22,10 +22,10 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 8325176187999945119} - m_Duration: 5.833333333333333 + m_Duration: 5.791666666666667 m_TimeScale: 1 m_ParentTrack: {fileID: -7504829415244538606} m_EaseInDuration: 0 @@ -115,7 +115,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: -2446912991061947958} m_Duration: 5.791666666666667 @@ -181,7 +181,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 1 + m_PreExtrapolationTime: 0 m_DisplayName: Take 001 m_Markers: m_Objects: [] @@ -266,16 +266,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: {x: 0.000002980232, y: -0.000005008956, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: {x: 0.000002980232, y: -0.000005008956, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -293,15 +284,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 value: {x: 0, y: 0.3024, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -310,7 +292,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: {x: 0, y: 0.3024, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -319,7 +301,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 7.8333335 + time: 5.8 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -361,7 +343,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 7.8333335 + m_StopTime: 5.8 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -381,16 +363,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.000002980232 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: 0.000002980232 inSlope: 0 outSlope: 0 @@ -409,16 +382,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: -0.000005008956 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: -0.000005008956 inSlope: 0 outSlope: 0 @@ -437,16 +401,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -474,7 +429,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -483,16 +438,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8 value: 0 inSlope: 0 outSlope: 0 @@ -512,15 +458,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 value: 0.3024 inSlope: 0 outSlope: 0 @@ -529,7 +466,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 + time: 5.7833333 value: 0.3024 inSlope: 0 outSlope: 0 @@ -538,7 +475,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7.8333335 + time: 5.8 value: 0 inSlope: 0 outSlope: 0 @@ -566,7 +503,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.7833333 value: 0 inSlope: 0 outSlope: 0 @@ -575,16 +512,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable new file mode 100644 index 0000000..aaa648e --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable @@ -0,0 +1,301 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &-7644824480595151321 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.3024, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3024 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!114 &-4317082341121143337 +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(Clone)(Clone) + m_EditorClassIdentifier: +--- !u!114 &-2248534428663588428 +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: -4317082341121143337} + m_Duration: 0.05 + m_TimeScale: 1 + m_ParentTrack: {fileID: -2248534428663588428} + 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: 0 +--- !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: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60271\u51C6\u5907_TimeLine" + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: 4146237287399509269} + - {fileID: -2248534428663588428} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &4146237287399509269 +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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -0.714, y: 0.7786, z: 0.7311} + m_InfiniteClipOffsetEulerAngles: {x: 7.0167096e-15, y: 180, z: 7.0167096e-15} + 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: -7644824480595151321} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 diff --git a/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable.meta b/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable.meta new file mode 100644 index 0000000..cb421dc --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性1准备_TimeLine.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ec77bdfc21071b4e9bdad69f41fcd4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Timeline/检查套囊气密性2_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性2_TimeLine.playable index c5091b2..e6f96bd 100644 --- a/Assets/Art/Timeline/检查套囊气密性2_TimeLine.playable +++ b/Assets/Art/Timeline/检查套囊气密性2_TimeLine.playable @@ -86,7 +86,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 5667123389412346964} m_Duration: 5.833333333333333 @@ -175,16 +175,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: {x: 0.000002980232, y: -0.000005008956, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: {x: 0.000002980232, y: -0.000005008956, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -202,15 +193,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: -0.08859998} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 value: {x: 0, y: 0.2694, z: -0.08859998} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -219,7 +201,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: {x: 0, y: 0.2694, z: -0.08859998} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -228,7 +210,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: {x: 0, y: 0, z: -0.08859998} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -270,7 +252,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 7.8333335 + m_StopTime: 5.8333335 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -290,16 +272,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.000002980232 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0.000002980232 inSlope: 0 outSlope: 0 @@ -318,16 +291,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: -0.000005008956 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: -0.000005008956 inSlope: 0 outSlope: 0 @@ -346,16 +310,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0 inSlope: 0 outSlope: 0 @@ -383,7 +338,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.8166666 value: 0 inSlope: 0 outSlope: 0 @@ -392,16 +347,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: 0 inSlope: 0 outSlope: 0 @@ -421,15 +367,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 value: 0.2694 inSlope: 0 outSlope: 0 @@ -438,7 +375,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0.2694 inSlope: 0 outSlope: 0 @@ -447,7 +384,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: 0 inSlope: 0 outSlope: 0 @@ -475,7 +412,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.8166666 value: -0.08859998 inSlope: 0 outSlope: 0 @@ -484,16 +421,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: -0.08859998 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: -0.08859998 inSlope: 0 outSlope: 0 @@ -598,7 +526,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0.04166666666666602 m_ClipIn: 0 m_Asset: {fileID: 3048519096270299066} m_Duration: 5.791666666666667 @@ -664,7 +592,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 1 + m_PreExtrapolationTime: 0.04166666666666602 m_DisplayName: Take 001 m_Markers: m_Objects: [] diff --git a/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable new file mode 100644 index 0000000..00a1093 --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable @@ -0,0 +1,301 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5934500085910413366 +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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -0.714, y: 0.7786, z: 0.7311} + m_InfiniteClipOffsetEulerAngles: {x: 7.0167096e-15, y: 180, z: 7.0167096e-15} + 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: 8057928077866524862} + 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 &-4754423776711349908 +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: 932712776312946521} + m_Duration: 0.05 + m_TimeScale: 1 + m_ParentTrack: {fileID: -4754423776711349908} + 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: 0 +--- !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: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60272\u51C6\u5907_TimeLine" + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: -5934500085910413366} + - {fileID: -4754423776711349908} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &932712776312946521 +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(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: +--- !u!74 &8057928077866524862 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.2694, z: -0.08859998} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2694 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.08859998 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable.meta b/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable.meta new file mode 100644 index 0000000..a3edca9 --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性2准备_TimeLine.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8153f6167bcbd464285e6dfbedffaa57 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Timeline/检查套囊气密性3_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性3_TimeLine.playable index a22f893..bb508b1 100644 --- a/Assets/Art/Timeline/检查套囊气密性3_TimeLine.playable +++ b/Assets/Art/Timeline/检查套囊气密性3_TimeLine.playable @@ -59,16 +59,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: {x: 0.000002980232, y: -360, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: {x: 0.000002980232, y: -360, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -86,15 +77,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: -0.16679996} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 1 value: {x: 0, y: 0.24339998, z: -0.16679996} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -103,7 +85,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: {x: 0, y: 0.24339998, z: -0.16679996} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -112,7 +94,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: {x: 0, y: 0, z: -0.16679996} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -154,7 +136,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 7.8333335 + m_StopTime: 5.8333335 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -174,16 +156,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.000002980232 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0.000002980232 inSlope: 0 outSlope: 0 @@ -202,16 +175,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: -360 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: -360 inSlope: 0 outSlope: 0 @@ -230,16 +194,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0 inSlope: 0 outSlope: 0 @@ -267,7 +222,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.8166666 value: 0 inSlope: 0 outSlope: 0 @@ -276,16 +231,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: 0 inSlope: 0 outSlope: 0 @@ -305,15 +251,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 value: 0.24339998 inSlope: 0 outSlope: 0 @@ -322,7 +259,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 + time: 5.8166666 value: 0.24339998 inSlope: 0 outSlope: 0 @@ -331,7 +268,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: 0 inSlope: 0 outSlope: 0 @@ -359,7 +296,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 5.8166666 value: -0.16679996 inSlope: 0 outSlope: 0 @@ -368,16 +305,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 6.8333335 - value: -0.16679996 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 7.8333335 + time: 5.8333335 value: -0.16679996 inSlope: 0 outSlope: 0 @@ -448,7 +376,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 2740425150498434028} m_Duration: 5.833333333333333 @@ -598,7 +526,7 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 1 + m_Start: 0 m_ClipIn: 0 m_Asset: {fileID: 665232958884859199} m_Duration: 5.791666666666667 @@ -664,7 +592,7 @@ MonoBehaviour: m_PostExtrapolationMode: 1 m_PreExtrapolationMode: 1 m_PostExtrapolationTime: Infinity - m_PreExtrapolationTime: 1 + m_PreExtrapolationTime: 0 m_DisplayName: Take 001 m_Markers: m_Objects: [] diff --git a/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable b/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable new file mode 100644 index 0000000..cdaa9fb --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable @@ -0,0 +1,301 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4089477957008296142 +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(Clone)(Clone)(Clone)(Clone)(Clone)(Clone) + m_EditorClassIdentifier: +--- !u!74 &-293702444569347536 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.24339998, z: -0.16679996} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.24339998 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.16679996 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !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: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60273\u51C6\u5907_TimeLine" + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: 4920598136272061416} + - {fileID: 7675070019136373304} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &4920598136272061416 +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_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -0.714, y: 0.7786, z: 0.7311} + m_InfiniteClipOffsetEulerAngles: {x: 7.0167096e-15, y: 180, z: 7.0167096e-15} + 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: -293702444569347536} + 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 &7675070019136373304 +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: -4089477957008296142} + m_Duration: 0.05 + m_TimeScale: 1 + m_ParentTrack: {fileID: 7675070019136373304} + 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: 0 diff --git a/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable.meta b/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable.meta new file mode 100644 index 0000000..2104868 --- /dev/null +++ b/Assets/Art/Timeline/检查套囊气密性3准备_TimeLine.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e1f9dce8443c1e478a4123788633525 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/QiGuanChaGuan/ExcelData/Excel/BaseData.xlsx b/Assets/Resources/QiGuanChaGuan/ExcelData/Excel/BaseData.xlsx index 3c76e48..45b3df7 100644 Binary files a/Assets/Resources/QiGuanChaGuan/ExcelData/Excel/BaseData.xlsx and b/Assets/Resources/QiGuanChaGuan/ExcelData/Excel/BaseData.xlsx differ diff --git a/Assets/SenSorSystem/ZhuSheQi_10SenSor.cs b/Assets/SenSorSystem/ZhuSheQi_10SenSor.cs index 845c522..27e84dd 100644 --- a/Assets/SenSorSystem/ZhuSheQi_10SenSor.cs +++ b/Assets/SenSorSystem/ZhuSheQi_10SenSor.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO.Ports; using UnityEngine; using UnityEngine.UI; @@ -22,7 +23,7 @@ public class ZhuSheQi_10SenSor : Sensor transform.parent.GetComponent().SendFunction("+++"); } - public override void ReceiveData(string datas) + public override void ReceiveData(string datas, SerialPort sp = null) { base.ReceiveData(datas); if (!datas.Split('%')[0].Split("ID:")[1].Split(',')[0].Equals("ZSQ10")) return; diff --git a/Assets/SenSorSystem/ZhuSheQi_20SenSor.cs b/Assets/SenSorSystem/ZhuSheQi_20SenSor.cs index c7a0f23..8160647 100644 --- a/Assets/SenSorSystem/ZhuSheQi_20SenSor.cs +++ b/Assets/SenSorSystem/ZhuSheQi_20SenSor.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO.Ports; using UnityEngine; using UnityEngine.UI; @@ -25,7 +26,7 @@ public class ZhuSheQi_20SenSor : Sensor transform.parent.GetComponent().SendFunction("+++"); } - public override void ReceiveData(string datas) + public override void ReceiveData(string datas, SerialPort sp = null) { base.ReceiveData(datas); if (!datas.Split('%')[0].Split("ID:")[1].Split(',')[0].Equals("ZSQ20")) return; diff --git a/Assets/SenSorSystem/ZhuSheQi_5SenSor.cs b/Assets/SenSorSystem/ZhuSheQi_5SenSor.cs index 49163e1..125ba91 100644 --- a/Assets/SenSorSystem/ZhuSheQi_5SenSor.cs +++ b/Assets/SenSorSystem/ZhuSheQi_5SenSor.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.IO.Ports; using UnityEngine; using UnityEngine.UI; using ZXKFramework; @@ -24,7 +25,7 @@ public class ZhuSheQi_5SenSor : Sensor transform.parent.GetComponent().SendFunction("+++"); } - public override void ReceiveData(string datas) + public override void ReceiveData(string datas, SerialPort sp = null) { base.ReceiveData(datas); if (!datas.Split('%')[0].Split("ID:")[1].Split(',')[0].Equals("ZSQ5")) return; diff --git a/Assets/StreamingAssets/wakeupresource.jet b/Assets/StreamingAssets/wakeupresource.jet index fca8b39..d994790 100644 Binary files a/Assets/StreamingAssets/wakeupresource.jet and b/Assets/StreamingAssets/wakeupresource.jet differ diff --git a/Assets/Third/AI/Plugins/x86/msc.dll b/Assets/Third/AI/Plugins/x86/msc.dll index 7049e08..272f5ec 100644 Binary files a/Assets/Third/AI/Plugins/x86/msc.dll and b/Assets/Third/AI/Plugins/x86/msc.dll differ diff --git a/Assets/Third/AI/Plugins/x86_64/msc_x64.dll b/Assets/Third/AI/Plugins/x86_64/msc_x64.dll index 0926930..59e50ee 100644 Binary files a/Assets/Third/AI/Plugins/x86_64/msc_x64.dll and b/Assets/Third/AI/Plugins/x86_64/msc_x64.dll differ diff --git a/Assets/Third/AI/Scripts/TTS&&STT/ZXK/XunFeiWakeup.cs b/Assets/Third/AI/Scripts/TTS&&STT/ZXK/XunFeiWakeup.cs index d5e0166..72a19bb 100644 --- a/Assets/Third/AI/Scripts/TTS&&STT/ZXK/XunFeiWakeup.cs +++ b/Assets/Third/AI/Scripts/TTS&&STT/ZXK/XunFeiWakeup.cs @@ -15,7 +15,7 @@ using UnityThreadingUtils; public class XunFeiWakeup : MonoBehaviour { //ѴʣСС - private const string app_id = "appid=0b1fcc5f,word_dir= . ";//appid aiui.dllmsc.dllҪ + private const string app_id = "appid=03377640,word_dir= . ";//appid aiui.dllmsc.dllҪ private string qivw_session_begin_params/* = "ivw_threshold=0:1450,sst=wakeup,ivw_res_path =fo|" + (Application.streamingAssetsPath + "/wakeupresource.jet").Replace("/", "\\")*/; diff --git a/Assets/Third/SensorModule/Scripts/Sensor/Base/Sensor.cs b/Assets/Third/SensorModule/Scripts/Sensor/Base/Sensor.cs index c0e9bce..9740c3f 100644 --- a/Assets/Third/SensorModule/Scripts/Sensor/Base/Sensor.cs +++ b/Assets/Third/SensorModule/Scripts/Sensor/Base/Sensor.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.IO.Ports; using UnityEngine; /// /// @@ -20,7 +21,11 @@ public abstract class Sensor : MonoBehaviour if (!gameObject.activeSelf) return; Display(datas); } - + public virtual void ReceiveData(string datas, SerialPort sp = null) + { + if (!gameObject.activeSelf) return; + Display(datas); + } public virtual void Display(string datas) { diff --git a/Assets/Third/SensorModule/Scripts/Sensor/器官插管/QiGuanChaGuan_Sensor.cs b/Assets/Third/SensorModule/Scripts/Sensor/器官插管/QiGuanChaGuan_Sensor.cs index 19931a6..73eaa6a 100644 --- a/Assets/Third/SensorModule/Scripts/Sensor/器官插管/QiGuanChaGuan_Sensor.cs +++ b/Assets/Third/SensorModule/Scripts/Sensor/器官插管/QiGuanChaGuan_Sensor.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.IO.Ports; using UnityEngine; using UnityEngine.UI; @@ -20,7 +21,7 @@ public class QiGuanChaGuan_Sensor : Sensor public Text huiYan_Txt; public Text qiGuanDeep_Txt; - public override void ReceiveData(string datas) + public override void ReceiveData(string datas, SerialPort sp = null) { base.ReceiveData(datas); data = datas.Split("#")[1].Split("%")[0]; diff --git a/Assets/Third/SensorModule/Scripts/SensorManager.cs b/Assets/Third/SensorModule/Scripts/SensorManager.cs index c5ac85b..14df466 100644 --- a/Assets/Third/SensorModule/Scripts/SensorManager.cs +++ b/Assets/Third/SensorModule/Scripts/SensorManager.cs @@ -3,6 +3,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Data.SqlTypes; using System.IO.Ports; +using System.Linq; using System.Text; using System.Threading; //using UnityEditor.PackageManager.UI; @@ -12,14 +13,216 @@ using ZXKFramework; public class SensorManager : MonoBehaviour /*MonoSingleton*/ { + #region ޸ǰ߼ + //public enum DataType + //{ + // ַ, + // ֽ, + //} + //#region ڲ,Ҫ޸Ĵ벨 + //[Header("")] + //public string portName = "COM10"; + //[Header("")] + //public int baudRate = 115200; + //[Header("żУ")] + //private Parity parity = Parity.None; + //[Header("λ")] + //private int dataBits = 8; + //[Header("ֹͣλ")] + //private StopBits stopBits = StopBits.One; + //SerialPort sp = null; + //Thread dataReceiveThread; + //[Header("ݸʽ")] + //public DataType dataType; + //#endregion + //private Dictionary allSensor = new Dictionary(); + //StringBuilder sb = new StringBuilder(); + //private void Start() + //{ + // sp = new SerialPort(portName, baudRate, parity, dataBits, stopBits); + // foreach (Sensor s in GetComponentsInChildren()) + // { + // allSensor.TryAdd(s.GetType().Name, s); + // } + // switch (dataType) + // { + // case DataType.ֽ: + // dataReceiveThread = new Thread(new ThreadStart(DataReceiveBytesThread)); + // break; + // case DataType.ַ: + // dataReceiveThread = new Thread(new ThreadStart(DataReceiveStrThread)); + // break; + // } + // OpenPort(); + //} + ///// + ///// ֽ + ///// + //private void DataReceiveBytesThread() + //{ + // while (true) + // { + // if (sp != null && sp.IsOpen) + // { + // try + // { + // if (sp.BytesToRead > 0) + // { + // byte[] buffer = new byte[sp.BytesToRead]; + // sp.Read(buffer, 0, sp.BytesToRead); + // string receivedData = Encoding.Default.GetString(buffer); + // //Debug.Log(receivedData); + // UnityMainThreadDispatcher.Instance().Enqueue(() => + // { + // foreach (var s in allSensor) + // { + // s.Value.ReceiveData(receivedData); + // } + // }); + // } + // } + // catch (Exception) + // { + // Debug.Log("Ϣʧ"); + // } + // } + // Thread.Sleep(20); + // } + //} + + ///// + ///// ַ + ///// + //private void DataReceiveStrThread() + //{ + // while (true) + // { + // if (sp != null && sp.IsOpen) + // { + // try + // { + // if (sp.BytesToRead > 0) + // { + // sb.Append(sp.ReadExisting()); + // //this.ColorLog(GDLog.LogColorState.Blue, sp.ReadLine()); + // UnityMainThreadDispatcher.Instance().Enqueue(() => + // { + // foreach (var s in allSensor) + // { + // s.Value.ReceiveData(sb.ToString()); + // } + // sb.Clear(); + // }); + // } + // } + // catch (Exception) + // { + // Debug.Log("Ϣʧ"); + // } + // } + // Thread.Sleep(20); + // } + //} + ///// + ///// Ϣ + ///// + ///// + //public void SendFunction(string str) + //{ + // try + // { + // byte[] dataSend = Encoding.ASCII.GetBytes(str); + // if (sp != null && sp.IsOpen) + // { + // if (dataSend != null && dataSend.Length > 0) + // { + // sp.Write(dataSend, 0, dataSend.Length); + // Debug.Log("Ϣɹ" + str); + // } + // } + // } + // catch (Exception) + // { + // Debug.Log("Ϣʧܣ" + str); + // } + //} + ////ȡָ + //public T GetSensor() where T : Sensor + //{ + // try + // { + // string name = typeof(T).Name; + // if (!allSensor.ContainsKey(name)) + // { + // allSensor.TryAdd(name, GetComponentInChildren()); + // allSensor[name].Init(this); + // } + // //Debug.Log("ȡɹ"); + // return allSensor[name] as T; + // } + // catch (Exception) + // { + // Debug.Log("ȡʧ"); + // return null; + // } + //} + //#region ڿر + ////򿪴 + //public void OpenPort() + //{ + // try + // { + // if (!sp.IsOpen) + // { + // sp.Open(); + // dataReceiveThread.Start(); + // Debug.Log("ڴ򿪳ɹ"); + // } + // } + // catch (Exception) + // { + // Debug.Log("ڴʧ"); + // } + //} + + ////رմ + //public void ClosePort() + //{ + // try + // { + // sp.Close(); + // dataReceiveThread.Abort(); + // Debug.Log("ڹر"); + // } + // catch (Exception) + // { + // Debug.Log("ڹرʧ"); + // } + //} + //#endregion + + //#region Unity ˳ + //private void OnApplicationQuit() + //{ + // ClosePort(); + //} + //private void OnDisable() + //{ + // this.Log("Ϊʲôرˣ" + gameObject.name); + // ClosePort(); + //} + //#endregion + #endregion + public enum DataType { ַ, ֽ, } - #region ڲ,Ҫ޸Ĵ벨 - [Header("")] - public string portName = "COM10"; + + #region ڲ + //[Header("˿മʱԶȡ")] + //public string portName = "COM3"; [Header("")] public int baudRate = 115200; [Header("żУ")] @@ -28,38 +231,74 @@ public class SensorManager : MonoBehaviour /*MonoSingleton*/ private int dataBits = 8; [Header("ֹͣλ")] private StopBits stopBits = StopBits.One; - SerialPort sp = null; - Thread dataReceiveThread; [Header("ݸʽ")] public DataType dataType; #endregion + private Dictionary allSensor = new Dictionary(); - StringBuilder sb = new StringBuilder(); + List COMPorts = new List(); + List serialPorts = new List(); + List dataReceiveThreads = new List(); + // ߳״̬־ÿڶӦһ־ + private bool[] isThreadRunning; + private void Start() { - sp = new SerialPort(portName, baudRate, parity, dataBits, stopBits); + COMPorts = GetAllWindowsCOMPorts().ToList(); + + // ʼд + for (int i = 0; i < COMPorts.Count; i++) + { + SerialPort sp = new SerialPort(COMPorts[i], baudRate, parity, dataBits, stopBits); + serialPorts.Add(sp); + } + + // ʼ foreach (Sensor s in GetComponentsInChildren()) { allSensor.TryAdd(s.GetType().Name, s); } - switch (dataType) + + // ʼ̣߳󶨾崮ң + isThreadRunning = new bool[COMPorts.Count]; // ʼ־λ + for (int i = 0; i < COMPorts.Count; i++) { - case DataType.ֽ: - dataReceiveThread = new Thread(new ThreadStart(DataReceiveBytesThread)); - break; - case DataType.ַ: - dataReceiveThread = new Thread(new ThreadStart(DataReceiveStrThread)); - break; + isThreadRunning[i] = true; // Ĭ߳ + int portIndex = i; // ǰհ壩 + Thread thread; + + // ʹӦ̣߳󶨶˿ + switch (dataType) + { + case DataType.ֽ: + thread = new Thread(() => DataReceiveBytesThread(portIndex)); + break; + case DataType.ַ: + thread = new Thread(() => DataReceiveStrThread(portIndex)); + break; + default: + thread = null; + break; + } + + if (thread != null) + { + dataReceiveThreads.Add(thread); + } } + OpenPort(); } + /// - /// ֽ + /// ֽ̣߳󶨾崮 /// - private void DataReceiveBytesThread() + private void DataReceiveBytesThread(int portIndex) { - while (true) + // ѭ̱߳־λΪtrueЧ + while (isThreadRunning[portIndex] && portIndex < serialPorts.Count) { + SerialPort sp = serialPorts[portIndex]; if (sp != null && sp.IsOpen) { try @@ -67,34 +306,41 @@ public class SensorManager : MonoBehaviour /*MonoSingleton*/ if (sp.BytesToRead > 0) { byte[] buffer = new byte[sp.BytesToRead]; - sp.Read(buffer, 0, sp.BytesToRead); + sp.Read(buffer, 0, buffer.Length); string receivedData = Encoding.Default.GetString(buffer); - //Debug.Log(receivedData); + //Debug.Log($" {sp.PortName} ֽ{receivedData}"); + + // ̴߳ UnityMainThreadDispatcher.Instance().Enqueue(() => { - foreach (var s in allSensor) + foreach (var pair in allSensor) { - s.Value.ReceiveData(receivedData); + pair.Value.ReceiveData(receivedData, sp); } }); } } - catch (Exception) + catch (Exception ex) { - Debug.Log("Ϣʧ"); + Debug.Log($" {sp.PortName} ֽմ{ex.Message}"); } } - Thread.Sleep(20); + Thread.Sleep(10); // CPUռ } } /// - /// ַ + /// ַ̣߳󶨾崮 /// - private void DataReceiveStrThread() + private void DataReceiveStrThread(int portIndex) { - while (true) + // ÿ̶߳StringBuilder̳߳ͻ + StringBuilder sb = new StringBuilder(); + + // ѭ̱߳־λΪtrueЧ + while (isThreadRunning[portIndex] && portIndex < serialPorts.Count) { + SerialPort sp = serialPorts[portIndex]; if (sp != null && sp.IsOpen) { try @@ -102,49 +348,63 @@ public class SensorManager : MonoBehaviour /*MonoSingleton*/ if (sp.BytesToRead > 0) { sb.Append(sp.ReadExisting()); - //this.ColorLog(GDLog.LogColorState.Blue, sp.ReadLine()); + string receivedData = sb.ToString(); + UnityMainThreadDispatcher.Instance().Enqueue(() => { foreach (var s in allSensor) { - s.Value.ReceiveData(sb.ToString()); + try + { + //Debug.LogError(s.Value.name); + s.Value.ReceiveData(receivedData, sp); + + } + catch (Exception ex) + { + Debug.LogError($"ݴ{ex.Message}"); + } } sb.Clear(); }); } } - catch (Exception) + catch (Exception ex) { - Debug.Log("Ϣʧ"); + Debug.Log($" {sp.PortName} ַմ{ex.Message}"); } } - Thread.Sleep(20); + Thread.Sleep(10); // CPUռ } } + /// - /// Ϣ + /// ݵѴ򿪵Ĵ /// - /// public void SendFunction(string str) { try { byte[] dataSend = Encoding.ASCII.GetBytes(str); - if (sp != null && sp.IsOpen) + for (int i = 0; i < serialPorts.Count; i++) { - if (dataSend != null && dataSend.Length > 0) + SerialPort sp = serialPorts[i]; + if (sp != null && sp.IsOpen && dataSend != null && dataSend.Length > 0) { sp.Write(dataSend, 0, dataSend.Length); - Debug.Log("Ϣɹ" + str); + Debug.Log($"򴮿 {sp.PortName} ͳɹ{str}"); } } } - catch (Exception) + catch (Exception ex) { - Debug.Log("Ϣʧܣ" + str); + Debug.Log($"ʧܣ{ex.Message}ݣ{str}"); } } - //ȡָ + + /// + /// ȡָ͵Ĵ + /// public T GetSensor() where T : Sensor { try @@ -152,62 +412,130 @@ public class SensorManager : MonoBehaviour /*MonoSingleton*/ string name = typeof(T).Name; if (!allSensor.ContainsKey(name)) { - allSensor.TryAdd(name, GetComponentInChildren()); - allSensor[name].Init(this); + T sensor = GetComponentInChildren(); + if (sensor != null) + { + allSensor.TryAdd(name, sensor); + sensor.Init(this); + } } - //Debug.Log("ȡɹ"); + Debug.Log($"ȡ {typeof(T).Name} ɹ"); return allSensor[name] as T; } - catch (Exception) + catch (Exception ex) { - Debug.Log("ȡʧ"); + Debug.Log($"ȡ {typeof(T).Name} ʧܣ{ex.Message}"); return null; } } - #region ڿر - //򿪴 + + #region ڴ򿪹رտ + /// + /// дڲӦ߳ + /// public void OpenPort() { try { - if (!sp.IsOpen) + Debug.Log("ڴ򿪴..."); + for (int i = 0; i < serialPorts.Count; i++) { - sp.Open(); - dataReceiveThread.Start(); - Debug.Log("ڴ򿪳ɹ"); + SerialPort sp = serialPorts[i]; + if (sp != null && !sp.IsOpen) + { + sp.Open(); + Debug.Log($" {sp.PortName} 򿪳ɹ"); + } + + // Ӧ̣߳Чԣ + if (i < dataReceiveThreads.Count && dataReceiveThreads[i] != null && !dataReceiveThreads[i].IsAlive) + { + dataReceiveThreads[i].Start(); + } } } - catch (Exception) + catch (Exception ex) { - Debug.Log("ڴʧ"); + Debug.Log($"ڴʧܣ{ex.ToString()}"); } } - //رմ + /// + /// رдڲֹ̣ͣ߳ȫֹAbort + /// public void ClosePort() { - try + for (int i = 0; i < serialPorts.Count; i++) { - sp.Close(); - dataReceiveThread.Abort(); - Debug.Log("ڹر"); - } - catch (Exception) - { - Debug.Log("ڹرʧ"); + // 1. ֹ̣ͣ߳ͨ־λ + if (i < isThreadRunning.Length) + { + isThreadRunning[i] = false; // ֪ͨ߳˳ѭ + } + + // ȴֹ߳1룩 + if (i < dataReceiveThreads.Count && dataReceiveThreads[i] != null && dataReceiveThreads[i].IsAlive) + { + dataReceiveThreads[i].Join(1000); + dataReceiveThreads[i] = null; + } + + // 2. رմ + SerialPort sp = serialPorts[i]; + if (sp != null && sp.IsOpen) + { + try + { + sp.Close(); + Debug.Log($" {sp.PortName} رճɹ"); + } + catch (Exception ex) + { + Debug.Log($" {sp.PortName} رʧܣ{ex.ToString()}"); + } + serialPorts[i] = null; + } } } #endregion - #region Unity ˳ + #region Unity private void OnApplicationQuit() { ClosePort(); } + private void OnDisable() { - this.Log("Ϊʲôرˣ" + gameObject.name); ClosePort(); } + + /// + /// ȡWindowsڲ + /// + public string[] GetAllWindowsCOMPorts() + { + try + { + var ports = SerialPort.GetPortNames(); + // COM˿ں + Array.Sort(ports, (a, b) => + { + if (int.TryParse(a.Replace("COM", ""), out int numA) && + int.TryParse(b.Replace("COM", ""), out int numB)) + { + return numA.CompareTo(numB); + } + return string.Compare(a, b); + }); + return ports; + } + catch (Exception e) + { + Debug.LogError($"ȡʧܣ{e.Message}\n{e.StackTrace}"); + return Array.Empty(); + } + } #endregion + } \ No newline at end of file diff --git a/Assets/_Scenes/QiGuanChaGuan.unity b/Assets/_Scenes/QiGuanChaGuan.unity index e909f4a..adea28b 100644 --- a/Assets/_Scenes/QiGuanChaGuan.unity +++ b/Assets/_Scenes/QiGuanChaGuan.unity @@ -3632,7 +3632,7 @@ Transform: - {fileID: 186865151} - {fileID: 891346578} m_Father: {fileID: 44452962006405670} - m_RootOrder: 4 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &107424407 MonoBehaviour: @@ -7249,7 +7249,7 @@ Transform: - {fileID: 2136172482} - {fileID: 1561014674} m_Father: {fileID: 44452962006405670} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &218796950 MonoBehaviour: @@ -7431,6 +7431,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 09e256d788ec54468030f2a4eb6aa719 +--- !u!1 &228298948 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 228298949} + m_Layer: 8 + m_Name: Init + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &228298949 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 228298948} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 896444016} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &228723716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7585,6 +7616,53 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 16948260f19bcd41aeb500ecb1760e0d +--- !u!1 &236085891 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 236085892} + - component: {fileID: 236085893} + m_Layer: 8 + m_Name: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60273\u51C6\u5907_TimeLine" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &236085892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236085891} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1498745859} + - {fileID: 677031578} + m_Father: {fileID: 44452962006405670} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &236085893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 236085891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73e6573c7793f244a81c07ddef440979, type: 3} + m_Name: + m_EditorClassIdentifier: + playClip: {fileID: 0} --- !u!114 &237361892 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10503,7 +10581,7 @@ Transform: - {fileID: 278403625} - {fileID: 1802364077} m_Father: {fileID: 44452962006405670} - m_RootOrder: 10 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &323089899 MonoBehaviour: @@ -10871,7 +10949,7 @@ Transform: - {fileID: 1648039354} - {fileID: 1881627278} m_Father: {fileID: 44452962006405670} - m_RootOrder: 16 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &333793294 MonoBehaviour: @@ -12082,7 +12160,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1734952854} toggleTransition: 1 graphic: {fileID: 284459456} - m_Group: {fileID: 0} + m_Group: {fileID: 1011220781} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -16433,7 +16511,7 @@ Transform: - {fileID: 1691075474} - {fileID: 1676949578} m_Father: {fileID: 44452962006405670} - m_RootOrder: 13 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &448767559 MonoBehaviour: @@ -17074,6 +17152,53 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: f85bd1664acb004db4ab4b07757a9977 +--- !u!1 &475087952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 475087953} + - component: {fileID: 475087954} + m_Layer: 8 + m_Name: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60271\u51C6\u5907_TimeLine" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &475087953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475087952} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1070289799} + - {fileID: 869373529} + m_Father: {fileID: 44452962006405670} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &475087954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475087952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73e6573c7793f244a81c07ddef440979, type: 3} + m_Name: + m_EditorClassIdentifier: + playClip: {fileID: 0} --- !u!114 &475459395 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17483,7 +17608,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -85} + m_AnchoredPosition: {x: 1600, y: -85} m_SizeDelta: {x: 620, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &489169401 @@ -18338,6 +18463,65 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: bc0c182525b5bf4981caaeb18a70f2fa +--- !u!1 &520626635 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520626636} + - component: {fileID: 520626637} + m_Layer: 8 + m_Name: Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &520626636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520626635} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 896444016} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!320 &520626637 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520626635} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 8153f6167bcbd464285e6dfbedffaa57, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: -5982249025212050949, guid: d326f3b865cb4614aba37cf4dc9df807, type: 2} + value: {fileID: 864259280} + - key: {fileID: 292454390383033856, guid: d326f3b865cb4614aba37cf4dc9df807, type: 2} + value: {fileID: 864259279} + - key: {fileID: 8725023166645531334, guid: d326f3b865cb4614aba37cf4dc9df807, type: 2} + value: {fileID: 864259280} + - key: {fileID: -5934500085910413366, guid: 8153f6167bcbd464285e6dfbedffaa57, type: 2} + value: {fileID: 864259280} + - key: {fileID: -4754423776711349908, guid: 8153f6167bcbd464285e6dfbedffaa57, type: 2} + value: {fileID: 864259279} + m_ExposedReferences: + m_References: [] --- !u!114 &520844401 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19766,6 +19950,110 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: f5c7383bc3d71641af3fb1447ef821bf +--- !u!1 &568862698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 568862699} + - component: {fileID: 568862702} + - component: {fileID: 568862701} + - component: {fileID: 568862700} + m_Layer: 8 + m_Name: "10ml\u6CE8\u5C04\u5668UI" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &568862699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568862698} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1208547004} + m_Father: {fileID: 1144569945007948894} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 320, y: -245} + m_SizeDelta: {x: 620, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &568862700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568862698} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &568862701 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568862698} + m_CullTransparentMesh: 1 +--- !u!114 &568862702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568862698} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!114 &569087650 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22539,7 +22827,7 @@ Transform: - {fileID: 471195153} - {fileID: 1028727473} m_Father: {fileID: 44452962006405670} - m_RootOrder: 8 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &645105813 MonoBehaviour: @@ -30513,6 +30801,65 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: ce5108e90915214194351cc756abb068 +--- !u!1 &677031577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677031578} + - component: {fileID: 677031579} + m_Layer: 8 + m_Name: Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &677031578 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677031577} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 236085892} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!320 &677031579 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677031577} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 0e1f9dce8443c1e478a4123788633525, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: -8227244361023576068, guid: 77f47f96223614049be16567e6452732, type: 2} + value: {fileID: 1249564484} + - key: {fileID: -4550349156380354596, guid: 77f47f96223614049be16567e6452732, type: 2} + value: {fileID: 1249564483} + - key: {fileID: 3612153136603071539, guid: 77f47f96223614049be16567e6452732, type: 2} + value: {fileID: 1249564484} + - key: {fileID: 4920598136272061416, guid: 0e1f9dce8443c1e478a4123788633525, type: 2} + value: {fileID: 1249564484} + - key: {fileID: 7675070019136373304, guid: 0e1f9dce8443c1e478a4123788633525, type: 2} + value: {fileID: 1249564483} + m_ExposedReferences: + m_References: [] --- !u!1 &677386560 GameObject: m_ObjectHideFlags: 0 @@ -36484,7 +36831,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 351488854} toggleTransition: 1 graphic: {fileID: 2032067461} - m_Group: {fileID: 0} + m_Group: {fileID: 1728351998} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -37574,7 +37921,7 @@ Transform: - {fileID: 19079719} - {fileID: 1217576833} m_Father: {fileID: 44452962006405670} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &845841059 MonoBehaviour: @@ -37750,7 +38097,7 @@ Transform: - {fileID: 1794079047} - {fileID: 1459642565} m_Father: {fileID: 44452962006405670} - m_RootOrder: 15 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &850033224 MonoBehaviour: @@ -38267,7 +38614,7 @@ Transform: - {fileID: 1595505296} - {fileID: 559841730} m_Father: {fileID: 44452962006405670} - m_RootOrder: 14 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &865427189 MonoBehaviour: @@ -38373,6 +38720,65 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 53792fd9a4fb104e8d6842e4fbe2d350 +--- !u!1 &869373528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 869373529} + - component: {fileID: 869373530} + m_Layer: 8 + m_Name: Play + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &869373529 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869373528} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 475087953} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!320 &869373530 +PlayableDirector: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869373528} + m_Enabled: 1 + serializedVersion: 3 + m_PlayableAsset: {fileID: 11400000, guid: 8ec77bdfc21071b4e9bdad69f41fcd4f, type: 2} + m_InitialState: 0 + m_WrapMode: 2 + m_DirectorUpdateMode: 1 + m_InitialTime: 0 + m_SceneBindings: + - key: {fileID: 2165307508038125750, guid: e7684ef6588687d479149ba40096b74f, type: 2} + value: {fileID: 911372400} + - key: {fileID: -7504829415244538606, guid: e7684ef6588687d479149ba40096b74f, type: 2} + value: {fileID: 911372397} + - key: {fileID: -6097397151765531151, guid: e7684ef6588687d479149ba40096b74f, type: 2} + value: {fileID: 911372400} + - key: {fileID: 4146237287399509269, guid: 8ec77bdfc21071b4e9bdad69f41fcd4f, type: 2} + value: {fileID: 911372400} + - key: {fileID: -2248534428663588428, guid: 8ec77bdfc21071b4e9bdad69f41fcd4f, type: 2} + value: {fileID: 911372397} + m_ExposedReferences: + m_References: [] --- !u!114 &869567632 MonoBehaviour: m_ObjectHideFlags: 0 @@ -39048,6 +39454,53 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 810bf9d33f104048bcbdff4b173b7cdb +--- !u!1 &896444015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 896444016} + - component: {fileID: 896444017} + m_Layer: 8 + m_Name: "\u68C0\u67E5\u5957\u56CA\u6C14\u5BC6\u60272\u51C6\u5907_TimeLine" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &896444016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896444015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 228298949} + - {fileID: 520626636} + m_Father: {fileID: 44452962006405670} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &896444017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 896444015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73e6573c7793f244a81c07ddef440979, type: 3} + m_Name: + m_EditorClassIdentifier: + playClip: {fileID: 0} --- !u!114 &896743613 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52876,6 +53329,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 0e147fdbd956c248a449b91a7167873d +--- !u!1 &1070289798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1070289799} + m_Layer: 8 + m_Name: Init + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1070289799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1070289798} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 475087953} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1070519497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -54112,7 +54596,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2083218703} toggleTransition: 1 graphic: {fileID: 1036614010} - m_Group: {fileID: 0} + m_Group: {fileID: 1011220781} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -56924,7 +57408,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1366465797} toggleTransition: 1 graphic: {fileID: 1754873684} - m_Group: {fileID: 0} + m_Group: {fileID: 1728351998} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -57647,6 +58131,86 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 1f5351f262a2e045bb87832ed095c8cf +--- !u!1 &1208547001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1208547004} + - component: {fileID: 1208547003} + - component: {fileID: 1208547002} + m_Layer: 8 + m_Name: txt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1208547002 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208547001} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7A7F\u523A\u9488\u8FDB\u5EA6:{progressValue},X:{X},Y:{Y},Z:{Z}" +--- !u!222 &1208547003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208547001} + m_CullTransparentMesh: 1 +--- !u!224 &1208547004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208547001} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 568862699} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1212200619 MonoBehaviour: m_ObjectHideFlags: 0 @@ -58214,7 +58778,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 263331997} toggleTransition: 1 graphic: {fileID: 396121137} - m_Group: {fileID: 0} + m_Group: {fileID: 1011220781} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -60339,7 +60903,7 @@ Transform: - {fileID: 1251280854} - {fileID: 671499209} m_Father: {fileID: 44452962006405670} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1301928845 MonoBehaviour: @@ -61292,7 +61856,7 @@ Transform: - {fileID: 1708291296} - {fileID: 2072313074} m_Father: {fileID: 44452962006405670} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1324586808 MonoBehaviour: @@ -63862,7 +64426,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2027092145} toggleTransition: 1 graphic: {fileID: 144333393} - m_Group: {fileID: 0} + m_Group: {fileID: 1728351998} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -66031,6 +66595,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: c26b4533948fd4459a7c642d6710b1aa +--- !u!1 &1498745858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1498745859} + m_Layer: 8 + m_Name: Init + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1498745859 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498745858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 236085892} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1499040440 MonoBehaviour: m_ObjectHideFlags: 0 @@ -68238,7 +68833,7 @@ Transform: - {fileID: 1728138185} - {fileID: 1745502381} m_Father: {fileID: 44452962006405670} - m_RootOrder: 11 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1591820125 MonoBehaviour: @@ -70115,7 +70710,7 @@ Transform: - {fileID: 1175014117} - {fileID: 1427197184} m_Father: {fileID: 44452962006405670} - m_RootOrder: 6 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1648017131 MonoBehaviour: @@ -70469,6 +71064,53 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: 06cc994f310130439a592b5c841eea5b +--- !u!1 &1660633279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1660633280} + - component: {fileID: 1660633281} + m_Layer: 8 + m_Name: "10ml\u6CE8\u5C04\u5668_Sensor" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1660633280 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660633279} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1144569946378387086} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1660633281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1660633279} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6515ceb79208d2043abd8b8ae96b2915, type: 3} + m_Name: + m_EditorClassIdentifier: + progressValue: 0 + txt: {fileID: 1208547002} + isOpen: 0 --- !u!114 &1661308000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -75473,7 +76115,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1169959350} toggleTransition: 1 graphic: {fileID: 664098546} - m_Group: {fileID: 0} + m_Group: {fileID: 1011220781} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -76925,7 +77567,7 @@ Transform: - {fileID: 2081623366} - {fileID: 998861894} m_Father: {fileID: 44452962006405670} - m_RootOrder: 12 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1845872540 MonoBehaviour: @@ -83849,7 +84491,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1232633970} toggleTransition: 1 graphic: {fileID: 1316963108} - m_Group: {fileID: 0} + m_Group: {fileID: 1728351998} onValueChanged: m_PersistentCalls: m_Calls: [] @@ -83990,7 +84632,7 @@ Transform: - {fileID: 1032638784} - {fileID: 410530683} m_Father: {fileID: 44452962006405670} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2043300223 MonoBehaviour: @@ -87992,8 +88634,11 @@ Transform: m_Children: - {fileID: 899987584} - {fileID: 1483836933} + - {fileID: 475087953} - {fileID: 2043300222} + - {fileID: 896444016} - {fileID: 1324586807} + - {fileID: 236085892} - {fileID: 107424406} - {fileID: 845841058} - {fileID: 1648017130} @@ -93493,6 +94138,7 @@ RectTransform: - {fileID: 422583296} - {fileID: 1885311707} - {fileID: 489169400} + - {fileID: 568862699} m_Father: {fileID: 1144569945626746931} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -93793,7 +94439,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c58763dd2491d94c882310d382a6dfc, type: 3} m_Name: m_EditorClassIdentifier: - portName: COM13 baudRate: 115200 dataType: 1 --- !u!4 &1144569946378387086 @@ -93811,6 +94456,7 @@ Transform: - {fileID: 1144569945626746931} - {fileID: 34381057} - {fileID: 1841473862} + - {fileID: 1660633280} m_Father: {fileID: 44452962039568050} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_Scripts/Application/QiGuanChaGuan/FSMManager/State/JianChaTaoNangQiMiXingState.cs b/Assets/_Scripts/Application/QiGuanChaGuan/FSMManager/State/JianChaTaoNangQiMiXingState.cs index 860bfde..3b99be4 100644 --- a/Assets/_Scripts/Application/QiGuanChaGuan/FSMManager/State/JianChaTaoNangQiMiXingState.cs +++ b/Assets/_Scripts/Application/QiGuanChaGuan/FSMManager/State/JianChaTaoNangQiMiXingState.cs @@ -1,14 +1,38 @@ using FSM; +using Unity.VisualScripting.Antlr3.Runtime; using ZXKFramework; namespace DongWuYiXue.QiGuanChaGuan { public class JianChaTaoNangQiMiXingState : FsmState { + /// + /// һ + /// + bool isJianChaOne; + /// + /// ڶ + /// + bool isJianChaTwo; + /// + /// + /// + bool isJianChaThree; + + bool isZhuSheQiTui; + bool isZhuSheQiLa; + float tuiValue; + float laValue; + bool isOpen; public override void OnStateEnter() { base.OnStateEnter(); this.Log("״̬"); fsm.ShowCamera("_Camera"); + isJianChaOne = false; + isJianChaTwo = false; + isJianChaThree = false; + isZhuSheQiLa = false; + isZhuSheQiTui = false; if (fsm.main_gameModel.modeType == ModeType.KaoHe) { @@ -20,12 +44,12 @@ namespace DongWuYiXue.QiGuanChaGuan fsm.Light_EnableInteraction("5mlע"); fsm.Light("10mmܵ"); fsm.EnableInteraction("10ܵ"); - fsm.ShowArrow("ק5mlע", "5mlע"); + fsm.ShowArrow("ק10mlע", "5mlע"); fsm.ShowTipBtn(() => { - fsm.Light("10mmܵ",true); + fsm.Light("10mmܵ", true); fsm.Light_EnableInteraction("5mlע", true); - fsm.ShowArrow("ק5mlע", "5mlע", 0, 0, 5, true); + fsm.ShowArrow("ק10mlע", "5mlע", 0, 0, 5, true); }, 2); }); } @@ -37,100 +61,307 @@ namespace DongWuYiXue.QiGuanChaGuan fsm.Light_EnableInteraction("5mlע"); fsm.Light("10mmܵ"); fsm.EnableInteraction("10ܵ"); - fsm.ShowArrow("ק5mlע", "5mlע"); + fsm.ShowArrow("ק10mlע", "5mlע"); } fsm.InteractionTrigger("5mlע", c => { if (c.name.Equals("10ܵ")) { - if (fsm.main_gameModel.modeType == ModeType.ShiXun) + fsm.PlayClip("1׼_TimeLine", () => { - fsm.AddScore(2, 0); - } - if (fsm.main_gameModel.modeType == ModeType.KaoHe) - { - fsm.AddScore(4, 0); - } + isJianChaOne = true; + isZhuSheQiTui = true; + }); + //if (fsm.main_gameModel.modeType == ModeType.ShiXun) + //{ + // fsm.AddScore(2, 0); + //} + //if (fsm.main_gameModel.modeType == ModeType.KaoHe) + //{ + // fsm.AddScore(4, 0); + //} fsm.HideArrow(); fsm.Hide("5mlע"); fsm.DisableInteraction("10ܵ"); fsm.Unlight_DisableInteraction("5mlע"); fsm.Unlight("10mmܵ"); fsm.HideTipBtn(); - fsm.PlayClip("1_TimeLine", () => - { - fsm.Show("5mlע"); - fsm.Light_EnableInteraction("5mlע"); - fsm.Light("12mmܵ"); - fsm.EnableInteraction("12ܼܵ"); - fsm.ShowArrow("ק5mlע", "5mlע"); - fsm.ShowTipBtn(() => - { - this.Error("2222222222222222222"); - fsm.Light("12mmܵ", true); - fsm.Light_EnableInteraction("5mlע", true); - fsm.ShowArrow("ק5mlע", "5mlע", 0, 0, 5, true); - }, 2); - }); + //fsm.PlayClip("1_TimeLine", () => + //{ + // fsm.Show("5mlע"); + // fsm.Light_EnableInteraction("5mlע"); + // fsm.Light("12mmܵ"); + // fsm.EnableInteraction("12ܼܵ"); + // fsm.ShowArrow("ק10mlע", "5mlע"); + // fsm.ShowTipBtn(() => + // { + // this.Error("2222222222222222222"); + // fsm.Light("12mmܵ", true); + // fsm.Light_EnableInteraction("5mlע", true); + // fsm.ShowArrow("ק10mlע", "5mlע", 0, 0, 5, true); + // }, 2); + //}); } if (c.name.Equals("12ܼܵ")) { - if (fsm.main_gameModel.modeType == ModeType.ShiXun) + fsm.PlayClip("2׼_TimeLine", () => { - fsm.AddScore(2, 1); - } - if (fsm.main_gameModel.modeType == ModeType.KaoHe) - { - fsm.AddScore(4, 1); - } + isJianChaTwo = true; + isZhuSheQiTui = true; + }); + //if (fsm.main_gameModel.modeType == ModeType.ShiXun) + //{ + // fsm.AddScore(2, 1); + //} + //if (fsm.main_gameModel.modeType == ModeType.KaoHe) + //{ + // fsm.AddScore(4, 1); + //} fsm.HideArrow(); fsm.Hide("5mlע"); fsm.Unlight_DisableInteraction("5mlע"); fsm.Unlight("12mmܵ"); fsm.DisableInteraction("12ܼܵ"); fsm.HideTipBtn(); - fsm.PlayClip("2_TimeLine", () => - { - fsm.Show("5mlע"); - fsm.Light_EnableInteraction("5mlע"); - fsm.Light("14mmܵ"); - fsm.EnableInteraction("14ܼܵ"); - fsm.ShowArrow("ק5mlע", "5mlע"); - fsm.ShowTipBtn(() => - { - this.Error("33333333333333333"); - fsm.Light("14mmܵ", true); - fsm.Light_EnableInteraction("5mlע", true); - fsm.ShowArrow("ק5mlע", "5mlע", 0, 0, 5, true); - }, 2); - }); + //fsm.PlayClip("2_TimeLine", () => + //{ + // fsm.Show("5mlע"); + // fsm.Light_EnableInteraction("5mlע"); + // fsm.Light("14mmܵ"); + // fsm.EnableInteraction("14ܼܵ"); + // fsm.ShowArrow("ק10mlע", "5mlע"); + // fsm.ShowTipBtn(() => + // { + // this.Error("33333333333333333"); + // fsm.Light("14mmܵ", true); + // fsm.Light_EnableInteraction("5mlע", true); + // fsm.ShowArrow("ק10mlע", "5mlע", 0, 0, 5, true); + // }, 2); + //}); } if (c.name.Equals("14ܼܵ")) { - if (fsm.main_gameModel.modeType == ModeType.ShiXun) + fsm.PlayClip("3׼_TimeLine", () => { - fsm.AddScore(1, 2); - } - if (fsm.main_gameModel.modeType == ModeType.KaoHe) - { - fsm.AddScore(4, 2); - } + isJianChaThree = true; + isZhuSheQiTui = true; + }); + //if (fsm.main_gameModel.modeType == ModeType.ShiXun) + //{ + // fsm.AddScore(1, 2); + //} + //if (fsm.main_gameModel.modeType == ModeType.KaoHe) + //{ + // fsm.AddScore(4, 2); + //} fsm.HideArrow(); fsm.Hide("5mlע"); fsm.Unlight_DisableInteraction("5mlע"); fsm.Unlight("14mmܵ"); fsm.DisableInteraction("14ܼܵ"); fsm.HideTipBtn(); - fsm.PlayClip("3_TimeLine", () => - { - fsm.nextState = true; - }); + //fsm.PlayClip("3_TimeLine", () => + //{ + // fsm.nextState = true; + //}); } }); } public override void OnStateStay() { base.OnStateStay(); + if (isJianChaOne && isZhuSheQiTui) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue > 0.1f) + { + fsm.PlayClip("1_TimeLine", null, (1.0f - tuiValue) / 2); + } + else + { + isZhuSheQiTui = false; + isOpen = false; + isZhuSheQiLa = true; + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("1_TimeLine", null, (1.0f - tuiValue) / 2); + } + } + if (isJianChaOne && isZhuSheQiLa) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue < 1) + { + fsm.PlayClip("1_TimeLine", null, .5f + (tuiValue / 2)); + } + else + { + isJianChaOne = false; + isZhuSheQiLa = false; + isOpen = false; + + + + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(2, 0); + } + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.AddScore(4, 0); + } + fsm.Show("5mlע"); + fsm.Light_EnableInteraction("5mlע"); + fsm.Light("12mmܵ"); + fsm.EnableInteraction("12ܼܵ"); + fsm.ShowArrow("ק10mlע", "5mlע"); + fsm.ShowTipBtn(() => + { + this.Error("2222222222222222222"); + fsm.Light("12mmܵ", true); + fsm.Light_EnableInteraction("5mlע", true); + fsm.ShowArrow("ק10mlע", "5mlע", 0, 0, 5, true); + }, 2); + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("1_TimeLine", null, .5f + (tuiValue / 2)); + } + } + + if (isJianChaTwo && isZhuSheQiTui) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue > 0.1f) + { + fsm.PlayClip("2_TimeLine", null, (1.0f - tuiValue) / 2); + } + else + { + isZhuSheQiTui = false; + isOpen = false; + isZhuSheQiLa = true; + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("2_TimeLine", null, (1.0f - tuiValue) / 2); + } + } + if (isJianChaTwo && isZhuSheQiLa) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue < 1) + { + fsm.PlayClip("2_TimeLine", null, .5f + (tuiValue / 2)); + } + else + { + isJianChaTwo = false; + isZhuSheQiLa = false; + isOpen = false; + + + + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(2, 1); + } + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.AddScore(4, 1); + } + fsm.Show("5mlע"); + fsm.Light_EnableInteraction("5mlע"); + fsm.Light("14mmܵ"); + fsm.EnableInteraction("14ܼܵ"); + fsm.ShowArrow("ק10mlע", "5mlע"); + fsm.ShowTipBtn(() => + { + this.Error("33333333333333333"); + fsm.Light("14mmܵ", true); + fsm.Light_EnableInteraction("5mlע", true); + fsm.ShowArrow("ק10mlע", "5mlע", 0, 0, 5, true); + }, 2); + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("2_TimeLine", null, .5f + (tuiValue / 2)); + } + } + + if (isJianChaThree && isZhuSheQiTui) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue > 0.1f) + { + fsm.PlayClip("3_TimeLine", null, (1.0f - tuiValue) / 2); + } + else + { + isZhuSheQiTui = false; + isOpen = false; + isZhuSheQiLa = true; + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("3_TimeLine", null, (1.0f - tuiValue) / 2); + } + } + if (isJianChaThree && isZhuSheQiLa) + { + if (GameManager.Instance.senSor.GetSensor().isOpen) + { + isOpen = true; + tuiValue = GameManager.Instance.senSor.GetSensor().progressValue; + if (tuiValue < 1) + { + fsm.PlayClip("3_TimeLine", null, .5f + (tuiValue / 2)); + } + else + { + isJianChaThree = false; + isZhuSheQiLa = false; + isOpen = false; + + + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(1, 2); + } + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.AddScore(4, 2); + } + + fsm.nextState = true; + } + } + else if (!GameManager.Instance.senSor.GetSensor().isOpen && isOpen) + { + fsm.PlayClip("3_TimeLine", null, .5f + (tuiValue / 2)); + } + } } public override void OnStateExit() { diff --git a/Assets/_Scripts/Application/QiGuanChaGuan/UI/ChengJiPanel.cs b/Assets/_Scripts/Application/QiGuanChaGuan/UI/ChengJiPanel.cs index cd7a69b..0f4e659 100644 --- a/Assets/_Scripts/Application/QiGuanChaGuan/UI/ChengJiPanel.cs +++ b/Assets/_Scripts/Application/QiGuanChaGuan/UI/ChengJiPanel.cs @@ -14,6 +14,7 @@ namespace DongWuYiXue.QiGuanChaGuan CanvasRadarChart radar; //GameObject aiSpeak; //Text aiText; + int numID; public override string GroupName => "ChengJiPanel"; public override string Name => "ChengJiPanel"; public override void Init(IUIManager uictrl) @@ -35,18 +36,50 @@ namespace DongWuYiXue.QiGuanChaGuan } public void GeneSteps(List steps) { - for (int i = 0; i < steps.Count; i++) + numID = 0; + List listBaseData = GetModel().excelData.allBaseData; + + for (int i = 0; i < listBaseData.Count; i++) { - int seq = i + 1; - Step s = steps[i]; - GameObject obj = Instantiate(step, content); - obj.SetActive(true); - obj.transform.FindFirst("ID").text = seq.ToString(); - obj.transform.FindFirst("Name").text = s.stepName; - obj.transform.FindFirst("Type").text = s.stepType; - obj.transform.FindFirst("MaxScore").text = s.maxScore; - obj.transform.FindFirst("Score").text = s.score.ToString(); + numID++; + Step st = steps.Find(e => e.parentName == listBaseData[i].parentName && e.stepName == listBaseData[i].name); + if (st != null) + { + //Step s = steps[i]; + GameObject obj = Instantiate(step, content); + obj.SetActive(true); + obj.transform.FindFirst("ID").text = numID.ToString(); + obj.transform.FindFirst("Name").text = st.stepName; + obj.transform.FindFirst("Type").text = st.stepType; + obj.transform.FindFirst("MaxScore").text = st.maxScore; + obj.transform.FindFirst("Score").text = st.score.ToString(); + } + else + { + if (!string.IsNullOrEmpty(listBaseData[i].score_sx)) + { + GameObject obj = Instantiate(step, content); + obj.SetActive(true); + obj.transform.FindFirst("ID").text = numID.ToString(); + obj.transform.FindFirst("Name").text = listBaseData[i].name; + obj.transform.FindFirst("Type").text = listBaseData[i].type; + obj.transform.FindFirst("MaxScore").text = listBaseData[i].score_sx; + obj.transform.FindFirst("Score").text = ""; + } + } } + //for (int i = 0; i < steps.Count; i++) + //{ + // int seq = i + 1; + // Step s = steps[i]; + // GameObject obj = Instantiate(step, content); + // obj.SetActive(true); + // obj.transform.FindFirst("ID").text = seq.ToString(); + // obj.transform.FindFirst("Name").text = s.stepName; + // obj.transform.FindFirst("Type").text = s.stepType; + // obj.transform.FindFirst("MaxScore").text = s.maxScore; + // obj.transform.FindFirst("Score").text = s.score.ToString(); + //} } public void SetRadar() { diff --git a/Assets/犬气管插管场景/动画/检查套囊气密性/Aim_jianchaqiminxing.fbx.meta b/Assets/犬气管插管场景/动画/检查套囊气密性/Aim_jianchaqiminxing.fbx.meta index 0622845..c48fa07 100644 --- a/Assets/犬气管插管场景/动画/检查套囊气密性/Aim_jianchaqiminxing.fbx.meta +++ b/Assets/犬气管插管场景/动画/检查套囊气密性/Aim_jianchaqiminxing.fbx.meta @@ -6,6 +6,12 @@ ModelImporter: - first: 74: 1827226128182048838 second: Take 001 + - first: + 74: -7967672755436312595 + second: "\u63A8" + - first: + 74: -5963207947113137063 + second: "\u62C9" externalObjects: - first: type: UnityEngine:Material @@ -79,7 +85,94 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Take 001 + takeName: Take 001 + internalID: 0 + firstFrame: 1 + lastFrame: 140 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: "\u63A8" + takeName: Take 001 + internalID: 0 + firstFrame: 1 + lastFrame: 60 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: "\u62C9" + takeName: Take 001 + internalID: 0 + firstFrame: 80 + lastFrame: 140 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/log/ivw.log b/log/ivw.log new file mode 100644 index 0000000..89aa628 --- /dev/null +++ b/log/ivw.log @@ -0,0 +1,7 @@ +Log file created at: 2026/01/05 17:00:18 +Running on machine: ADMIN +Log line format: [IWEF]mmdd hh:mm:ss.mmm threadid: msg +E0105 17:00:18.982 19336:Res_mgr::Res_delete | res still been used, refCount = 1 resId = 119 resType = IVW_KEYWORD +E0105 17:00:18.983 19336:Error: ret= 60010 +E0105 17:00:18.983 19336:IvwInterfaceImp::wIvwResourceDelete | ResType = IVW_KEYWORD, ResID = 119, ret = 60010 +E0105 17:00:18.983 19336:Error: ret= 60010 diff --git a/msc/069ff7edfa99257b1e2ff25853437b0e/kivw.dat b/msc/069ff7edfa99257b1e2ff25853437b0e/kivw.dat new file mode 100644 index 0000000..14571d3 --- /dev/null +++ b/msc/069ff7edfa99257b1e2ff25853437b0e/kivw.dat @@ -0,0 +1,3 @@ +2026/01/05 18:31:57 +0177e44f97978b1f280261a64cf9e50c +^xuXIzG2$Qv~ iOΖI9q`Tkэ+@Wv