Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition

2023-09-19 10:28:52 +08:00 · 2023-09-19 10:28:52 +08:00 · d0bd7ace01
parent 2783ce1fc9 36712841b3
commit d0bd7ace01
4 changed files with 2371 additions and 10513 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Prefeb/单项_无互感器_有光伏.prefab
+++ b/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
@ -162,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"
@ -280,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
@ -431,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
@ -516,7 +714,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  isInteractive: 0
  g1: {fileID: 5398975006695019102}
-  name: 
+  name: "\u53D1\u7535_AA2"
  linearMeasure: 0
  floats: []
  Fuan: 0
@ -531,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}
@ -557,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}
@ -602,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
@ -616,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}
@ -647,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: 
@ -680,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}
--- a/Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab
+++ b/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
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
@ -10174,7 +10174,7 @@ Transform:
  m_Children:
  - {fileID: 647771132}
  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &311259347
 PrefabInstance:
@ -12949,7 +12949,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 28
+  m_RootOrder: 27
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &388288287
 GameObject:
@ -26748,7 +26748,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 25
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -27038,7 +27038,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
      propertyPath: m_RootOrder
-      value: 23
+      value: 22
      objectReference: {fileID: 0}
    - target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
      propertyPath: m_LocalPosition.x
@ -32431,7 +32431,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
      propertyPath: m_RootOrder
-      value: 20
+      value: 19
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c494ecc284aba354aae4fc93fffe7399, type: 3}
      propertyPath: m_LocalPosition.x
@ -34565,7 +34565,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 27
+  m_RootOrder: 26
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &905697366
 MonoBehaviour:
@ -37741,7 +37741,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 18
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &963586247
 GameObject:
@ -38324,7 +38324,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 29
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &977773623
 PrefabInstance:
@ -42350,7 +42350,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1064186729
 MonoBehaviour:
@ -44996,7 +44996,7 @@ Transform:
  - {fileID: 2142689831}
  - {fileID: 1625562541981183860}
  m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1151031604
 PrefabInstance:
@ -54192,7 +54192,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1428010675
 GameObject:
@ -59096,7 +59096,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 15
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1543654488
 MonoBehaviour:
@ -67888,7 +67888,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
      propertyPath: m_RootOrder
-      value: 25
+      value: 24
      objectReference: {fileID: 0}
    - target: {fileID: 6482818628852478495, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
      propertyPath: m_LocalPosition.x
@ -68070,7 +68070,7 @@ Transform:
  - {fileID: 1400298970}
  - {fileID: 2111073202}
  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1797272987
 GameObject:
@ -68175,7 +68175,7 @@ RectTransform:
  - {fileID: 1677353489}
  - {fileID: 2132026558}
  m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -70178,7 +70178,7 @@ RectTransform:
  m_Children:
  - {fileID: 273619911}
  m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 12
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -72450,7 +72450,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
      propertyPath: m_RootOrder
-      value: 10
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
      propertyPath: m_LocalPosition.x
@ -75021,7 +75021,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 16
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1967702553
 PrefabInstance:
@ -75927,7 +75927,7 @@ Transform:
  - {fileID: 1446289608}
  - {fileID: 696764694}
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1987230714
 GameObject:
@ -83178,7 +83178,7 @@ Transform:
  - {fileID: 8278156440674586169}
  - {fileID: 1472106633}
  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &554189251323931874
 MonoBehaviour:
@ -92764,7 +92764,7 @@ Transform:
  - {fileID: 4240377296742345613}
  - {fileID: 50144230157523243}
  m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!4 &2397982214548926677
 Transform:
@ -94440,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:
@ -95421,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
@ -141434,7 +141349,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
      propertyPath: m_RootOrder
-      value: 24
+      value: 23
      objectReference: {fileID: 0}
    - target: {fileID: 4300732867488139875, guid: 3fb1235fb3cb2ea4782e6c99e4cff4bf, type: 3}
      propertyPath: m_LocalPosition.x
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/居民自建.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/居民自建.unity