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

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

@@ -404,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
@@ -412,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

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