From b20fab1d5cd76d1bb34ce95261fb253e04a67435 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Wed, 21 Aug 2024 11:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameAssets/Materials/验电笔屏幕.mat | 132 +++ .../GameAssets/Materials/验电笔屏幕.mat.meta | 8 + .../Models/工具/Materials/验电笔_D.mat | 4 +- .../Prefabs/Objects/Tools/验电笔.prefab | 101 +- Assets/Scenes/05_LiveScene.unity | 964 +++++++++++++++++- Assets/Scripts/CXX/Devices/Device_Base.cs | 1 + .../CXX/Devices/计量柜/Device_CabinetDoor.cs | 9 +- .../CXX/Devices/计量柜/Device_Socket.cs | 5 + Assets/Scripts/CXX/Tools/Tool_Base.cs | 1 + Assets/Scripts/CXX/Tools/Tool_Screw.cs | 12 +- Assets/Scripts/CXX/Tools/Tool_TestPen.cs | 28 + 11 files changed, 1239 insertions(+), 26 deletions(-) create mode 100644 Assets/GameAssets/Materials/验电笔屏幕.mat create mode 100644 Assets/GameAssets/Materials/验电笔屏幕.mat.meta diff --git a/Assets/GameAssets/Materials/验电笔屏幕.mat b/Assets/GameAssets/Materials/验电笔屏幕.mat new file mode 100644 index 0000000..b7743ff --- /dev/null +++ b/Assets/GameAssets/Materials/验电笔屏幕.mat @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: "\u9A8C\u7535\u7B14\u5C4F\u5E55" + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossinessSource: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _SampleGI: 0 + - _Shininess: 0 + - _Smoothness: 0 + - _SmoothnessSource: 0 + - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 1367.1202, g: 1367.1202, b: 1367.1202, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &7252601533216176598 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/GameAssets/Materials/验电笔屏幕.mat.meta b/Assets/GameAssets/Materials/验电笔屏幕.mat.meta new file mode 100644 index 0000000..5760c8b --- /dev/null +++ b/Assets/GameAssets/Materials/验电笔屏幕.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f580bf4bce995264b8f780f3a239d3d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat b/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat index df5d0fc..69759a9 100644 --- a/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat +++ b/Assets/GameAssets/Models/工具/Materials/验电笔_D.mat @@ -203,7 +203,7 @@ Material: - _UVSec: 0 - _UseAoMap: 0 - _UseColorMap: 1 - - _UseEmissiveMap: 0 + - _UseEmissiveMap: 1 - _UseMetallicMap: 0 - _UseNormalMap: 0 - _UseRoughnessMap: 0 @@ -211,7 +211,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1} diff --git a/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab b/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab index b5496b7..104f7c6 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/验电笔.prefab @@ -235,7 +235,7 @@ MonoBehaviour: seeThroughTexture: {fileID: 0} seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 - rmsCount: 1 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 @@ -254,6 +254,105 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: toolType: 3 + screem: {fileID: 2465643204263011842} +--- !u!1 &6963989103699611485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 369494497360900419} + - component: {fileID: 7907263493084928653} + - component: {fileID: 2465643204263011842} + - component: {fileID: 5202113740305358043} + m_Layer: 0 + m_Name: screem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &369494497360900419 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6963989103699611485} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.00005, y: 0.00779, z: -0.015628} + m_LocalScale: {x: 0.013402447, y: 0.036170427, z: 0.22218} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2284156411273685982} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &7907263493084928653 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6963989103699611485} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2465643204263011842 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6963989103699611485} + m_Enabled: 1 + m_CastShadows: 0 + 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: f580bf4bce995264b8f780f3a239d3d1, 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!64 &5202113740305358043 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6963989103699611485} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1745229904814492725 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index ffd29a1..7fff0af 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -295,6 +295,68 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} +--- !u!1 &174907860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 174907861} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (5)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &174907861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 174907860} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2512615080652099258} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &363627258 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 363627259} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &363627259 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 363627258} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5005034008878831860} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &461888413 MonoBehaviour: m_ObjectHideFlags: 0 @@ -307,10 +369,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 toolType: 11 - id: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D2" + id: isInstall: 1 installPos: {fileID: 569815580} + hasElectricity: 0 --- !u!65 &461888414 BoxCollider: m_ObjectHideFlags: 0 @@ -355,6 +419,37 @@ Transform: m_Father: {fileID: 854447323} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &518629441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 518629442} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (8)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &518629442 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518629441} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6188379750967134744} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &537037209 MonoBehaviour: m_ObjectHideFlags: 0 @@ -367,6 +462,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b817d2af1a955fc40bcde4e10b3d3db4, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 7 isCut: 0 testPosAndRot: {fileID: 671244652} @@ -445,6 +541,68 @@ Transform: m_Father: {fileID: 772408090424556368} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &722641425 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 722641426} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &722641426 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 722641425} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2818445645679545286} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &745566541 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 745566542} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (7)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &745566542 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 745566541} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6335132133427796312} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &763732789 MonoBehaviour: m_ObjectHideFlags: 0 @@ -457,6 +615,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b817d2af1a955fc40bcde4e10b3d3db4, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 7 isCut: 0 testPosAndRot: {fileID: 1870915213} @@ -485,6 +644,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c33992bdd7946a45a5c38ce1a776e9b, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 6 isOpen: 0 isCheckOK: 0 @@ -502,6 +662,37 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3704420492699352537, guid: 3022de55b8046f04485b93331386de5f, type: 3} +--- !u!1 &798370971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798370972} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (6)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &798370972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798370971} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5947998414568147115} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &839453759 MonoBehaviour: m_ObjectHideFlags: 0 @@ -514,10 +705,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 toolType: 11 - id: "\u7535\u80FD\u8868\u76D6\u5B50\u56FA\u5B9A\u87BA\u4E1D1" + id: isInstall: 1 installPos: {fileID: 945203829} + hasElectricity: 0 --- !u!65 &839453760 BoxCollider: m_ObjectHideFlags: 0 @@ -642,8 +835,41 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fa45c24333cc9da47815471820b14336, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 2 testPosAndRot: {fileID: 489835678} + hasElectricity: 0 +--- !u!1 &877711205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 877711206} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (4)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &877711206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 877711205} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3012151823388690702} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &945203828 GameObject: m_ObjectHideFlags: 0 @@ -706,6 +932,37 @@ Transform: m_Father: {fileID: 5307496774079708624} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 120.993, y: 0, z: 0} +--- !u!1 &1032002449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1032002450} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (2)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1032002450 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1032002449} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5909821145515160780} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1063285401 GameObject: m_ObjectHideFlags: 0 @@ -738,6 +995,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b817d2af1a955fc40bcde4e10b3d3db4, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 7 isCut: 0 testPosAndRot: {fileID: 1605182329} @@ -820,6 +1078,227 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.01215125, y: 0.008852867, z: 0.027755147} m_Center: {x: 0.0000000041909516, y: -0.00000012479722, z: -0.000000058673308} +--- !u!1 &1121939183 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1121939184} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (11)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1121939184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1121939183} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7493674861726287250} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1229670287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1229670288} + - component: {fileID: 1229670291} + - component: {fileID: 1229670290} + - component: {fileID: 1229670289} + m_Layer: 0 + m_Name: "\u78B0\u649E (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1229670288 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229670287} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0001, y: 0.6293, z: -0.1034} + m_LocalScale: {x: 0.7870231, y: 1.0746504, z: 1.1886336} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 543450652062174932} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1229670289 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229670287} + 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 &1229670290 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229670287} + m_Enabled: 0 + 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 &1229670291 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1229670287} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1288299913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1288299914} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (3)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1288299914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1288299913} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 64141901573983753} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1530165943 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1530165944} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1530165944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1530165943} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3225610877961321162} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1570333641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1570333642} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1570333642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570333641} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1794869921580814865} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1605182328 GameObject: m_ObjectHideFlags: 0 @@ -863,6 +1342,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 983a202d77c30ac4bb8c9f6ba09e9ff6, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 0 meteringDevice: {fileID: 1671670085} cabinetDoor: {fileID: 1671670084} @@ -881,10 +1361,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3cd16809b5f7a5f4fbc9f6e63c91c9a4, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 1 testPosAndRot: {fileID: 1015865459} seal: {fileID: 1063285402} isOpen: 0 + hasElectricity: 0 --- !u!114 &1671670085 MonoBehaviour: m_ObjectHideFlags: 0 @@ -897,6 +1379,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6692d9c5c4f07d74cb7699776e6f2601, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 3 namePlate: {fileID: 1805486864} cover: {fileID: 773927538} @@ -920,6 +1403,103 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.76903045, y: 0.034294136, z: 0.5461323} m_Center: {x: -0.37510103, y: -0.0077329595, z: -0.21548603} +--- !u!1 &1731218813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1731218814} + - component: {fileID: 1731218817} + - component: {fileID: 1731218816} + - component: {fileID: 1731218815} + m_Layer: 0 + m_Name: "\u78B0\u649E" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1731218814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731218813} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0001, y: 1.9942, z: -0.1166} + m_LocalScale: {x: 0.7870231, y: 0.48404133, z: 1.1623452} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 543450652062174932} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1731218815 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731218813} + 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 &1731218816 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731218813} + m_Enabled: 0 + 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 &1731218817 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731218813} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1763494789 GameObject: m_ObjectHideFlags: 0 @@ -1085,6 +1665,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e83ad6c42a2ebf24191e9a0b21b2f7b5, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 4 isOpen: 1 --- !u!65 &1804658738 @@ -1112,6 +1693,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 38bce664bf9f7a64f80fee36b9b074ab, type: 3} m_Name: m_EditorClassIdentifier: + triggerId: 0 deviceType: 5 isChecked: 0 --- !u!65 &1805486865 @@ -1127,6 +1709,37 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.15025377, y: 0.008845331, z: 0.06858565} m_Center: {x: -0.06908764, y: -0.0010943713, z: 0.000019669538} +--- !u!1 &1829404698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1829404699} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (10)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1829404699 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1829404698} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5293166949573323979} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1870915212 GameObject: m_ObjectHideFlags: 0 @@ -1158,6 +1771,37 @@ Transform: m_Father: {fileID: 2087449995448212415} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &1944487945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1944487946} + m_Layer: 0 + m_Name: "\u4F4D\u7F6E (9)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1944487946 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1944487945} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.00231, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8122731532833999652} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!4 &1756217935758852 Transform: m_ObjectHideFlags: 0 @@ -1199,7 +1843,8 @@ Transform: m_LocalPosition: {x: 0.023730278, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1288299914} m_Father: {fileID: 6145003456572704199} m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1656,6 +2301,8 @@ Transform: - {fileID: 7750112672859949348} - {fileID: 5626062447685988290} - {fileID: 854447323} + - {fileID: 1731218814} + - {fileID: 1229670288} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} @@ -2166,6 +2813,7 @@ GameObject: - component: {fileID: 2512615080652099258} - component: {fileID: 2294993037708046159} - component: {fileID: 7095849712484482416} + - component: {fileID: 7095849712484482417} m_Layer: 0 m_Name: "B\u7535\u6D41out" m_TagString: Untagged @@ -2259,6 +2907,7 @@ GameObject: - component: {fileID: 2818445645679545286} - component: {fileID: 7494244260129161427} - component: {fileID: 8842637048811723123} + - component: {fileID: 8842637048811723124} m_Layer: 0 m_Name: "A\u7535\u6D41out" m_TagString: Untagged @@ -2602,6 +3251,7 @@ GameObject: - component: {fileID: 5909821145515160780} - component: {fileID: 3530979569148227264} - component: {fileID: 8751887912427893711} + - component: {fileID: 8751887912427893712} m_Layer: 0 m_Name: "B\u7535\u6D41in" m_TagString: Untagged @@ -2722,7 +3372,8 @@ Transform: m_LocalPosition: {x: 0.050171852, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1570333642} m_Father: {fileID: 6145003456572704199} m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2957,6 +3608,7 @@ GameObject: - component: {fileID: 7493674861726287250} - component: {fileID: 6322198022675040587} - component: {fileID: 6359558562048408677} + - component: {fileID: 7493674861726287251} m_Layer: 0 m_Name: "\u96F6\u7EBF" m_TagString: Untagged @@ -3248,7 +3900,8 @@ Transform: m_LocalPosition: {x: 0.006593704, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 174907861} m_Father: {fileID: 6145003456572704199} m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3389,6 +4042,7 @@ GameObject: - component: {fileID: 5293166949573323979} - component: {fileID: 3598530862508749082} - component: {fileID: 3666522094185323901} + - component: {fileID: 5293166949573323980} m_Layer: 0 m_Name: "\u96F6\u7EBF" m_TagString: Untagged @@ -3550,7 +4204,8 @@ Transform: m_LocalPosition: {x: 0.03305626, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 722641426} m_Father: {fileID: 6145003456572704199} m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3614,7 +4269,8 @@ Transform: m_LocalPosition: {x: 0.006593704, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 877711206} m_Father: {fileID: 6145003456572704199} m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3761,7 +4417,8 @@ Transform: m_LocalPosition: {x: 0.03305626, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1530165944} m_Father: {fileID: 6145003456572704199} m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4156,6 +4813,7 @@ GameObject: - component: {fileID: 6335132133427796312} - component: {fileID: 7174346404275032418} - component: {fileID: 2545653380687843012} + - component: {fileID: 7174346404275032419} m_Layer: 0 m_Name: "C\u7535\u6D41in" m_TagString: Untagged @@ -4465,6 +5123,7 @@ GameObject: - component: {fileID: 8122731532833999652} - component: {fileID: 8094023289198373714} - component: {fileID: 4510238575483524050} + - component: {fileID: 8122731532833999653} m_Layer: 0 m_Name: "C\u7535\u6D41out" m_TagString: Untagged @@ -4483,6 +5142,7 @@ GameObject: - component: {fileID: 5005034008878831860} - component: {fileID: 8537835020044797999} - component: {fileID: 8443824050148816558} + - component: {fileID: 8537835020044798000} m_Layer: 0 m_Name: "A\u7535\u6D41in" m_TagString: Untagged @@ -4600,6 +5260,7 @@ GameObject: - component: {fileID: 3012151823388690702} - component: {fileID: 3363605162611808878} - component: {fileID: 1199266520622378802} + - component: {fileID: 4332971475046259944} m_Layer: 0 m_Name: "B\u7535\u6D41out" m_TagString: Untagged @@ -4607,6 +5268,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &4332971475046259944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4332971475046259943} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 877711206} + hasElectricity: 0 --- !u!33 &4363831236856866205 MeshFilter: m_ObjectHideFlags: 0 @@ -5160,7 +5839,8 @@ Transform: m_LocalPosition: {x: 0.050171852, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 363627259} m_Father: {fileID: 6145003456572704199} m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5486,10 +6166,29 @@ Transform: m_LocalPosition: {x: -0.02950573, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1829404699} m_Father: {fileID: 6145003456572704199} m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5293166949573323980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2606796078834247355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1829404699} + hasElectricity: 0 --- !u!4 &5307496774079708624 Transform: m_ObjectHideFlags: 0 @@ -6010,7 +6709,8 @@ Transform: m_LocalPosition: {x: 0.023730278, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1032002450} m_Father: {fileID: 6145003456572704199} m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6025,7 +6725,8 @@ Transform: m_LocalPosition: {x: -0.0026082993, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 798370972} m_Father: {fileID: 6145003456572704199} m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6238,7 +6939,8 @@ Transform: m_LocalPosition: {x: -0.020115852, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 518629442} m_Father: {fileID: 6145003456572704199} m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6291,7 +6993,8 @@ Transform: m_LocalPosition: {x: -0.0026082993, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 745566542} m_Father: {fileID: 6145003456572704199} m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6405,6 +7108,7 @@ GameObject: - component: {fileID: 1794869921580814865} - component: {fileID: 8563063306112154398} - component: {fileID: 5021505886071767535} + - component: {fileID: 8563063306112154399} m_Layer: 0 m_Name: "A\u7535\u6D41in" m_TagString: Untagged @@ -7018,6 +7722,24 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7095849712484482417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1047510229849619753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 174907861} + hasElectricity: 0 --- !u!4 &7097330854520485981 Transform: m_ObjectHideFlags: 0 @@ -7145,6 +7867,24 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3744939431786361431} m_Mesh: {fileID: 6748839984939267033, guid: 3022de55b8046f04485b93331386de5f, type: 3} +--- !u!114 &7174346404275032419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3744939431786361431} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 745566542} + hasElectricity: 0 --- !u!1 &7175746191158924586 GameObject: m_ObjectHideFlags: 0 @@ -7227,6 +7967,7 @@ GameObject: - component: {fileID: 5947998414568147115} - component: {fileID: 3429855574120752360} - component: {fileID: 6341920670244410866} + - component: {fileID: 7203103480584630914} m_Layer: 0 m_Name: "C\u7535\u6D41in" m_TagString: Untagged @@ -7234,6 +7975,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &7203103480584630914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7203103480584630913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 798370972} + hasElectricity: 0 --- !u!33 &7257881920763869630 MeshFilter: m_ObjectHideFlags: 0 @@ -7309,6 +8068,7 @@ GameObject: - component: {fileID: 64141901573983753} - component: {fileID: 8333162739221818092} - component: {fileID: 2229436844603107480} + - component: {fileID: 8333162739221818093} m_Layer: 0 m_Name: "B\u7535\u6D41in" m_TagString: Untagged @@ -7400,10 +8160,29 @@ Transform: m_LocalPosition: {x: -0.02950573, y: 0.025690079, z: -0.10195017} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1121939184} m_Father: {fileID: 6145003456572704199} m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7493674861726287251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2171470279980484119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1121939184} + hasElectricity: 0 --- !u!33 &7494244260129161427 MeshFilter: m_ObjectHideFlags: 0 @@ -7470,7 +8249,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &7705170654348738780 GameObject: m_ObjectHideFlags: 0 @@ -7488,7 +8267,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!23 &7732219988922327866 MeshRenderer: m_ObjectHideFlags: 0 @@ -8054,7 +8833,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!33 &8094023289198373714 MeshFilter: m_ObjectHideFlags: 0 @@ -8074,10 +8853,29 @@ Transform: m_LocalPosition: {x: -0.020115852, y: 0.025690079, z: -0.09305191} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1944487946} m_Father: {fileID: 6145003456572704199} m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8122731532833999653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4216377887334399671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1944487946} + hasElectricity: 0 --- !u!33 &8169427942326321448 MeshFilter: m_ObjectHideFlags: 0 @@ -8174,6 +8972,24 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7324254124417991030} m_Mesh: {fileID: 6807742368604913228, guid: 3022de55b8046f04485b93331386de5f, type: 3} +--- !u!114 &8333162739221818093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7324254124417991030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1288299914} + hasElectricity: 0 --- !u!23 &8443824050148816558 MeshRenderer: m_ObjectHideFlags: 0 @@ -8334,6 +9150,24 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4221884087405304980} m_Mesh: {fileID: 4464993752703990665, guid: 3022de55b8046f04485b93331386de5f, type: 3} +--- !u!114 &8537835020044798000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4221884087405304980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 363627259} + hasElectricity: 0 --- !u!23 &8546459779746594969 MeshRenderer: m_ObjectHideFlags: 0 @@ -8399,6 +9233,24 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6387489868320808604} m_Mesh: {fileID: -1026966618304650087, guid: 3022de55b8046f04485b93331386de5f, type: 3} +--- !u!114 &8563063306112154399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6387489868320808604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1570333642} + hasElectricity: 0 --- !u!4 &8636386138143834533 Transform: m_ObjectHideFlags: 0 @@ -8473,6 +9325,7 @@ GameObject: - component: {fileID: 6188379750967134744} - component: {fileID: 1347883638006339615} - component: {fileID: 7924866699719489630} + - component: {fileID: 8691550601314123969} m_Layer: 0 m_Name: "C\u7535\u6D41out" m_TagString: Untagged @@ -8480,6 +9333,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &8691550601314123969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8691550601314123968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 518629442} + hasElectricity: 0 --- !u!23 &8702299644830148485 MeshRenderer: m_ObjectHideFlags: 0 @@ -8564,6 +9435,24 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8751887912427893712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708258146087718748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1032002450} + hasElectricity: 0 --- !u!33 &8757025351659244606 MeshFilter: m_ObjectHideFlags: 0 @@ -8672,6 +9561,24 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8842637048811723124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176049965639434734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 722641426} + hasElectricity: 0 --- !u!23 &8893705850291517468 MeshRenderer: m_ObjectHideFlags: 0 @@ -9121,6 +10028,7 @@ GameObject: - component: {fileID: 3225610877961321162} - component: {fileID: 173150601871308194} - component: {fileID: 4095476806891023579} + - component: {fileID: 9151695887737847780} m_Layer: 0 m_Name: "A\u7535\u6D41out" m_TagString: Untagged @@ -9128,6 +10036,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!114 &9151695887737847780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9151695887737847779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3} + m_Name: + m_EditorClassIdentifier: + triggerId: 0 + toolType: 11 + id: + isInstall: 1 + installPos: {fileID: 1530165944} + hasElectricity: 0 --- !u!4 &9154388617798714763 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CXX/Devices/Device_Base.cs b/Assets/Scripts/CXX/Devices/Device_Base.cs index 6ba03c9..843ef84 100644 --- a/Assets/Scripts/CXX/Devices/Device_Base.cs +++ b/Assets/Scripts/CXX/Devices/Device_Base.cs @@ -4,6 +4,7 @@ using UnityEngine; public class Device_Base : MonoBehaviour { + public int triggerId; /// /// 豸 /// diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs index 831dde2..06fa8ed 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs @@ -16,9 +16,14 @@ public class Device_CabinetDoor : Device_Base /// ӡ /// public Device_Seal seal; - + /// + /// Ƿ + /// public bool isOpen; - + /// + /// Ƿ + /// + public bool hasElectricity; public void Open() { Debug.Log(""); diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Socket.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Socket.cs index 091e7ea..2974b16 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_Socket.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Socket.cs @@ -11,4 +11,9 @@ public class Device_Socket : Device_Base /// λ /// public Transform testPosAndRot; + /// + /// Ƿ + /// + + public bool hasElectricity; } diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs index 2c18027..a06db68 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Base.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs @@ -7,6 +7,7 @@ using UnityEngine; /// public class Tool_Base : MonoBehaviour { + public int triggerId; /// /// /// diff --git a/Assets/Scripts/CXX/Tools/Tool_Screw.cs b/Assets/Scripts/CXX/Tools/Tool_Screw.cs index f228a78..ae1b35d 100644 --- a/Assets/Scripts/CXX/Tools/Tool_Screw.cs +++ b/Assets/Scripts/CXX/Tools/Tool_Screw.cs @@ -21,7 +21,10 @@ public class Tool_Screw : Tool_Base /// ˿λ /// public Transform installPos; - + /// + /// Ƿ + /// + public bool hasElectricity; /// /// ˿šʱλ @@ -33,7 +36,11 @@ public class Tool_Screw : Tool_Base private float localYUnInstallValue; - + private void Awake() + { + id = gameObject.name; + } + /// /// š @@ -49,6 +56,7 @@ public class Tool_Screw : Tool_Base { transform.RotateAroundLocal(Vector3.up, 1); screwdriver.transform.position = installPos.position; + screwdriver.transform.eulerAngles = transform.eulerAngles; }) .OnComplete(() => { diff --git a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs index e190bb7..1bd83f0 100644 --- a/Assets/Scripts/CXX/Tools/Tool_TestPen.cs +++ b/Assets/Scripts/CXX/Tools/Tool_TestPen.cs @@ -7,6 +7,12 @@ using UnityEngine; /// public class Tool_TestPen : Tool_Base { + public MeshRenderer screem; + /// + /// Ƿ˸ + /// + private bool isFlicker; + private float time; private void Update() { @@ -33,6 +39,23 @@ public class Tool_TestPen : Tool_Base } } } + + if(isFlicker) + { + time += Time.deltaTime; + if (time < 1) + { + screem.materials[0].color = Color.red; + } + else if(time>1 && time<2) + { + screem.materials[0].color = Color.white; + } + else + { + time = 0; + } + } } /// /// ִ @@ -47,6 +70,7 @@ public class Tool_TestPen : Tool_Base transform.position = tmp.testPosAndRot.position; transform.eulerAngles = tmp.testPosAndRot.eulerAngles; Debug.Log("_ "); + isFlicker = tmp.hasElectricity; } else if(device_base.deviceType == DeviceType._) { @@ -55,6 +79,7 @@ public class Tool_TestPen : Tool_Base transform.position = tmp.testPosAndRot.position; transform.eulerAngles = tmp.testPosAndRot.eulerAngles; Debug.Log("_ "); + isFlicker = tmp.hasElectricity; } } @@ -71,6 +96,9 @@ public class Tool_TestPen : Tool_Base transform.position = tmp.installPos.position; transform.eulerAngles = tmp.installPos.eulerAngles; Debug.Log("˿ "); + isFlicker = tmp.hasElectricity; } } + + }