Compare commits

..

No commits in common. "8945e0251193429f33a00c412bbd1b9819dab9a3" and "0a37b687234e0b9e070d4d85a3fd235c207bc20f" have entirely different histories.

14 changed files with 400 additions and 3016 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

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

View File

@ -1,167 +0,0 @@
fileFormatVersion: 2
guid: 1f36489cd909fd34f8097ecf0c0b6535
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: Take 001
takeName: Take 001
internalID: 1827226128182048838
firstFrame: 0
lastFrame: 660
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: model2
takeName: Take 001
internalID: 9067093048684652814
firstFrame: 250
lastFrame: 660
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: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 1
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -93,305 +93,6 @@ MonoBehaviour:
m_Markers:
m_Objects: []
m_PostPlaybackState: 3
--- !u!74 &-7745214711164580958
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded (2)
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 6.0833335
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, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 5.25
value: {x: 0, y: 0.000470303, z: 0.25548604}
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.0833335
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}
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
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 6.0833335
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:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 5.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.0833335
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}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 5.25
value: 0.000470303
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.0833335
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.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 5.25
value: 0.25548604
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 6.0833335
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}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 6.0833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 6.0833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 6.0833335
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 4
script: {fileID: 0}
flags: 16
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!74 &-7536996636017492966
AnimationClip:
m_ObjectHideFlags: 0
@ -1866,10 +1567,10 @@ MonoBehaviour:
m_Children: []
m_Clips:
- m_Version: 1
m_Start: 6.616666666666666
m_Start: 6.666666507720947
m_ClipIn: 0
m_Asset: {fileID: 7667134824031675993}
m_Duration: 0.38333333333333375
m_Duration: 0.33333349227905273
m_TimeScale: 1
m_ParentTrack: {fileID: -49496947828964615}
m_EaseInDuration: 0
@ -1956,54 +1657,12 @@ MonoBehaviour:
- {fileID: -7845717453089108669}
- {fileID: -854174282085908500}
- {fileID: -49496947828964615}
- {fileID: 4503033103306788703}
m_FixedDuration: 0
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 0
m_MarkerTrack: {fileID: 0}
--- !u!114 &4503033103306788703
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 (2)
m_EditorClassIdentifier:
m_Version: 3
m_AnimClip: {fileID: 0}
m_Locked: 0
m_Muted: 0
m_CustomPlayableFullTypename:
m_Curves: {fileID: 0}
m_Parent: {fileID: 11400000}
m_Children: []
m_Clips: []
m_Markers:
m_Objects: []
m_InfiniteClipPreExtrapolation: 1
m_InfiniteClipPostExtrapolation: 1
m_InfiniteClipOffsetPosition: {x: -0.021192933, y: 0.086529694, z: -0.05748604}
m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0}
m_InfiniteClipTimeOffset: 0
m_InfiniteClipRemoveOffset: 0
m_InfiniteClipApplyFootIK: 1
mInfiniteClipLoop: 0
m_MatchTargetFields: 63
m_Position: {x: 0, y: 0, z: 0}
m_EulerAngles: {x: 0, y: 0, z: 0}
m_AvatarMask: {fileID: 0}
m_ApplyAvatarMask: 1
m_TrackOffset: 0
m_InfiniteClip: {fileID: -7745214711164580958}
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 &7667134824031675993
MonoBehaviour:
m_ObjectHideFlags: 1

View File

@ -1120,13 +1120,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410703097}
serializedVersion: 2
m_LocalRotation: {x: 0.067409076, y: 0.93212664, z: -0.23583744, w: 0.26641446}
m_LocalPosition: {x: -2.186485, y: 0.6282445, z: 2.14972}
m_LocalRotation: {x: -0.047018472, y: -0.9505979, z: 0.24960603, w: -0.17846519}
m_LocalPosition: {x: 4.9638157, y: 1.1076417, z: 5.3075237}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 28.39701, y: 148.0988, z: 0.0004289864}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &431832983
GameObject:
m_ObjectHideFlags: 0
@ -3002,43 +3002,43 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalPosition.x
value: -1.9138
value: -1.9005
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalPosition.y
value: 0.4342
value: 0.4131
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalPosition.z
value: 1.9246
value: 1.833
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalRotation.w
value: 0.008057969
value: 0.025265403
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalRotation.x
value: 0.014939166
value: 0.010830942
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalRotation.y
value: 0.9997671
value: 0.98881066
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalRotation.z
value: 0.013324259
value: -0.1466213
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -1.513
value: 16.888
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 179.054
value: 177.197
objectReference: {fileID: 0}
- target: {fileID: 1201798746072054859, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 1.725
value: 0.839
objectReference: {fileID: 0}
- target: {fileID: 2165656982044914190, guid: 16422418462323b46a9747fe6c37b07e, type: 3}
propertyPath: m_Name

View File

@ -1235,14 +1235,6 @@ PrefabInstance:
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7555508464740591161, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7555508464740591161, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8963491973940207705, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
propertyPath: m_Layer
value: 0
@ -1263,20 +1255,12 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: -4468889280688846898, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
insertIndex: -1
addedObject: {fileID: 1017666891}
- targetCorrespondingSourceObject: {fileID: 5425961673389117785, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
insertIndex: -1
addedObject: {fileID: 896833819}
m_SourcePrefab: {fileID: 100100000, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
--- !u!4 &231415309 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
m_PrefabInstance: {fileID: 231415308}
m_PrefabAsset: {fileID: 0}
--- !u!1 &231415310 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5561563692192097937, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
m_PrefabInstance: {fileID: 231415308}
m_PrefabAsset: {fileID: 0}
--- !u!1 &236782222
GameObject:
m_ObjectHideFlags: 0
@ -1846,7 +1830,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &410703098
MonoBehaviour:
m_ObjectHideFlags: 0
@ -2082,7 +2066,6 @@ Transform:
- {fileID: 463232017}
- {fileID: 449196100}
- {fileID: 1358874128}
- {fileID: 6456523179286675631}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!320 &420813659
@ -2440,7 +2423,7 @@ PlayableDirector:
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: bc7c744c79c041542a1df036d75fb787, type: 2}
m_InitialState: 0
m_WrapMode: 2
m_WrapMode: 0
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
@ -2454,8 +2437,6 @@ PlayableDirector:
value: {fileID: 1017666891}
- key: {fileID: -49496947828964615, guid: bc7c744c79c041542a1df036d75fb787, type: 2}
value: {fileID: 313743725}
- key: {fileID: 4503033103306788703, guid: bc7c744c79c041542a1df036d75fb787, type: 2}
value: {fileID: 896833819}
m_ExposedReferences:
m_References: []
--- !u!1 &463232016
@ -2501,7 +2482,7 @@ PlayableDirector:
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 1f788bbc7e684b1488b8288838170a29, type: 2}
m_InitialState: 0
m_WrapMode: 2
m_WrapMode: 0
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
@ -3592,27 +3573,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 5425961673389117785, guid: 7119bae4be098d841b69e0f9b0fd8862, type: 3}
m_PrefabInstance: {fileID: 231415308}
m_PrefabAsset: {fileID: 0}
--- !u!95 &896833819
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 896833815}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &912812822 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -5858315802487390276, guid: 4871cd0ea9aeb53478d1c4b1b211862e, type: 3}
@ -3879,31 +3839,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -6830136907015206452, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 80.00001
value: 84.31667
objectReference: {fileID: 0}
- target: {fileID: -6830136907015206452, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
value: 3.8580933
objectReference: {fileID: 0}
- target: {fileID: -6830136907015206452, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
value: 3.8580933
objectReference: {fileID: 0}
- target: {fileID: -6706954822631256619, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: -5551885876589978449, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 59.999958
value: 75.5001
objectReference: {fileID: 0}
- target: {fileID: -5551885876589978449, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 1.2153277e-14
value: 180
objectReference: {fileID: 0}
- target: {fileID: -5551885876589978449, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -180
value: -3.865304e-14
objectReference: {fileID: 0}
- target: {fileID: -3058811824287631336, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
@ -3911,19 +3871,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -1217834644745445858, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0.000030517576
value: -15.500734
objectReference: {fileID: 0}
- target: {fileID: -1217834644745445858, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
value: -180
objectReference: {fileID: 0}
- target: {fileID: -1217834644745445858, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -0.000015258788
value: -9.412197e-15
objectReference: {fileID: 0}
- target: {fileID: -255661517562472173, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 53151528298143920, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
@ -3963,7 +3923,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2149825615728939174, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2161143040632363793, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -3987,7 +3947,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2223639932434330405, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_Animations.Array.size
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2223639932434330405, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_Animations.Array.data[0]
@ -3997,10 +3957,6 @@ PrefabInstance:
propertyPath: m_Animations.Array.data[1]
value:
objectReference: {fileID: -3291206362154003629, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
- target: {fileID: 2223639932434330405, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_Animations.Array.data[2]
value:
objectReference: {fileID: 9067093048684652814, guid: 1f36489cd909fd34f8097ecf0c0b6535, type: 3}
- target: {fileID: 2848897302081484682, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 55.000004
@ -4019,7 +3975,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8618293020486140444, guid: 59949d5c9d973eb4ea095ded63948a2d, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@ -8083,7 +8039,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 4871cd0ea9aeb53478d1c4b1b211862e, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1886113144484573860, guid: 4871cd0ea9aeb53478d1c4b1b211862e, type: 3}
propertyPath: m_IsActive
@ -8922,7 +8878,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8861649460245365644, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -8859541623285333456, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -11766,7 +11722,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -5928159659915560634, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -5925875387370403684, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -14450,7 +14406,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -3304099850075065765, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -3300821210899115708, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_IsActive
@ -15258,7 +15214,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -2611826552037425620, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -2609187170005552500, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -19046,7 +19002,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 925401450016971905, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 932100217011245578, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -19562,7 +19518,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1447472308302218430, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 1451261680659143538, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -20382,7 +20338,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2240576855126743647, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 2246184889656639832, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -23810,7 +23766,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5669886974142622812, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 5669933680578654031, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -27266,7 +27222,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8808724905853397882, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 8809837623754041373, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -27546,7 +27502,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 9048567297982776601, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 9050892574433130797, guid: b8caf5cbd80b0e041b1f74ab12bfa1dd, type: 3}
propertyPath: m_StaticEditorFlags
@ -27832,117 +27788,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8358821867656953960}
m_CullTransparentMesh: 1
--- !u!82 &1196870813350112021
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609457552687085756}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: c967447a8f88ed14481d7ada52d149c4, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.8
m_Pitch: 1
Loop: 1
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!4 &1200095548037091651
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309298658277630375}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.5977916, y: 1.3903271, z: 0.7775347}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6456523179286675631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!222 &1238855861392683419
CanvasRenderer:
m_ObjectHideFlags: 0
@ -27951,85 +27796,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3152773173969959210}
m_CullTransparentMesh: 1
--- !u!1 &1309298658277630375
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1200095548037091651}
- component: {fileID: 2160644647781788950}
- component: {fileID: 1617248386567228505}
m_Layer: 0
m_Name: Point Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!320 &1368314543322421744
PlayableDirector:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5638060980118646680}
m_Enabled: 1
serializedVersion: 3
m_PlayableAsset: {fileID: 11400000, guid: 9564ceabae7da9648958075210c96c88, type: 2}
m_InitialState: 1
m_WrapMode: 1
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_SceneBindings:
- key: {fileID: -4220247815011717670, guid: 9564ceabae7da9648958075210c96c88, type: 2}
value: {fileID: 7609457552687085756}
- key: {fileID: -2077947975410641636, guid: 9564ceabae7da9648958075210c96c88, type: 2}
value: {fileID: 231415310}
- key: {fileID: -3432610270953554089, guid: 9564ceabae7da9648958075210c96c88, type: 2}
value: {fileID: 1309298658277630375}
m_ExposedReferences:
m_References: []
--- !u!4 &1503344629060933760
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7609457552687085756}
serializedVersion: 2
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: 6456523179286675631}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1617248386567228505
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309298658277630375}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Version: 3
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_LightLayerMask: 1
m_RenderingLayers: 1
m_CustomShadowLayers: 0
m_ShadowLayerMask: 1
m_ShadowRenderingLayers: 1
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
--- !u!114 &1658214372911274646
MonoBehaviour:
m_ObjectHideFlags: 0
@ -28077,68 +27843,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!108 &2160644647781788950
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1309298658277630375}
m_Enabled: 1
serializedVersion: 10
m_Type: 2
m_Shape: 0
m_Color: {r: 1, g: 0.042452812, b: 0.17281453, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.02
m_NormalBias: 0.1
m_NearPlane: 0.1
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!224 &2446273557782528790
RectTransform:
m_ObjectHideFlags: 0
@ -28348,23 +28052,6 @@ RectTransform:
m_AnchoredPosition: {x: -295.83093, y: 248.12335}
m_SizeDelta: {x: 506.9719, y: 358.2467}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5638060980118646680
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6456523179286675631}
- component: {fileID: 1368314543322421744}
m_Layer: 0
m_Name: BaoJingTimeLine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!1 &6098573633241538738
GameObject:
m_ObjectHideFlags: 0
@ -28383,23 +28070,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &6456523179286675631
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5638060980118646680}
serializedVersion: 2
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: 1503344629060933760}
- {fileID: 1200095548037091651}
m_Father: {fileID: 420813658}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6475740721158373092
MonoBehaviour:
m_ObjectHideFlags: 0
@ -28498,23 +28168,6 @@ RectTransform:
m_AnchoredPosition: {x: -175, y: 261}
m_SizeDelta: {x: 500, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7609457552687085756
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1503344629060933760}
- component: {fileID: 1196870813350112021}
m_Layer: 0
m_Name: BaoJingAudioSource
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &7842609798623245554
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -60,10 +60,6 @@ public class TimeLineAction : IAction
public void OnExecute(float dt)
{
if (play!=null)
{
if (curEndFrame != -1 && play.time * fps >= curEndFrame)
{
play.time = curEndFrame / 24;
@ -73,7 +69,6 @@ public class TimeLineAction : IAction
if (play.state != PlayState.Playing)
{
Finished();
}
}
}

View File

@ -103,34 +103,34 @@
<Name>接地线</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/ChuXiuHuanXian_Collider</Path>
<Tip>接地线碰撞体</Tip>
</Device>
<Device>
<Name>法兰垫片碰撞体</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/FaLanDianPian_Collider</Path>
<Tip>法兰垫片碰撞体</Tip>
</Device>
<Device>
<Name>裂缝碰撞体</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/JianChaLieFeng_Collider</Path>
<Tip>裂缝碰撞体</Tip>
</Device>
<Device>
<Name>漏油碰撞体</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/JianChaLouQi_Collider</Path>
<Tip>漏油碰撞体</Tip>
</Device>
<Device>
<Name>螺丝松动碰撞体</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/LuoSiSongDong_Collider</Path>
<Tip>螺丝松动碰撞体</Tip>
</Device>
@ -155,8 +155,7 @@
<Action type="Show" value="Main/SM_ChuXiuHuanXian/SM_TongXian" isShow="false"></Action>
<Action type="Show" value="Main/SM_ChuXiuHuanXian/SM_WanYongBiao" isShow="false"></Action>
<Action type="Show" value="BaoJingTimeLine" isShow="true" isDevice="false"></Action>
<Action type="Var" name="法兰螺栓松动成功" value="0"></Action>
@ -551,18 +550,15 @@
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_DianHanJi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_JiaoMoJi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_CiFenJianCeYi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_HanBa" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_LieFeng" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_JianChaLieFeng/SM_ShenTouJi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Canvas" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Canvas/YingLiJianCeYi" isShow="true" isDevice="false"></Action>
<!--移动检测仪器,-->
<Action type="Move" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe/Bone001/Bone002/Bone003/Bone004/Bone005/Bone006/Bone007/Bone008/Bone009/Bone010/Bone011/Bone012/Bone013/Bone014/Bone015/Bone016/Bone017/Bone018/Bone019/Bone020/Bone021/Bone022/Bone023/Bone024/Bone025/Bone026/Bone027/Bone028" to="-2.606464,0.2357275,-0.3060141" time="0"></Action>
<Action type="Move" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe/Bone001/Bone002/Bone003/Bone004/Bone005/Bone006/Bone007/Bone008/Bone009/Bone010/Bone011/Bone012/Bone013/Bone014/Bone015/Bone016/Bone017/Bone018/Bone019/Bone020/Bone021/Bone022/Bone023/Bone024/Bone025/Bone026/Bone027/Bone028" to="-2.606494,0.2357305,-0.2572505" time="1"></Action>
<Action type="Move" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe/Bone001/Bone002/Bone003/Bone004/Bone005/Bone006/Bone007/Bone008/Bone009/Bone010/Bone011/Bone012/Bone013/Bone014/Bone015/Bone016/Bone017/Bone018/Bone019/Bone020/Bone021/Bone022/Bone023/Bone024/Bone025/Bone026/Bone027/Bone028" to="-2.606459,0.2357083,-0.329339" time="1"></Action>
<Action type="Move" value="Main/SM_JianChaLieFeng/SM_ChaoShengBoJianCe/Bone001/Bone002/Bone003/Bone004/Bone005/Bone006/Bone007/Bone008/Bone009/Bone010/Bone011/Bone012/Bone013/Bone014/Bone015/Bone016/Bone017/Bone018/Bone019/Bone020/Bone021/Bone022/Bone023/Bone024/Bone025/Bone026/Bone027/Bone028" to="-2.606464,0.2357275,-0.3060141" time="1"></Action>
<Action type="Delay" value="2"></Action>
@ -791,7 +787,7 @@
<Action type="Show" value="Main/Canvas2" isShow="true" isDevice="false"></Action>
<Action type="Show" value="BaoJingTimeLine" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_FaLanDianPian" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_FaLanDianPian/SM_KeRanQiTiJianCe" isShow="true" isDevice="false"></Action>

View File

@ -31,7 +31,28 @@
<Icon>gongju/18.png</Icon>
</Device>
<Device>
<Name>钢丝刷或砂纸</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_JianChaLieFeng/SM_JiaoMoJi</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/15.png</Icon>
</Device>
<Device>
<Name>铜制接地线或镀锌材料</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_JianChaLieFeng/SM_JiaoMoJi</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/16.png</Icon>
</Device>
<Device>
<Name>导电防腐涂料</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_JianChaLieFeng/SM_JiaoMoJi</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/17.png</Icon>
</Device>
<Device>
@ -155,28 +176,6 @@
<Icon>gongju/6.png</Icon>
</Device>
<Device>
<Name>钢丝刷或砂纸</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_ChuXiuHuanXian/SM_GangSiShua</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/15.png</Icon>
</Device>
<Device>
<Name>铜制接地线或镀锌材料</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_ChuXiuHuanXian/SM_TongXian</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/16.png</Icon>
</Device>
<Device>
<Name>导电防腐涂料</Name>
<HighLight color="255,0,0,255"/>
<Path>Main/SM_ChuXiuHuanXian/SM_DaoDianQi</Path>
<!--<Tip>扭矩扳手</Tip>-->
<Icon>gongju/17.png</Icon>
</Device>
<Device>
@ -246,8 +245,7 @@
<Action type="Show" value="Main/SM_FaLanDianPian" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_ChuXiuHuanXian" isShow="false" isDevice="false"></Action>
<Action type="Show" value="TimeLineManager/BaoJingTimeLine" isShow="true" isDevice="false"></Action>
@ -482,11 +480,8 @@
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_LuoSi" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SongDongLuoSi" isShow="false" isDevice="false"></Action>
<Action type="Anim" value="Main/SM_LuoSiSongDong" animName="model2" frame="0" ></Action>
<Action type="Anim" value="Main/SM_LuoSiSongDong" animName="model2" speed="1"></Action>
<Action type="Anim" value="Main/SM_LuoSiSongDong" animName="DongHua2" frame="0" ></Action>
<Action type="Anim" value="Main/SM_LuoSiSongDong" animName="DongHua2" speed="1"></Action>
<Action type="Delay" value="1"></Action>
@ -498,22 +493,14 @@
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_LuoSi" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SongDongLuoSi" isShow="false" isDevice="false"></Action>
<Action type="UIShow" value="UITextWindow" isShow="false"></Action>
<Action type="Delay" value="1"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_Chaoshengbojianceyi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_FangSongDianPian" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_LuoWenJiao" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_PuTongDianPian" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_LuoSi" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong/SM_LuoSi/SM_TaoTong" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SongDongLuoSi" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Main/SM_LuoSiSongDong" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Canvas" isShow="false" isDevice="false"></Action>
<Action type="Show" value="Canvas/NiuJuBanShou" isShow="false" isDevice="false"></Action>
@ -674,7 +661,7 @@
<Action type="UITools" devices="扭矩扳手,渗透剂,万用表,热成像仪,钢丝刷或砂纸,铜制接地线或镀锌材料,导电防腐涂料" answers="钢丝刷或砂纸,铜制接地线或镀锌材料,导电防腐涂料"
<Action type="UITools" devices="扭矩扳手,渗透剂,万用表,热成像仪,超声波检测仪器,钢丝刷或砂纸除锈,铜制接地线或镀锌材料,导电防腐涂料" answers="钢丝刷或砂纸除锈,铜制接地线或镀锌材料,导电防腐涂料"
setActive="true"
rightLabel="提示:器械选择正确。"
wrongLabel="提示:器械选择错误,\r\n当前模块中不需要该物品。"
@ -819,9 +806,7 @@
<Action type="Show" value="TimeLineManager/BaoJingTimeLine" isShow="false" isDevice="false"></Action>
<Action type="UIShow" value="UITextWindow" isShow="false"></Action>
@ -909,7 +894,7 @@
<Action type="Show" value="Main/SM_ChangJing/组005 (2)" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_ChangJing/组005 (3)" isShow="true" isDevice="false"></Action>
<Action type="Show" value="Main/SM_ChangJing/组004" isShow="false" isDevice="false"></Action>
<Action type="Delay" value="2"></Action>

View File

@ -13,7 +13,7 @@ PlayerSettings:
useOnDemandResources: 0
accelerometerFrequency: 60
companyName: DefaultCompany
productName: "\u5316\u5DE5\u88C5\u7F6E\u68C0\u4FEE_\u68C0\u4FEE\u51B3\u7B56\u8BAD\u7EC3"
productName: VirtualFramwork
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@ -137,7 +137,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.2
bundleVersion: 0.1
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0