diff --git a/Assets/ArtRes/Models/Device/计量柜/插排.fbx b/Assets/ArtRes/Models/Device/计量柜/插排.fbx
new file mode 100644
index 0000000..14d9dd7
Binary files /dev/null and b/Assets/ArtRes/Models/Device/计量柜/插排.fbx differ
diff --git a/Assets/ArtRes/Models/Device/计量柜/插排.fbx.meta b/Assets/ArtRes/Models/Device/计量柜/插排.fbx.meta
new file mode 100644
index 0000000..4cc0848
--- /dev/null
+++ b/Assets/ArtRes/Models/Device/计量柜/插排.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 50ee47915839b7f44886804e3e12f633
+ModelImporter:
+ serializedVersion: 21300
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 1
+ 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: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 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: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/ArtRes/Models/Device/计量柜/杂物.fbx b/Assets/ArtRes/Models/Device/计量柜/杂物.fbx
new file mode 100644
index 0000000..98bcc94
Binary files /dev/null and b/Assets/ArtRes/Models/Device/计量柜/杂物.fbx differ
diff --git a/Assets/ArtRes/Models/Device/计量柜/杂物.fbx.meta b/Assets/ArtRes/Models/Device/计量柜/杂物.fbx.meta
new file mode 100644
index 0000000..515272d
--- /dev/null
+++ b/Assets/ArtRes/Models/Device/计量柜/杂物.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 179a5688a95dfd44788db3e0947c79b0
+ModelImporter:
+ serializedVersion: 21300
+ internalIDToNameTable: []
+ externalObjects: {}
+ materials:
+ materialImportMode: 2
+ materialName: 0
+ materialSearch: 1
+ materialLocation: 1
+ animations:
+ legacyGenerateAnimations: 4
+ bakeSimulation: 0
+ resampleCurves: 1
+ optimizeGameObjects: 0
+ removeConstantScaleCurves: 1
+ 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: []
+ isReadable: 0
+ meshes:
+ lODScreenPercentages: []
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+ useSRGBMaterialColor: 1
+ sortHierarchyByName: 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: 2
+ humanoidOversampling: 1
+ avatarSetup: 0
+ addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+ remapMaterialsIfMaterialImportModeIsNone: 0
+ additionalBone: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/04_ToolMaterialScene.unity b/Assets/Scenes/04_ToolMaterialScene.unity
index a7df05d..a7d4e82 100644
--- a/Assets/Scenes/04_ToolMaterialScene.unity
+++ b/Assets/Scenes/04_ToolMaterialScene.unity
@@ -694,6 +694,10 @@ PrefabInstance:
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
+ - target: {fileID: 1342273091210630203, guid: fe4c1814d44af964c94c33808b704426, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: b9f45527b9d758746ba04747688797b6, type: 2}
- target: {fileID: 1711505207429034123, guid: fe4c1814d44af964c94c33808b704426, type: 3}
propertyPath: m_Layer
value: 6
diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity
index 253598c..8d2bfcb 100644
--- a/Assets/Scenes/05_LiveScene.unity
+++ b/Assets/Scenes/05_LiveScene.unity
@@ -249,296 +249,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &127937607
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 127937608}
- - component: {fileID: 127937613}
- - component: {fileID: 127937612}
- - component: {fileID: 127937611}
- - component: {fileID: 127937610}
- - component: {fileID: 127937609}
- m_Layer: 0
- m_Name: "\u63D2\u5EA7"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &127937608
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_LocalRotation: {x: 0.70710397, y: -0.001999557, z: -0.001999557, w: 0.70710397}
- m_LocalPosition: {x: -0.867, y: -0.388, z: -0.446}
- m_LocalScale: {x: 0.16087002, y: 0.16087, z: 0.16087002}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 192342790}
- m_Father: {fileID: 543450652271447145}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &127937609
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- profile: {fileID: 0}
- profileSync: 0
- camerasLayerMask:
- serializedVersion: 2
- m_Bits: 4294967295
- effectGroup: 0
- effectGroupLayer:
- serializedVersion: 2
- m_Bits: 4294967295
- effectNameFilter:
- combineMeshes: 0
- alphaCutOff: 0
- cullBackFaces: 1
- ignoreObjectVisibility: 0
- reflectionProbes: 0
- GPUInstancing: 1
- optimizeSkinnedMesh: 1
- depthClip: 0
- cameraDistanceFade: 0
- cameraDistanceFadeNear: 0
- cameraDistanceFadeFar: 1000
- normalsOption: 0
- ignore: 0
- _highlighted: 0
- fadeInDuration: 0
- fadeOutDuration: 0
- flipY: 0
- constantWidth: 1
- subMeshMask: -1
- overlay: 0
- overlayMode: 0
- overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
- overlayAnimationSpeed: 1
- overlayMinIntensity: 0.5
- overlayBlending: 1
- overlayTexture: {fileID: 0}
- overlayTextureUVSpace: 0
- overlayTextureScale: 1
- overlayVisibility: 0
- outline: 1
- outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
- outlineColorStyle: 0
- outlineGradient:
- serializedVersion: 2
- key0: {r: 1, g: 1, b: 1, a: 1}
- key1: {r: 1, g: 1, b: 1, a: 1}
- key2: {r: 0, g: 0, b: 0, a: 0}
- key3: {r: 0, g: 0, b: 0, a: 0}
- key4: {r: 0, g: 0, b: 0, a: 0}
- key5: {r: 0, g: 0, b: 0, a: 0}
- key6: {r: 0, g: 0, b: 0, a: 0}
- key7: {r: 0, g: 0, b: 0, a: 0}
- ctime0: 0
- ctime1: 65535
- ctime2: 0
- ctime3: 0
- ctime4: 0
- ctime5: 0
- ctime6: 0
- ctime7: 0
- atime0: 0
- atime1: 65535
- atime2: 0
- atime3: 0
- atime4: 0
- atime5: 0
- atime6: 0
- atime7: 0
- m_Mode: 0
- m_NumColorKeys: 2
- m_NumAlphaKeys: 2
- outlineGradientInLocalSpace: 0
- outlineWidth: 0.45
- outlineBlurPasses: 2
- outlineQuality: 3
- outlineEdgeMode: 0
- outlineEdgeThreshold: 0.995
- outlineDownsampling: 2
- outlineVisibility: 0
- glowBlendMode: 0
- outlineBlitDebug: 0
- outlineIndependent: 0
- outlineContourStyle: 0
- glow: 0.48
- glowWidth: 0.4
- glowQuality: 3
- glowBlurMethod: 0
- glowDownsampling: 2
- glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
- glowDithering: 1
- glowMagicNumber1: 0.75
- glowMagicNumber2: 0.5
- glowAnimationSpeed: 1
- glowVisibility: 0
- glowBlitDebug: 0
- glowBlendPasses: 1
- glowPasses:
- - offset: 4
- alpha: 0.1
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 3
- alpha: 0.2
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 2
- alpha: 0.3
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 1
- alpha: 0.4
- color: {r: 0.64, g: 1, b: 0, a: 1}
- glowIgnoreMask: 0
- innerGlow: 0
- innerGlowWidth: 1
- innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
- innerGlowBlendMode: 0
- innerGlowVisibility: 0
- targetFX: 0
- targetFXTexture: {fileID: 0}
- targetFXColor: {r: 1, g: 1, b: 1, a: 1}
- targetFXCenter: {fileID: 0}
- targetFXRotationSpeed: 50
- targetFXInitialScale: 4
- targetFXEndScale: 1.5
- targetFXScaleToRenderBounds: 1
- targetFXAlignToGround: 0
- targetFXFadePower: 32
- targetFXGroundMaxDistance: 10
- targetFXGroundLayerMask:
- serializedVersion: 2
- m_Bits: 4294967295
- targetFXTransitionDuration: 0.5
- targetFXStayDuration: 1.5
- targetFXVisibility: 1
- seeThrough: 2
- seeThroughOccluderMask:
- serializedVersion: 2
- m_Bits: 4294967295
- seeThroughOccluderThreshold: 0.3
- seeThroughOccluderMaskAccurate: 0
- seeThroughOccluderCheckInterval: 1
- seeThroughOccluderCheckIndividualObjects: 0
- seeThroughDepthOffset: 0
- seeThroughMaxDepth: 0
- seeThroughIntensity: 0.8
- seeThroughTintAlpha: 0.5
- seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
- seeThroughNoise: 1
- seeThroughBorder: 0
- seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
- seeThroughBorderOnly: 0
- seeThroughBorderWidth: 0.45
- seeThroughOrdered: 0
- seeThroughTexture: {fileID: 0}
- seeThroughTextureUVSpace: 0
- seeThroughTextureScale: 1
- rmsCount: 1
- hitFxInitialIntensity: 0
- hitFxMode: 0
- hitFxFadeOutDuration: 0.25
- hitFxColor: {r: 1, g: 1, b: 1, a: 1}
- hitFxRadius: 0.5
---- !u!114 &127937610
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fa45c24333cc9da47815471820b14336, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- triggerID: 5021
- triggerName: "\u63D2\u5EA7"
- _highlight: {fileID: 0}
- deviceType: 2
- testPosAndRot: {fileID: 192342790}
- hasElectricity: 1
---- !u!65 &127937611
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &127937612
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &127937613
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 127937607}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &159466233
PrefabInstance:
m_ObjectHideFlags: 0
@@ -619,14 +329,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 192342789}
- m_LocalRotation: {x: 0, y: -1, z: 0, w: 0}
- m_LocalPosition: {x: 0, y: 0, z: 0.477}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalRotation: {x: 0.70710397, y: 0.70710397, z: 0.001999229, w: -0.001999229}
+ m_LocalPosition: {x: 10.076, y: 2.745, z: -2.61}
+ m_LocalScale: {x: 1.3688501, y: 1.36885, z: 1.3688504}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 127937608}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180}
+ m_Father: {fileID: 1524570770}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 180.324, y: 0, z: -90}
--- !u!114 &199107786 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541081356017717, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -737,6 +447,7 @@ MonoBehaviour:
triggerName: "B_out_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -790,6 +501,7 @@ MonoBehaviour:
triggerName: "C_out_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -812,6 +524,7 @@ MonoBehaviour:
triggerName: "C_in_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -834,6 +547,7 @@ MonoBehaviour:
triggerName: "B_in_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -856,6 +570,7 @@ MonoBehaviour:
triggerName: "A_in_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -878,6 +593,7 @@ MonoBehaviour:
triggerName: "\u96F6_out_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -2084,6 +1800,279 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1001 &737359436
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 5626062447358651775}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.161129
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -0.37176514
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.011939526
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_Name
+ value: "\u6742\u7269"
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+--- !u!1 &737359437 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ m_PrefabInstance: {fileID: 737359436}
+ m_PrefabAsset: {fileID: 0}
+--- !u!4 &737359438 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 179a5688a95dfd44788db3e0947c79b0, type: 3}
+ m_PrefabInstance: {fileID: 737359436}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &737359439
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 737359437}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4df8ad3ae5d512b49b5c3d270a869164, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerID: 0
+ triggerName: "\u5783\u573E"
+ _highlight: {fileID: 0}
+ deviceType: 3
+ isMoving: 0
+--- !u!65 &737359440
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 737359437}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 0.45514667, y: 0.015491603, z: 0.1382751}
+ m_Center: {x: -0.16185479, y: 0.0014811191, z: 0.029187268}
+--- !u!114 &737359441
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 737359437}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ profile: {fileID: 0}
+ profileSync: 0
+ camerasLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ effectGroup: 0
+ effectGroupLayer:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ effectNameFilter:
+ combineMeshes: 0
+ alphaCutOff: 0
+ cullBackFaces: 1
+ ignoreObjectVisibility: 0
+ reflectionProbes: 0
+ GPUInstancing: 1
+ optimizeSkinnedMesh: 1
+ depthClip: 0
+ cameraDistanceFade: 0
+ cameraDistanceFadeNear: 0
+ cameraDistanceFadeFar: 1000
+ normalsOption: 0
+ ignore: 0
+ _highlighted: 0
+ fadeInDuration: 0
+ fadeOutDuration: 0
+ flipY: 0
+ constantWidth: 1
+ subMeshMask: -1
+ overlay: 0
+ overlayMode: 0
+ overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+ overlayAnimationSpeed: 1
+ overlayMinIntensity: 0.5
+ overlayBlending: 1
+ overlayTexture: {fileID: 0}
+ overlayTextureUVSpace: 0
+ overlayTextureScale: 1
+ overlayVisibility: 0
+ outline: 1
+ outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
+ outlineColorStyle: 0
+ outlineGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ outlineGradientInLocalSpace: 0
+ outlineWidth: 0.45
+ outlineBlurPasses: 2
+ outlineQuality: 3
+ outlineEdgeMode: 0
+ outlineEdgeThreshold: 0.995
+ outlineDownsampling: 2
+ outlineVisibility: 0
+ glowBlendMode: 0
+ outlineBlitDebug: 0
+ outlineIndependent: 0
+ outlineContourStyle: 0
+ glow: 0.48
+ glowWidth: 0.4
+ glowQuality: 3
+ glowBlurMethod: 0
+ glowDownsampling: 2
+ glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
+ glowDithering: 1
+ glowMagicNumber1: 0.75
+ glowMagicNumber2: 0.5
+ glowAnimationSpeed: 1
+ glowVisibility: 0
+ glowBlitDebug: 0
+ glowBlendPasses: 1
+ glowPasses:
+ - offset: 4
+ alpha: 0.1
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 3
+ alpha: 0.2
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 2
+ alpha: 0.3
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 1
+ alpha: 0.4
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ glowIgnoreMask: 0
+ innerGlow: 0
+ innerGlowWidth: 1
+ innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
+ innerGlowBlendMode: 0
+ innerGlowVisibility: 0
+ targetFX: 0
+ targetFXTexture: {fileID: 0}
+ targetFXColor: {r: 1, g: 1, b: 1, a: 1}
+ targetFXCenter: {fileID: 0}
+ targetFXRotationSpeed: 50
+ targetFXInitialScale: 4
+ targetFXEndScale: 1.5
+ targetFXScaleToRenderBounds: 1
+ targetFXAlignToGround: 0
+ targetFXFadePower: 32
+ targetFXGroundMaxDistance: 10
+ targetFXGroundLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ targetFXTransitionDuration: 0.5
+ targetFXStayDuration: 1.5
+ targetFXVisibility: 1
+ seeThrough: 2
+ seeThroughOccluderMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ seeThroughOccluderThreshold: 0.3
+ seeThroughOccluderMaskAccurate: 0
+ seeThroughOccluderCheckInterval: 1
+ seeThroughOccluderCheckIndividualObjects: 0
+ seeThroughDepthOffset: 0
+ seeThroughMaxDepth: 0
+ seeThroughIntensity: 0.8
+ seeThroughTintAlpha: 0.5
+ seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
+ seeThroughNoise: 1
+ seeThroughBorder: 0
+ seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
+ seeThroughBorderOnly: 0
+ seeThroughBorderWidth: 0.45
+ seeThroughOrdered: 0
+ seeThroughTexture: {fileID: 0}
+ seeThroughTextureUVSpace: 0
+ seeThroughTextureScale: 1
+ rmsCount: 22
+ hitFxInitialIntensity: 0
+ hitFxMode: 0
+ hitFxFadeOutDuration: 0.25
+ hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+ hitFxRadius: 0.5
--- !u!114 &753801115 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541081774396260, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -2705,6 +2694,7 @@ MonoBehaviour:
triggerName: "A_out_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -3184,293 +3174,6 @@ MonoBehaviour:
triggerName: "\u68C0\u67E5\u63A5\u7EBF"
_highlight: {fileID: 0}
isChecked: 0
---- !u!1 &991594635
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 991594636}
- - component: {fileID: 991594639}
- - component: {fileID: 991594638}
- - component: {fileID: 991594637}
- - component: {fileID: 991594640}
- - component: {fileID: 991594641}
- m_Layer: 0
- m_Name: "\u6742\u7269"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!4 &991594636
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.0183, y: -0.4259, z: 0}
- m_LocalScale: {x: 0.45012873, y: 0.16646269, z: 0.049781285}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 5626062447358651775}
- m_RootOrder: 7
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &991594637
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &991594638
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &991594639
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &991594640
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4df8ad3ae5d512b49b5c3d270a869164, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- triggerID: 0
- triggerName: "\u5783\u573E"
- _highlight: {fileID: 0}
- deviceType: 3
---- !u!114 &991594641
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 991594635}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- profile: {fileID: 0}
- profileSync: 0
- camerasLayerMask:
- serializedVersion: 2
- m_Bits: 4294967295
- effectGroup: 0
- effectGroupLayer:
- serializedVersion: 2
- m_Bits: 4294967295
- effectNameFilter:
- combineMeshes: 0
- alphaCutOff: 0
- cullBackFaces: 1
- ignoreObjectVisibility: 0
- reflectionProbes: 0
- GPUInstancing: 1
- optimizeSkinnedMesh: 1
- depthClip: 0
- cameraDistanceFade: 0
- cameraDistanceFadeNear: 0
- cameraDistanceFadeFar: 1000
- normalsOption: 0
- ignore: 0
- _highlighted: 0
- fadeInDuration: 0
- fadeOutDuration: 0
- flipY: 0
- constantWidth: 1
- subMeshMask: -1
- overlay: 0
- overlayMode: 0
- overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
- overlayAnimationSpeed: 1
- overlayMinIntensity: 0.5
- overlayBlending: 1
- overlayTexture: {fileID: 0}
- overlayTextureUVSpace: 0
- overlayTextureScale: 1
- overlayVisibility: 0
- outline: 1
- outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
- outlineColorStyle: 0
- outlineGradient:
- serializedVersion: 2
- key0: {r: 1, g: 1, b: 1, a: 1}
- key1: {r: 1, g: 1, b: 1, a: 1}
- key2: {r: 0, g: 0, b: 0, a: 0}
- key3: {r: 0, g: 0, b: 0, a: 0}
- key4: {r: 0, g: 0, b: 0, a: 0}
- key5: {r: 0, g: 0, b: 0, a: 0}
- key6: {r: 0, g: 0, b: 0, a: 0}
- key7: {r: 0, g: 0, b: 0, a: 0}
- ctime0: 0
- ctime1: 65535
- ctime2: 0
- ctime3: 0
- ctime4: 0
- ctime5: 0
- ctime6: 0
- ctime7: 0
- atime0: 0
- atime1: 65535
- atime2: 0
- atime3: 0
- atime4: 0
- atime5: 0
- atime6: 0
- atime7: 0
- m_Mode: 0
- m_NumColorKeys: 2
- m_NumAlphaKeys: 2
- outlineGradientInLocalSpace: 0
- outlineWidth: 0.45
- outlineBlurPasses: 2
- outlineQuality: 3
- outlineEdgeMode: 0
- outlineEdgeThreshold: 0.995
- outlineDownsampling: 2
- outlineVisibility: 0
- glowBlendMode: 0
- outlineBlitDebug: 0
- outlineIndependent: 0
- outlineContourStyle: 0
- glow: 0.48
- glowWidth: 0.4
- glowQuality: 3
- glowBlurMethod: 0
- glowDownsampling: 2
- glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
- glowDithering: 1
- glowMagicNumber1: 0.75
- glowMagicNumber2: 0.5
- glowAnimationSpeed: 1
- glowVisibility: 0
- glowBlitDebug: 0
- glowBlendPasses: 1
- glowPasses:
- - offset: 4
- alpha: 0.1
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 3
- alpha: 0.2
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 2
- alpha: 0.3
- color: {r: 0.64, g: 1, b: 0, a: 1}
- - offset: 1
- alpha: 0.4
- color: {r: 0.64, g: 1, b: 0, a: 1}
- glowIgnoreMask: 0
- innerGlow: 0
- innerGlowWidth: 1
- innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
- innerGlowBlendMode: 0
- innerGlowVisibility: 0
- targetFX: 0
- targetFXTexture: {fileID: 0}
- targetFXColor: {r: 1, g: 1, b: 1, a: 1}
- targetFXCenter: {fileID: 0}
- targetFXRotationSpeed: 50
- targetFXInitialScale: 4
- targetFXEndScale: 1.5
- targetFXScaleToRenderBounds: 1
- targetFXAlignToGround: 0
- targetFXFadePower: 32
- targetFXGroundMaxDistance: 10
- targetFXGroundLayerMask:
- serializedVersion: 2
- m_Bits: 4294967295
- targetFXTransitionDuration: 0.5
- targetFXStayDuration: 1.5
- targetFXVisibility: 1
- seeThrough: 2
- seeThroughOccluderMask:
- serializedVersion: 2
- m_Bits: 4294967295
- seeThroughOccluderThreshold: 0.3
- seeThroughOccluderMaskAccurate: 0
- seeThroughOccluderCheckInterval: 1
- seeThroughOccluderCheckIndividualObjects: 0
- seeThroughDepthOffset: 0
- seeThroughMaxDepth: 0
- seeThroughIntensity: 0.8
- seeThroughTintAlpha: 0.5
- seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
- seeThroughNoise: 1
- seeThroughBorder: 0
- seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
- seeThroughBorderOnly: 0
- seeThroughBorderWidth: 0.45
- seeThroughOrdered: 0
- seeThroughTexture: {fileID: 0}
- seeThroughTextureUVSpace: 0
- seeThroughTextureScale: 1
- rmsCount: 1
- hitFxInitialIntensity: 0
- hitFxMode: 0
- hitFxFadeOutDuration: 0.25
- hitFxColor: {r: 1, g: 1, b: 1, a: 1}
- hitFxRadius: 0.5
--- !u!1 &1065811548
GameObject:
m_ObjectHideFlags: 0
@@ -4010,6 +3713,7 @@ MonoBehaviour:
triggerName: "\u96F6_\u5730_\u7EBF"
_highlight: {fileID: 0}
toolType: 12
+ isMoving: 0
isConnected: 1
id:
screws:
@@ -4301,6 +4005,7 @@ MonoBehaviour:
triggerName: "\u67DC\u95E8"
_highlight: {fileID: 0}
deviceType: 1
+ isMoving: 0
testPosAndRot: {fileID: 248877667}
isOpen: 0
hasElectricity: 0
@@ -4555,6 +4260,285 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2399593117623680742, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
m_PrefabInstance: {fileID: 1501092961}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1524570769
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 543450652271447145}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.11752199
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.117522016
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1.2959061
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.0991821
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -0.57719517
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ propertyPath: m_Name
+ value: "\u63D2\u6392"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+--- !u!4 &1524570770 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ m_PrefabInstance: {fileID: 1524570769}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1524570771 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 50ee47915839b7f44886804e3e12f633, type: 3}
+ m_PrefabInstance: {fileID: 1524570769}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1524570772
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1524570771}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fa45c24333cc9da47815471820b14336, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ triggerID: 5021
+ triggerName: "\u63D2\u5EA7"
+ _highlight: {fileID: 0}
+ deviceType: 2
+ isMoving: 0
+ testPosAndRot: {fileID: 192342790}
+ hasElectricity: 1
+--- !u!114 &1524570773
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1524570771}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ profile: {fileID: 0}
+ profileSync: 0
+ camerasLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ effectGroup: 0
+ effectGroupLayer:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ effectNameFilter:
+ combineMeshes: 0
+ alphaCutOff: 0
+ cullBackFaces: 1
+ ignoreObjectVisibility: 0
+ reflectionProbes: 0
+ GPUInstancing: 1
+ optimizeSkinnedMesh: 1
+ depthClip: 0
+ cameraDistanceFade: 0
+ cameraDistanceFadeNear: 0
+ cameraDistanceFadeFar: 1000
+ normalsOption: 0
+ ignore: 0
+ _highlighted: 0
+ fadeInDuration: 0
+ fadeOutDuration: 0
+ flipY: 0
+ constantWidth: 1
+ subMeshMask: -1
+ overlay: 0
+ overlayMode: 0
+ overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
+ overlayAnimationSpeed: 1
+ overlayMinIntensity: 0.5
+ overlayBlending: 1
+ overlayTexture: {fileID: 0}
+ overlayTextureUVSpace: 0
+ overlayTextureScale: 1
+ overlayVisibility: 0
+ outline: 1
+ outlineColor: {r: 0.8080046, g: 1.6417967, b: 0.36961916, a: 1}
+ outlineColorStyle: 0
+ outlineGradient:
+ serializedVersion: 2
+ key0: {r: 1, g: 1, b: 1, a: 1}
+ key1: {r: 1, g: 1, b: 1, a: 1}
+ key2: {r: 0, g: 0, b: 0, a: 0}
+ key3: {r: 0, g: 0, b: 0, a: 0}
+ key4: {r: 0, g: 0, b: 0, a: 0}
+ key5: {r: 0, g: 0, b: 0, a: 0}
+ key6: {r: 0, g: 0, b: 0, a: 0}
+ key7: {r: 0, g: 0, b: 0, a: 0}
+ ctime0: 0
+ ctime1: 65535
+ ctime2: 0
+ ctime3: 0
+ ctime4: 0
+ ctime5: 0
+ ctime6: 0
+ ctime7: 0
+ atime0: 0
+ atime1: 65535
+ atime2: 0
+ atime3: 0
+ atime4: 0
+ atime5: 0
+ atime6: 0
+ atime7: 0
+ m_Mode: 0
+ m_NumColorKeys: 2
+ m_NumAlphaKeys: 2
+ outlineGradientInLocalSpace: 0
+ outlineWidth: 0.45
+ outlineBlurPasses: 2
+ outlineQuality: 3
+ outlineEdgeMode: 0
+ outlineEdgeThreshold: 0.995
+ outlineDownsampling: 2
+ outlineVisibility: 0
+ glowBlendMode: 0
+ outlineBlitDebug: 0
+ outlineIndependent: 0
+ outlineContourStyle: 0
+ glow: 0.48
+ glowWidth: 0.4
+ glowQuality: 3
+ glowBlurMethod: 0
+ glowDownsampling: 2
+ glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
+ glowDithering: 1
+ glowMagicNumber1: 0.75
+ glowMagicNumber2: 0.5
+ glowAnimationSpeed: 1
+ glowVisibility: 0
+ glowBlitDebug: 0
+ glowBlendPasses: 1
+ glowPasses:
+ - offset: 4
+ alpha: 0.1
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 3
+ alpha: 0.2
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 2
+ alpha: 0.3
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ - offset: 1
+ alpha: 0.4
+ color: {r: 0.64, g: 1, b: 0, a: 1}
+ glowIgnoreMask: 0
+ innerGlow: 0
+ innerGlowWidth: 1
+ innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
+ innerGlowBlendMode: 0
+ innerGlowVisibility: 0
+ targetFX: 0
+ targetFXTexture: {fileID: 0}
+ targetFXColor: {r: 1, g: 1, b: 1, a: 1}
+ targetFXCenter: {fileID: 0}
+ targetFXRotationSpeed: 50
+ targetFXInitialScale: 4
+ targetFXEndScale: 1.5
+ targetFXScaleToRenderBounds: 1
+ targetFXAlignToGround: 0
+ targetFXFadePower: 32
+ targetFXGroundMaxDistance: 10
+ targetFXGroundLayerMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ targetFXTransitionDuration: 0.5
+ targetFXStayDuration: 1.5
+ targetFXVisibility: 1
+ seeThrough: 2
+ seeThroughOccluderMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ seeThroughOccluderThreshold: 0.3
+ seeThroughOccluderMaskAccurate: 0
+ seeThroughOccluderCheckInterval: 1
+ seeThroughOccluderCheckIndividualObjects: 0
+ seeThroughDepthOffset: 0
+ seeThroughMaxDepth: 0
+ seeThroughIntensity: 0.8
+ seeThroughTintAlpha: 0.5
+ seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
+ seeThroughNoise: 1
+ seeThroughBorder: 0
+ seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
+ seeThroughBorderOnly: 0
+ seeThroughBorderWidth: 0.45
+ seeThroughOrdered: 0
+ seeThroughTexture: {fileID: 0}
+ seeThroughTextureUVSpace: 0
+ seeThroughTextureScale: 1
+ rmsCount: 4
+ hitFxInitialIntensity: 0
+ hitFxMode: 0
+ hitFxFadeOutDuration: 0.25
+ hitFxColor: {r: 1, g: 1, b: 1, a: 1}
+ hitFxRadius: 0.5
+--- !u!65 &1524570774
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1524570771}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1.8123904, y: 0.76510054, z: 0.27977157}
+ m_Center: {x: 9.83773, y: 2.9664605, z: -2.707079}
--- !u!114 &1566240508 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2576541079921355267, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
@@ -4832,7 +4816,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
meteringDevice: {fileID: 1566240508}
cabinetDoor: {fileID: 1462070149}
- socket: {fileID: 127937610}
+ socket: {fileID: 1524570772}
inSwitch: {fileID: 1763547787}
jieXian_lines:
- {fileID: 302277751}
@@ -4844,7 +4828,7 @@ MonoBehaviour:
- {fileID: 302277752}
- {fileID: 1352022184}
dianCollider: {fileID: 478648694}
- sundries: {fileID: 991594640}
+ sundries: {fileID: 737359439}
inSwitchScrews:
- {fileID: 1775693151}
- {fileID: 1577392988}
@@ -5747,7 +5731,7 @@ Transform:
- {fileID: 543450652554360468}
- {fileID: 6919098456697261524}
- {fileID: 5626062447358651775}
- - {fileID: 127937608}
+ - {fileID: 1524570770}
- {fileID: 1843008148}
- {fileID: 1065811549}
- {fileID: 478648693}
@@ -8501,7 +8485,7 @@ Transform:
- {fileID: 5523131528923806745}
- {fileID: 5307496774406750061}
- {fileID: 7177105353719849443}
- - {fileID: 991594636}
+ - {fileID: 737359438}
m_Father: {fileID: 543450652271447145}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
index 7240442..01e56f2 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
@@ -211,7 +211,8 @@ public class Device_3Phase4WireMeter : Device_Base
transform.localEulerAngles = Vector3.zero;
}).OnComplete(() =>
{
- LiveSceneManager.Instance.currentTool = null;
+ LiveSceneManager.Instance.OnCheckSubProcess(false);
+
Debug.Log("ܱѰװ");
CallScoreAction(true);
endAction?.Invoke();
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
index b929175..a6af7a9 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
@@ -31,6 +31,7 @@ public class Device_CabinetDoor : Device_Base
transform.DOLocalRotate(new Vector3(0, 0, 180), 3).OnComplete(() =>
{
isOpen = true;
+ int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
endAction?.Invoke();
});
});
@@ -46,16 +47,17 @@ public class Device_CabinetDoor : Device_Base
transform.Find("2/3").DOLocalRotate(new Vector3(0, 0, 0), 1).OnComplete(() =>
{
isOpen = false;
+ int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true));
endAction?.Invoke();
});
});
}
protected override void OnMDown()
{
- if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "")
+ if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "")
return;
- if ((triggerAction==null?0: triggerAction.Invoke(triggerName, true)) == 0)
+ if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, false)) == 0)
{
base.OnMDown();
if (isOpen)
@@ -82,7 +84,7 @@ public class Device_CabinetDoor : Device_Base
///
/// Źر״̬
///
- public void CloseState()
+ public void CloseState()
{
isOpen = false;
transform.localEulerAngles = Vector3.zero;
diff --git a/Assets/Scripts/CXX/Score/Score_1002.cs b/Assets/Scripts/CXX/Score/Score_1002.cs
index 21e480f..f278daa 100644
--- a/Assets/Scripts/CXX/Score/Score_1002.cs
+++ b/Assets/Scripts/CXX/Score/Score_1002.cs
@@ -133,6 +133,14 @@ public class Score_1002 : ScoreBase
steps[3002].SetScore(true);
}
}
+ else if(triggerName== "ѹƱȷϰť")
+ {
+ steps[3003].SetScore(true);
+ }
+ else if(triggerName== "װť")
+ {
+ steps[3004].SetScore(true);
+ }
else if (triggerName == "ֳť")
{
//Ƿ
diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs
index 7e19832..bc223d2 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@@ -87,7 +87,7 @@ public class Tool_Base : PermanentTriggerBase
///
/// ص
///
- public void ReBackHead()
+ public void ReBackHead(Action back=null)
{
isMoving = true;
transform.parent = Camera.main.transform;
@@ -98,6 +98,7 @@ public class Tool_Base : PermanentTriggerBase
transform.localEulerAngles = head_LocalEulerAnglesl;
isMoving = false;
endAction?.Invoke();
+ back?.Invoke();
});
}
}
diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
index 829bbc4..87c71d2 100644
--- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs
@@ -75,6 +75,7 @@ public class Tool_TestPen : Tool_Base
{
var tmp = ((Device_Socket)device_base);
//λƶ
+ base.startAction?.Invoke();
transform.parent = null;
transform.DORotate(tmp.testPosAndRot.eulerAngles, 0.5f);
transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() =>
@@ -83,6 +84,7 @@ public class Tool_TestPen : Tool_Base
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
+ base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
});
}
@@ -91,6 +93,7 @@ public class Tool_TestPen : Tool_Base
var tmp = ((Device_CabinetDoor)device_base);
//λƶ
+ base.startAction?.Invoke();
transform.parent = null;
transform.DOLocalRotate(tmp.testPosAndRot.localEulerAngles, 0.5f);
transform.DOMove(tmp.testPosAndRot.position, 1).OnComplete(() =>
@@ -99,6 +102,7 @@ public class Tool_TestPen : Tool_Base
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
int index = (triggerAction == null ? 0 : triggerAction.Invoke($"{triggerName}+{device_base.triggerName}", true));
+ base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{device_base.triggerName}");
});
}
@@ -125,6 +129,7 @@ public class Tool_TestPen : Tool_Base
Debug.Log("˿ ");
isFlicker = tmp.hasElectricity;
screem.materials[0].color = isFlicker ? Color.red : Color.white;
+ base.endAction?.Invoke();
base.CallScoreAction(null, $"{triggerName}+{tool_base.triggerName}");
});
}
diff --git a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
index ab9f553..e2ca51f 100644
--- a/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_WireStripper.cs
@@ -52,9 +52,11 @@ public class Tool_WireStripper : Tool_Base
//
device_Seal.Cut();
isMoving = false;
-
- ReBackHead();
- int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true));
+
+ ReBackHead(() =>
+ {
+ int result = (triggerAction == null ? 0 : triggerAction.Invoke(device_Seal.triggerName, true));
+ });
}
private void Update()
diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs
index b87f62d..63408ff 100644
--- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs
+++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs
@@ -88,9 +88,10 @@ public class LiveSceneManager : SingletonMono
}
}
- public void OnCheckSubProcess()
+ public void OnCheckSubProcess(bool ifdestroy=true)
{
tMDTips.gameObject.SetActive(false);
- Destroy(currentTool);
+ if (ifdestroy)
+ Destroy(currentTool);
}
}
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
index b1103a5..67eb541 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_InstallAndDismantleTicketPanel.cs
@@ -46,6 +46,7 @@ public class UI_InstallAndDismantleTicketPanel : BasePanel
Debug.Log(submit);
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
+ ScoreManager.instance.Check(triggerName, null);
//GameManager.ProcessMgr.CheckSubProcessSteps(GameManager.ProcessMgr.subProcessStepId);
GameManager.UIMgr.HidePanel();
}
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
index 1d02958..07af5e7 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs
@@ -35,6 +35,7 @@ public class UI_LowTensionWorkTicketPanel : BasePanel
case "ConfirmBtn":
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
+ ScoreManager.instance.Check(triggerName, null);
GameManager.UIMgr.HidePanel();
}
break;