融合

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 public class ShowNameplate : MonoBehaviour
 {
@@ -15,9 +16,12 @@ public class ShowNameplate : MonoBehaviour
 
     private void OnMouseDown()
     {
+        if (EventSystem.current.IsPointerOverGameObject())
+        {
+            return;
+        }
         NameplateController.Instance.RefreshShown();
-
+        if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName))
-        if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName)) 
         {
             return;
         }
@@ -26,7 +30,7 @@ public class ShowNameplate : MonoBehaviour
         NameplateController.Instance.NameplateImage.overrideSprite = sprite;
         NameplateController.Instance.NameplateImage.SetNativeSize();
 
-        switch (myName) 
+        switch (myName)
         {
             case "低压互感器铭牌":
                 multiple = 1.0f;

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_有光伏.prefab

@@ -559,6 +559,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &149286869561454452
 GameObject:
   m_ObjectHideFlags: 0
@@ -788,6 +789,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &388133477525614068
 GameObject:
   m_ObjectHideFlags: 0
@@ -851,6 +853,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &405557464819870593
 GameObject:
   m_ObjectHideFlags: 0
@@ -1774,6 +1777,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &1032632914913527736
 GameObject:
   m_ObjectHideFlags: 0
@@ -2485,6 +2489,7 @@ MonoBehaviour:
   name: "\u7528\u7535_CV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &1169093305794350635
 GameObject:
   m_ObjectHideFlags: 0
@@ -2600,6 +2605,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_BV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &1266349338653065856
 GameObject:
   m_ObjectHideFlags: 0
@@ -3078,6 +3084,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &1519430449556794234
 GameObject:
   m_ObjectHideFlags: 0
@@ -3775,6 +3782,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &1853984071587902525
 GameObject:
   m_ObjectHideFlags: 0
@@ -4077,6 +4085,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_N"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &1955674640215973765
 GameObject:
   m_ObjectHideFlags: 0
@@ -4296,6 +4305,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_CV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &2089376836906460348
 GameObject:
   m_ObjectHideFlags: 0
@@ -4577,6 +4587,7 @@ MonoBehaviour:
   name: "\u7528\u7535_AV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &2457045891919377070
 GameObject:
   m_ObjectHideFlags: 0
@@ -4806,6 +4817,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &2784251787084848411
 GameObject:
   m_ObjectHideFlags: 0
@@ -5576,6 +5588,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &3257939491376546498
 GameObject:
   m_ObjectHideFlags: 0
@@ -5777,6 +5790,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &3324344962978644052
 GameObject:
   m_ObjectHideFlags: 0
@@ -5892,6 +5906,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &3369078227917110732
 GameObject:
   m_ObjectHideFlags: 0
@@ -6971,6 +6986,7 @@ MonoBehaviour:
   name: "\u7528\u7535_CV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &4002838555360234922
 GameObject:
   m_ObjectHideFlags: 0
@@ -7200,6 +7216,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &4147770098453098543
 GameObject:
   m_ObjectHideFlags: 0
@@ -7429,6 +7446,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &4357971326663085255
 GameObject:
   m_ObjectHideFlags: 0
@@ -7544,6 +7562,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_BV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &4444430629899505157
 GameObject:
   m_ObjectHideFlags: 0
@@ -7690,6 +7709,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &4509565183205377274
 GameObject:
   m_ObjectHideFlags: 0
@@ -7971,6 +7991,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_AV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &4663678044794773321
 GameObject:
   m_ObjectHideFlags: 0
@@ -8439,6 +8460,7 @@ MonoBehaviour:
   name: "\u7528\u7535_N"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &4826068160248301606
 GameObject:
   m_ObjectHideFlags: 0
@@ -9928,6 +9950,7 @@ MonoBehaviour:
   name: "\u53D1\u7535_CV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &5766396300497150387
 GameObject:
   m_ObjectHideFlags: 0
@@ -11842,6 +11865,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   clampAmmetersInteractives: []
+  Multimeter: []
+  Three: {fileID: 0}
 --- !u!1 &7130868757477969731
 GameObject:
   m_ObjectHideFlags: 0
@@ -11905,6 +11930,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &7171766864873220075
 GameObject:
   m_ObjectHideFlags: 0
@@ -12569,6 +12595,7 @@ MonoBehaviour:
   name: "\u7528\u7535_AV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &7831470432150598566
 GameObject:
   m_ObjectHideFlags: 0
@@ -12788,6 +12815,7 @@ MonoBehaviour:
   name: "\u7528\u7535_BV3"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &7911749650068601817
 GameObject:
   m_ObjectHideFlags: 0
@@ -13038,6 +13066,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &7968447109443682862
 GameObject:
   m_ObjectHideFlags: 0
@@ -13712,6 +13741,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &8335546110959047487
 GameObject:
   m_ObjectHideFlags: 0
@@ -13858,6 +13888,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &8580617168033895453
 GameObject:
   m_ObjectHideFlags: 0
@@ -14057,6 +14088,7 @@ MonoBehaviour:
   name: "\u7528\u7535_AV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &8873502433770450856
 GameObject:
   m_ObjectHideFlags: 0
@@ -14442,6 +14474,7 @@ MonoBehaviour:
   name: "\u7528\u7535_BV2"
   isBlack: 0
   VV: 
+  isok: 0
 --- !u!1 &9078081554792651254
 GameObject:
   m_ObjectHideFlags: 0
@@ -14505,6 +14538,7 @@ MonoBehaviour:
   name: 
   isBlack: 0
   VV: V
+  isok: 0
 --- !u!1 &9128625144620952930
 GameObject:
   m_ObjectHideFlags: 0
@@ -15217,6 +15251,30 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 323.401
       objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.31763354
+      objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.31763357
+      objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.6317508
+      objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.63175064
+      objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: -4914844396518296654, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 126.615
+      objectReference: {fileID: 0}
     - target: {fileID: -3594283037972853338, guid: 52b05e392bba9ba47979c46f8f9277cc, type: 3}
       propertyPath: m_DirtyAABB
       value: 0

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_有互感器_无光伏.prefab

@@ -1588,7 +1588,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 5555240334297640412}
-  name: 
+  name: "\u7528\u7535_CA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
@@ -5818,7 +5818,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 6353080852345845249}
-  name: 
+  name: "\u7528\u7535_BA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
@@ -6137,7 +6137,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 1163469228716114748}
-  name: 
+  name: "\u7528\u7535_AA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
@@ -10135,6 +10135,10 @@ PrefabInstance:
       propertyPath: m_AABB.m_Extent.z
       value: 0.059744626
       objectReference: {fileID: 0}
+    - target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -491602864608504868, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
       propertyPath: m_TagString
       value: YanDian

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab

@@ -1,5 +1,102 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &943746232492794008
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8269563355153497800}
+  - component: {fileID: 8984783813853376040}
+  - component: {fileID: 1252588107035233893}
+  - component: {fileID: 5697897373468217628}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8269563355153497800
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.1078, y: -0, z: -0.0054}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 5911856406943029848}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8984783813853376040
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1252588107035233893
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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!65 &5697897373468217628
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  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!1 &4737607472722466619
 GameObject:
   m_ObjectHideFlags: 0
@@ -62,6 +159,103 @@ Transform:
   m_Father: {fileID: 2884146482280011232}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5736492336811819089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1951137652969104597}
+  - component: {fileID: 3946426028967011025}
+  - component: {fileID: 8202066586217476281}
+  - component: {fileID: 2120365149609610248}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1951137652969104597
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.10827636, y: 0, z: 0.0029983744}
+  m_LocalScale: {x: 0.009999999, y: 0.01, z: 0.009999999}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3556094348336752178}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3946426028967011025
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8202066586217476281
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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!65 &2120365149609610248
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  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!1 &6770620356190950818
 GameObject:
   m_ObjectHideFlags: 0
@@ -109,6 +303,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   clampAmmetersInteractives: []
+  Multimeter: []
+  Three: {fileID: 0}
 --- !u!1001 &1895296105669336917
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -160,6 +356,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -91101163219016857, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
       propertyPath: m_Name
       value: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u7535\u7BB1\u95E8"
@@ -204,6 +404,22 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 329.098
       objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.3172626
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.3172626
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.6319372
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.631937
+      objectReference: {fileID: 0}
     - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -90
@@ -212,6 +428,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 126.682
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
 --- !u!1 &1624700047647515140 stripped
@@ -258,7 +478,7 @@ MeshCollider:
   m_GameObject: {fileID: 7273636919654661170}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -409,7 +629,7 @@ MeshCollider:
   m_GameObject: {fileID: 1239480889199565793}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -494,7 +714,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 5398975006695019102}
-  name: 
+  name: "\u53D1\u7535_AA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
@@ -509,6 +729,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3696473539125736840, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
   m_PrefabInstance: {fileID: 1966393981994950760}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &3556094348336752178 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3031978151336248922, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5556055090688204035 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 6219781433053871467, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -535,13 +760,18 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5556055090688204035}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   name: "\u76D6\u5B50"
   ammeterSon: {fileID: 0}
+--- !u!4 &5911856406943029848 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5278547504029415984, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5934706453412920569 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5266494653353647249, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -580,6 +810,20 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: -3902609203009237696, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
   m_PrefabInstance: {fileID: 1966393981994950760}
   m_PrefabAsset: {fileID: 0}
+--- !u!64 &6847984861762042287
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952964257958112552}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8360860469862521707, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
 --- !u!114 &4028878535299181004
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -594,11 +838,49 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 4737607472722466619}
-  name: 
+  name: "\u7528\u7535_AA2"
   linearMeasure: 0
   floats: []
   Fuan: 0
   unit: A
+--- !u!1 &6254938070638835678 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5585600301986535350, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &7509094282354524766
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254938070638835678}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -3839749303547444047, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+--- !u!114 &4511783290274347834
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254938070638835678}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: "\u53D1\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 
+  unit: 
 --- !u!1 &7014173801403137452 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8799278309008104900, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -625,7 +907,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7014173801403137452}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
@@ -658,13 +940,69 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7387676191130023632}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   name: 
   ammeterSon: {fileID: 0}
+--- !u!1 &7983708125869743983 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -756080454203080953, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8855525376343487698
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7983708125869743983}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mesh: {fileID: 3242825642925887410}
+--- !u!1 &8173016374239192056 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -1574452274598771824, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &8162217028778764928
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8173016374239192056}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 3038099331006426753, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+--- !u!114 &1170793500808225503
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8173016374239192056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: "\u53D1\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 
+  unit: 
 --- !u!1 &8210758798105662891 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7690021121139553731, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab

@@ -9,8 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 786925774}
-  - component: {fileID: 786925777}
-  - component: {fileID: 786925776}
   - component: {fileID: 786925775}
   - component: {fileID: 1253040782233410607}
   m_Layer: 0
@@ -35,56 +33,6 @@ Transform:
   m_Father: {fileID: 4300732867488139875}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &786925777
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 786925773}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &786925776
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 786925773}
-  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  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!65 &786925775
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -120,8 +68,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1114701756}
-  - component: {fileID: 1114701759}
-  - component: {fileID: 1114701758}
   - component: {fileID: 1114701757}
   - component: {fileID: 1106640731186029337}
   m_Layer: 0
@@ -146,56 +92,6 @@ Transform:
   m_Father: {fileID: 4300732867488139875}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &1114701759
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1114701755}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &1114701758
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1114701755}
-  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  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!65 &1114701757
 BoxCollider:
   m_ObjectHideFlags: 0

Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity

@@ -3711,9 +3711,6 @@ Transform:
   - {fileID: 1832848472}
   - {fileID: 1952119707}
   - {fileID: 1155891581}
-  - {fileID: 1290278810}
-  - {fileID: 706958744}
-  - {fileID: 823066093}
   m_Father: {fileID: 647771132}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10177,7 +10174,7 @@ Transform:
   m_Children:
   - {fileID: 647771132}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &311259347
 PrefabInstance:
@@ -12952,7 +12949,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &388288287
 GameObject:
@@ -26751,7 +26748,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 25
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -27041,7 +27038,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_RootOrder
-      value: 24
+      value: 22
       objectReference: {fileID: 0}
     - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
       propertyPath: m_LocalPosition.x
@@ -27425,100 +27422,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.001, y: 0.001, z: 0.001}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!1 &706958743
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 706958744}
-  - component: {fileID: 706958745}
-  m_Layer: 0
-  m_Name: "\u914D\u7535\u623F\u5149\u6E901"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &706958744
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 706958743}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 91.30136, y: 3.219, z: 310.1582}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 87662318}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!108 &706958745
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 706958743}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 2
-  m_Shape: 0
-  m_Color: {r: 0.7411765, g: 0.8089552, b: 0.8862745, a: 1}
-  m_Intensity: 1.2
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 1
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
 --- !u!1001 &707744539
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -30974,100 +30877,6 @@ Transform:
   m_Father: {fileID: 1854594293}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &823066092
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 823066093}
-  - component: {fileID: 823066094}
-  m_Layer: 0
-  m_Name: "\u914D\u7535\u623F\u5149\u6E902"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &823066093
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 823066092}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 88.406, y: 3.219, z: 310.1582}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 87662318}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!108 &823066094
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 823066092}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 2
-  m_Shape: 0
-  m_Color: {r: 0.7411765, g: 0.8089552, b: 0.8862745, a: 1}
-  m_Intensity: 1.2
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 1
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
 --- !u!1 &823657740
 GameObject:
   m_ObjectHideFlags: 0
@@ -32622,7 +32431,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_RootOrder
-      value: 21
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
       propertyPath: m_LocalPosition.x
@@ -34756,7 +34565,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &905697366
 MonoBehaviour:
@@ -37932,7 +37741,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &963586247
 GameObject:
@@ -38515,7 +38324,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 30
+  m_RootOrder: 28
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &977773623
 PrefabInstance:
@@ -42541,7 +42350,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1064186729
 MonoBehaviour:
@@ -45187,7 +44996,7 @@ Transform:
   - {fileID: 2142689831}
   - {fileID: 1625562541981183860}
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1151031604
 PrefabInstance:
@@ -49925,117 +49734,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1287979931}
   m_Mesh: {fileID: 5245509072538806982, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &1290278809
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1290278810}
-  - component: {fileID: 1290278811}
-  - component: {fileID: 1290278812}
-  m_Layer: 7
-  m_Name: "\u7535\u67DC\u8865\u5149"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1290278810
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1290278809}
-  m_LocalRotation: {x: 0.9124775, y: -0, z: -0, w: 0.409127}
-  m_LocalPosition: {x: 89.822, y: 1.148, z: 311.237}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 87662318}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 131.7, y: 0, z: 0}
---- !u!108 &1290278811
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1290278809}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 2
-  m_Shape: 0
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 0.5
-  m_Range: 10
-  m_SpotAngle: 144.8
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!114 &1290278812
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1290278809}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 94f135a619f568849b913dabcd490e36, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  testPen: {fileID: 0}
-  penPos: {x: 0, y: 0, z: 0}
-  penRot: {x: 0, y: 0, z: 0}
-  "\u662F\u5426\u5E26\u7535": 0
 --- !u!1 &1291509688
 GameObject:
   m_ObjectHideFlags: 0
@@ -54494,7 +54192,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1428010675
 GameObject:
@@ -59398,7 +59096,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1543654488
 MonoBehaviour:
@@ -68190,7 +67888,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
       propertyPath: m_RootOrder
-      value: 26
+      value: 24
       objectReference: {fileID: 0}
     - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
       propertyPath: m_LocalPosition.x
@@ -68372,7 +68070,7 @@ Transform:
   - {fileID: 1400298970}
   - {fileID: 2111073202}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1797272987
 GameObject:
@@ -68477,7 +68175,7 @@ RectTransform:
   - {fileID: 1677353489}
   - {fileID: 2132026558}
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -69645,7 +69343,7 @@ Light:
   m_Type: 1
   m_Shape: 0
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
+  m_Intensity: 0.8
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -70213,100 +69911,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1841197670}
   m_Mesh: {fileID: -2128599272216676504, guid: 85f9d26d36537954f95a692c5501ca00, type: 3}
---- !u!1 &1845511735
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1845511737}
-  - component: {fileID: 1845511736}
-  m_Layer: 0
-  m_Name: Directional Light
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!108 &1845511736
-Light:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1845511735}
-  m_Enabled: 1
-  serializedVersion: 10
-  m_Type: 1
-  m_Shape: 0
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
-  m_Range: 10
-  m_SpotAngle: 30
-  m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
-  m_Shadows:
-    m_Type: 0
-    m_Resolution: -1
-    m_CustomResolution: -1
-    m_Strength: 1
-    m_Bias: 0.05
-    m_NormalBias: 0.4
-    m_NearPlane: 0.2
-    m_CullingMatrixOverride:
-      e00: 1
-      e01: 0
-      e02: 0
-      e03: 0
-      e10: 0
-      e11: 1
-      e12: 0
-      e13: 0
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    m_UseCullingMatrixOverride: 0
-  m_Cookie: {fileID: 0}
-  m_DrawHalo: 0
-  m_Flare: {fileID: 0}
-  m_RenderMode: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 64
-  m_RenderingLayerMask: 1
-  m_Lightmapping: 4
-  m_LightShadowCasterMode: 0
-  m_AreaSize: {x: 1, y: 1}
-  m_BounceIntensity: 1
-  m_ColorTemperature: 6570
-  m_UseColorTemperature: 0
-  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
-  m_UseBoundingSphereOverride: 0
-  m_UseViewFrustumForShadowCasterCull: 1
-  m_ShadowRadius: 0
-  m_ShadowAngle: 0
---- !u!4 &1845511737
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1845511735}
-  m_LocalRotation: {x: -0.05114337, y: -0.15563445, z: 0.20679744, w: 0.964571}
-  m_LocalPosition: {x: 58.54932, y: 2.8758562, z: 347.22778}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
-  m_LocalEulerAnglesHint: {x: -1.965, y: -18.759, z: 24.526}
 --- !u!1 &1846113665
 GameObject:
   m_ObjectHideFlags: 0
@@ -70574,7 +70178,7 @@ RectTransform:
   m_Children:
   - {fileID: 273619911}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -72846,7 +72450,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
       propertyPath: m_LocalPosition.x
@@ -75417,7 +75021,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1967702553
 PrefabInstance:
@@ -76323,7 +75927,7 @@ Transform:
   - {fileID: 1446289608}
   - {fileID: 696764694}
   m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 21
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1987230714
 GameObject:
@@ -83574,7 +83178,7 @@ Transform:
   - {fileID: 8278156440674586169}
   - {fileID: 1472106633}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &554189251323931874
 MonoBehaviour:
@@ -93160,7 +92764,7 @@ Transform:
   - {fileID: 4240377296742345613}
   - {fileID: 50144230157523243}
   m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!4 &2397982214548926677
 Transform:
@@ -94836,7 +94440,7 @@ Transform:
   - {fileID: 1182854318}
   - {fileID: 1964103505}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &2630887752870060410
 Transform:
@@ -95817,91 +95421,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6505589866801392177}
   m_Mesh: {fileID: 5729659416330863159, guid: e42d1f68f8bcebd4abd6a1ec31c505d3, type: 3}
---- !u!1001 &2943890894315625054
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 2943890894315625056, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: "\u8BBE\u5907"
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890894315625056, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: content
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890894315625056, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: "\u7F3A\u9677\u7C7B\u578B"
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890894315625056, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: "\u8BE6\u7EC6\u7F3A\u9677"
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890894315625056, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: "\u6545\u969C\u8BB0\u5F55\u8868"
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_RootOrder
-      value: 6
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 28.539894
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.8100001
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 337.26544
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514615, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514617, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_Name
-      value: GameManager
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514617, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2943890895030514617, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: b0ae79ef714b1b24281e54076b37a93a, type: 3}
 --- !u!64 &2958352253880195830
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -141830,7 +141349,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
       propertyPath: m_RootOrder
-      value: 25
+      value: 23
       objectReference: {fileID: 0}
     - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
       propertyPath: m_LocalPosition.x

Electrical_inspectionCompetitionSystem/Assets/Scenes/农贸市场.unity

@@ -197029,6 +197029,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d38da66309ccf6640acd6bd3ea8ee27a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  loadingPanel: {fileID: 0}
 --- !u!64 &2958352253880195830
 MeshCollider:
   m_ObjectHideFlags: 0

Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs

@@ -24,7 +24,7 @@ public class Multimeter : MonoBehaviour
             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)
         {
@@ -34,11 +34,8 @@ public class Multimeter : MonoBehaviour
             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);
-        }
+            GameManager.ins.show(activation + VV);
-        if (isok)
+            Debug.Log(activation + VV + "安康就是看到机会");
-        {
-            GameManager.ins.DianFuIm.gameObject.SetActive(true);
-            GameManager.ins.DianFuTex.text = activation + VV;
         }
         Debug.Log("³É¹¦");
     }

Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs

@@ -26,13 +26,10 @@ public class MultimeterManager : MonoBehaviour
             {
                 // 从相机位置发射一条射线经过屏幕上的鼠标点击位置
                 Ray ray = Camera.ScreenPointToRay(Input.mousePosition);
-
                 // 声明一个射线碰撞信息类
                 RaycastHit hit;
-
                 // 进行碰撞检测
                 bool res = Physics.Raycast(ray, out hit, 1 << 7) && !EventSystem.current.IsPointerOverGameObject();
-
                 if (res)
                 {
                     // 如果产生了碰撞

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -90,7 +90,11 @@ public class GameManager : MonoBehaviour
             }
         }
     }
-
+    public void show(string Str)
+    {
+        DianFuIm.gameObject.SetActive(true);
+        DianFuTex.text = Str;
+    }
     private void Update()
     {
         switch (interactiveEnum)

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs

@@ -38,16 +38,15 @@ public class ClampAmmetersManager : MonoBehaviour
     {
         for (int i = 0; i < clampAmmetersInteractives.Count; i++)
         {
-            if (clampAmmetersInteractives[i].name.Equals("Óõç_AA2"))
+            if (clampAmmetersInteractives[i].name.Equals("用电_AA2")|| clampAmmetersInteractives[i].name.Equals("用电_AA3"))
             {
                 clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
-                Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
             }
-            if (clampAmmetersInteractives[i].name.Equals("Óõç_BA2"))
+            if (clampAmmetersInteractives[i].name.Equals("用电_BA2")|| clampAmmetersInteractives[i].name.Equals("用电_BA3"))
             {
                 clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxB;
             }
-            if (clampAmmetersInteractives[i].name.Equals("Óõç_CA2"))
+            if (clampAmmetersInteractives[i].name.Equals("用电_CA2") || clampAmmetersInteractives[i].name.Equals("用电_CA3") )
             {
                 clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
             }
@@ -66,18 +65,6 @@ public class ClampAmmetersManager : MonoBehaviour
             {
                 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");
         }
     }
 }