diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_3.mat b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_3.mat
index b351be03..786f1597 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_3.mat
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_3.mat
@@ -71,7 +71,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 1
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.5
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/LOGO.mat b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/LOGO.mat
index 2ce6b959..b02ee8ee 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/LOGO.mat
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/LOGO.mat
@@ -10,14 +10,14 @@ Material:
   m_Name: LOGO
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords:
-  - _ALPHABLEND_ON
+  - _ALPHATEST_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: 2450
   stringTagMap:
-    RenderType: Transparent
+    RenderType: TransparentCutout
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -61,21 +61,21 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _Cutoff: 0.5
+    - _Cutoff: 0.618
     - _DetailNormalMapScale: 1
-    - _DstBlend: 10
+    - _DstBlend: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.14142135
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 2
+    - _Mode: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
-    - _SrcBlend: 5
+    - _SrcBlend: 1
     - _UVSec: 0
-    - _ZWrite: 0
+    - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
index 91f3bfb0..aad69760 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab
@@ -502,7 +502,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 6323416925032525140}
-  name: 
+  name: "\u7528\u7535_BA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
@@ -6687,6 +6687,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   clampAmmetersInteractives: []
+  Multimeter: []
+  Three: {fileID: 0}
 --- !u!1 &5972927993521893981
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab
index 71cea62c..e3c022cb 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab
@@ -648,7 +648,6 @@ MonoBehaviour:
   line: {fileID: 7094745485471664169}
   Higth: {fileID: 0}
   selfHighlighter: {fileID: 0}
-  tipPrefab: {fileID: 3004857750428858783, guid: 5cb5fabd80716b64b88f3517ee4bbbc3, type: 3}
 --- !u!114 &8256763883766496110
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1033,109 +1032,173 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1001 &7977265530582431096
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2131893628021589511}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.0937
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.2268
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.0853
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -6980580695861291056, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: RedWanYon
-      objectReference: {fileID: 0}
-    - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_TagString
-      value: Line
-      objectReference: {fileID: 0}
-    - target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: BlackWanYon
-      objectReference: {fileID: 0}
-    - target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 5772668992839476294, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!4 &3988769801855775873 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6480123220174193145, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5495617035047539862 stripped
+--- !u!1 &4514950303074652478
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7715750418364421036}
+  - component: {fileID: 3059428695271397638}
+  - component: {fileID: 2568701473469145960}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF03"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7715750418364421036
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3059428695271397638
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  m_Mesh: {fileID: -4189706640963767879, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &2568701473469145960
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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!1 &5495617035047539862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8868651887891220814}
+  - component: {fileID: 5805159065386198747}
+  - component: {fileID: 1440140695464012828}
+  - component: {fileID: 7660596071481276608}
+  m_Layer: 7
+  m_Name: BlackWanYon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8868651887891220814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.10578924, y: 0.22393799, z: 0.11220816}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5805159065386198747
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &1440140695464012828
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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 &7660596071481276608
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1150,11 +1213,90 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!1 &6444039670963408484 stripped
+--- !u!1 &6444039670963408484
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3988769801855775873}
+  - component: {fileID: 1250084940839689348}
+  - component: {fileID: 7806420585310816576}
+  - component: {fileID: 7038635384121928425}
+  m_Layer: 7
+  m_Name: RedWanYon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3988769801855775873
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.038024954, y: 0.22393799, z: 0.11220816}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1250084940839689348
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &7806420585310816576
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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 &7038635384121928425
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1169,18 +1311,121 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!1 &7094745485471664169 stripped
+--- !u!1 &7094745485471664169
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &7583579917626380947 stripped
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7583579917626380947}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
+  m_TagString: Line
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7583579917626380947
 Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &8868651887891220814 stripped
+  m_GameObject: {fileID: 7094745485471664169}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.0937, y: -0.2268, z: -0.0853}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7544377102779913609}
+  - {fileID: 7715750418364421036}
+  - {fileID: 8868651887891220814}
+  - {fileID: 3988769801855775873}
+  m_Father: {fileID: 2131893628021589511}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8190656202517537448
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7544377102779913609}
+  - component: {fileID: 1390955141036317076}
+  - component: {fileID: 6007683287941016964}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF02"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7544377102779913609
 Transform:
-  m_CorrespondingSourceObject: {fileID: 1560276661819145270, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1390955141036317076
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  m_Mesh: {fileID: -2495079305668151455, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &6007683287941016964
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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}
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
index 57007fd3..e03575eb 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
@@ -23012,8 +23012,8 @@ MonoBehaviour:
   RedTrans: {fileID: 0}
   BlackTrans: {fileID: 0}
   trans: {fileID: 2401820165377604994}
-  Redpos: {x: -0.038, y: 0.223, z: 0.111}
-  Blackpos: {x: -0.1, y: 0.223, z: 0.111}
+  Redpos: {x: -0.13, y: 0, z: 0.02}
+  Blackpos: {x: -0.19, y: 0, z: 0.02}
   Multimeter: 0
   MultimeterV: 
 --- !u!1001 &618341781
@@ -26836,7 +26836,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.515
+      value: 1.13
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_LocalPosition.z
@@ -34510,7 +34510,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 905697361}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 108.991, y: 0.557, z: 322.2779}
+  m_LocalPosition: {x: 109.09, y: 0.557, z: 322.2779}
   m_LocalScale: {x: 1, y: 1, z: 3.4345794}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -38209,8 +38209,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 1, y: 0.55770916, z: 1}
+  m_Center: {x: 0, y: -0.22114542, z: 0}
 --- !u!23 &976792125
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -38269,7 +38269,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 976792123}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 110.523, y: 0.5003009, z: 322.256}
+  m_LocalPosition: {x: 110.53, y: 0.5003009, z: 322.256}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -75135,7 +75135,9 @@ MonoBehaviour:
   temp: {fileID: 0}
   interactive: []
   RedWanYon: {fileID: 0}
+  RedWanYonPos: {x: 0, y: 0, z: 0}
   BlackWanYon: {fileID: 0}
+  BlackWanYonPos: {x: 0, y: 0, z: 0}
   FuAnBiao: {fileID: 0}
   interactiveEnum: 0
   biaojiPos: {fileID: 696870980}
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs
index 87bcdf99..20d15b78 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs
@@ -8,10 +8,11 @@ public class Multimeter : MonoBehaviour
     [Header("�Ƿ����")]
     public bool electricity = false;
     [Header("����")]
-    public float activation;
+    public string activation;
     public string name;
     public bool isBlack;
     public string VV;
+    public bool isok = false;
 
     private void OnMouseDown()
     {
@@ -20,24 +21,24 @@ public class Multimeter : MonoBehaviour
             GameManager.ins.BlackWanYon.transform.parent = transform;
             GameManager.ins.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.ins.BlackWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
-            GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(0,0,-2), 0.25f);
+            GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
             GameManager.ins.BlackWanYon.layer = 0;
             GameManager.ins.MultimeterIm.gameObject.SetActive(true);
-            
+            isok = true;
         }
         if (GameManager.ins.RedWanYon != null&&!isBlack)
         {
             GameManager.ins.RedWanYon.transform.parent = transform;
             GameManager.ins.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.ins.RedWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
-            GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(0,0, -2f), 0.25f);
+            GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f,0.08f,0.11f), 0.25f);
             GameManager.ins.RedWanYon.layer = 0;
             GameManager.ins.MultimeterIm.gameObject.SetActive(true);
-            if (electricity)
-            {
-                GameManager.ins.DianFuIm.gameObject.SetActive(true);
-                GameManager.ins.DianFuTex.text = activation + VV;
-            }
+        }
+        if (isok)
+        {
+            GameManager.ins.DianFuIm.gameObject.SetActive(true);
+            GameManager.ins.DianFuTex.text = activation + VV;
         }
         Debug.Log("�ɹ�");
     }
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs
index 93c43bbb..504d302a 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs
@@ -5,8 +5,8 @@ using UnityEngine.EventSystems;
 
 public class MultimeterManager : MonoBehaviour
 {
-    [SerializeField] Transform blackXian;
-    [SerializeField] Transform RedXian;
+    public Transform blackXian;
+    public Transform RedXian;
     private Multimeter multimeter;
     public Camera Camera;
     public List<Multimeter> Multimeter;
@@ -40,11 +40,13 @@ public class MultimeterManager : MonoBehaviour
                     {
                         //GameManager.ins.BlackWanYon = null;
                         GameManager.ins.RedWanYon = RedXian.gameObject;
+                        //GameManager.ins.RedWanYonPos = GameManager.ins.RedWanYon.transform.localPosition;
                     }
                     if (hit.collider.name.Equals("BlackWanYon"))
                     {
                         //GameManager.ins.RedWanYon = null;
                         GameManager.ins.BlackWanYon = blackXian.gameObject;
+                        //GameManager.ins.BlackWanYonPos = GameManager.ins.BlackWanYon.transform.localPosition;
                     }
                     Debug.Log(hit.collider.name);
                 }
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs
index ea1c0d0a..d1590cdf 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs
@@ -12,24 +12,27 @@ public class CameraControl : MonoBehaviour
         fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
         fieldView = Mathf.Clamp(fieldView, 30, 60);
         playerCamera.fieldOfView = fieldView;
-        if (GameManager.ins.temp&& !GameManager.ins.temp.name.Equals("ǯ�ε�����(Clone)"))
+        if (GameManager.ins.interactiveEnum != Interactive.YanDian)
         {
-            switch (fieldView / 10)
+            if (GameManager.ins.temp && !GameManager.ins.temp.name.Equals("ǯ�ε�����(Clone)"))
             {
-                case 3:
-                    GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
-                    break;
-                case 4:
-                    GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
-                    break;
-                case 5:
-                    GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
-                    break;
-                case 6:
-                    GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
-                    break;
-                default:
-                    break;
+                switch (fieldView / 10)
+                {
+                    case 3:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
+                        break;
+                    case 4:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
+                        break;
+                    case 5:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
+                        break;
+                    case 6:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
+                        break;
+                    default:
+                        break;
+                }
             }
         }
         
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
index 6cfe5337..edf46044 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
@@ -31,7 +31,9 @@ public class GameManager : MonoBehaviour
     public GameObject temp;
     public List<GameObject> interactive;
     public GameObject RedWanYon;
+    public Vector3 RedWanYonPos;
     public GameObject BlackWanYon;
+    public Vector3 BlackWanYonPos;
     public GameObject FuAnBiao;
     public Interactive interactiveEnum = Interactive.none;
     public Transform biaojiPos;
@@ -144,6 +146,8 @@ public class GameManager : MonoBehaviour
                 QianStopValve.gameObject.SetActive(false);
                 GameObject t2 = GameObject.FindGameObjectWithTag("��ת");
                 WanStopValve.trans = t2.transform;
+                BlackWanYonPos = temp.GetComponent<MultimeterManager>().blackXian.localPosition;
+                RedWanYonPos = temp.GetComponent<MultimeterManager>().RedXian.localPosition;
                 temp.GetComponent<MultimeterManager>();
                 temp.GetComponent<MultimeterManager>().Camera = toolsCam;
                 temp.GetComponent<ToolModelClick>().line.SetActive(true);
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs
index e7fc26f1..13f8b9bc 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs
@@ -11,7 +11,7 @@ public class ClampAmmetersInteractive : MonoBehaviour
     public string name;
     public float linearMeasure;//Ĭ�ϵĴ�С
     public List<float> floats;
-    public float Fuan;
+    public string Fuan;
     public string unit;
     private void Start()
     {
@@ -46,4 +46,11 @@ public class ClampAmmetersInteractive : MonoBehaviour
             }
         }
     }
+    private void Update()
+    {
+        if (Input.GetKeyDown("t"))
+        {
+            Debug.Log(GameManager.ins.DianFuTex.text + "==== GameManager.ins.DianFuTex.text");
+        }
+    }
 }
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs
index cb1602b8..c20389fc 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs
@@ -2,11 +2,14 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using Views;
 
 public class ClampAmmetersManager : MonoBehaviour
 {
-    [SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives= new List<ClampAmmetersInteractive>();
-    public Dictionary<int,float> data = new Dictionary<int,float>();
+    [SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives = new List<ClampAmmetersInteractive>();
+    [SerializeField] List<Multimeter> Multimeter = new List<Multimeter>();
+    public Dictionary<int, float> data = new Dictionary<int, float>();
+    public ThreeTransformerPhotovoltaicView Three;
     private void Awake()
     {
         run();
@@ -14,7 +17,13 @@ public class ClampAmmetersManager : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        
+        //init();
+        StartCoroutine(QiDon());
+    }
+    IEnumerator QiDon()
+    {
+        yield return new WaitForSeconds(4f);
+        init();
     }
     /// <summary>
     /// ��ȡ����Ԥ������
@@ -22,12 +31,53 @@ public class ClampAmmetersManager : MonoBehaviour
     void run()
     {
         clampAmmetersInteractives = GetComponentsInChildren<ClampAmmetersInteractive>().ToList();
+        Multimeter = GetComponentsInChildren<Multimeter>().ToList();
+        Three = GetComponentInChildren<ThreeTransformerPhotovoltaicView>();
     }
     void init()
     {
-        for (int i = 0; i < data.Count; i++)
+        for (int i = 0; i < clampAmmetersInteractives.Count; i++)
         {
-            clampAmmetersInteractives[i].Fuan = data[i];
+            if (clampAmmetersInteractives[i].name.Equals("�õ�_AA2"))
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
+                Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
+            }
+            if (clampAmmetersInteractives[i].name.Equals("�õ�_BA2"))
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxB;
+            }
+            if (clampAmmetersInteractives[i].name.Equals("�õ�_CA2"))
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
+            }
+        }
+        for (int i = 0; i < Multimeter.Count; i++)
+        {
+            if (Multimeter[i].name.Equals("�õ�_AV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyA;
+            }
+            if (Multimeter[i].name.Equals("�õ�_BV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyB;
+            }
+            if (Multimeter[i].name.Equals("�õ�_CV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyC;
+            }
+            //if (Multimeter[i].name.Equals("�õ�_N"))
+            //{
+            //    Multimeter[i].activation = Three.ttpData.data.dyC;
+            //}
+        }
+    }
+
+    private void Update()
+    {
+        if (Input.GetKeyDown("q"))
+        {
+            Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
         }
     }
 }