修复钳形电流表，修复分数逻辑

2023-09-17 00:19:12 +08:00 · 2023-09-17 00:19:12 +08:00 · c19903a1b5
parent 33f584fbc0
commit c19903a1b5
5 changed files with 435 additions and 12 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐
@ -1020,6 +1020,7 @@ GameObject:
  - component: {fileID: 22497228}
  - component: {fileID: 22497227}
  - component: {fileID: 22497226}
+  - component: {fileID: 22497229}
  m_Layer: 0
  m_Name: Cube (14)
  m_TagString: Untagged
@ -1105,6 +1106,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 22497224}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &22497229
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 22497224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 22497224}
 --- !u!1 &23650108
 GameObject:
  m_ObjectHideFlags: 0
@ -2723,6 +2738,7 @@ GameObject:
  - component: {fileID: 46362816}
  - component: {fileID: 46362815}
  - component: {fileID: 46362814}
+  - component: {fileID: 46362817}
  m_Layer: 0
  m_Name: Cube (6)
  m_TagString: Untagged
@ -2808,6 +2824,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 46362812}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &46362817
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 46362812}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 46362812}
 --- !u!1001 &49114770
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -11316,6 +11346,7 @@ GameObject:
  - component: {fileID: 330447557}
  - component: {fileID: 330447556}
  - component: {fileID: 330447555}
+  - component: {fileID: 330447558}
  m_Layer: 0
  m_Name: Cube (3)
  m_TagString: Untagged
@ -11401,6 +11432,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 330447553}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &330447558
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 330447553}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 330447553}
 --- !u!1 &332020152
 GameObject:
  m_ObjectHideFlags: 0
@ -13357,6 +13402,7 @@ GameObject:
  - component: {fileID: 387062760}
  - component: {fileID: 387062759}
  - component: {fileID: 387062758}
+  - component: {fileID: 387062761}
  m_Layer: 0
  m_Name: Cube (11)
  m_TagString: Untagged
@ -13442,6 +13488,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 387062756}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &387062761
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 387062756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 387062756}
 --- !u!1 &388288287
 GameObject:
  m_ObjectHideFlags: 0
@ -14249,6 +14309,7 @@ GameObject:
  - component: {fileID: 404188182}
  - component: {fileID: 404188181}
  - component: {fileID: 404188180}
+  - component: {fileID: 404188183}
  m_Layer: 0
  m_Name: Cube (8)
  m_TagString: Untagged
@ -14334,6 +14395,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 404188178}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &404188183
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 404188178}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 404188178}
 --- !u!1001 &408620520
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -16649,6 +16724,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 0
  CompletedorNot: 0
  Erroritem: 0
  scorercontinuer: 0
@ -16664,6 +16743,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 0
  CompletedorNot: 0
  Erroritem: 0
  scorercontinuer: 0
@ -23254,6 +23337,7 @@ GameObject:
  - component: {fileID: 589266589}
  - component: {fileID: 589266588}
  - component: {fileID: 589266587}
+  - component: {fileID: 589266590}
  m_Layer: 0
  m_Name: Cube (1)
  m_TagString: Untagged
@ -23339,6 +23423,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 589266585}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &589266590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 589266585}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 589266585}
 --- !u!1 &590917549 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 6545043018726476853, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
@ -23885,6 +23983,25 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 1009856069859996744, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3}
+--- !u!114 &612038214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 612038204}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 1
+  CompletedorNot: 0
+  Erroritem: 0
+  scorercontinuer: 2
 --- !u!1001 &618341781
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -30318,6 +30435,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 0
  CompletedorNot: 0
  Erroritem: 0
  scorercontinuer: 0
@ -30436,6 +30557,7 @@ GameObject:
  - component: {fileID: 768554331}
  - component: {fileID: 768554330}
  - component: {fileID: 768554329}
+  - component: {fileID: 768554332}
  m_Layer: 0
  m_Name: Cube (2)
  m_TagString: Untagged
@ -30521,6 +30643,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 768554327}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &768554332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 768554327}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 768554327}
 --- !u!1 &768930813
 GameObject:
  m_ObjectHideFlags: 0
@ -33832,6 +33968,7 @@ GameObject:
  - component: {fileID: 857901083}
  - component: {fileID: 857901082}
  - component: {fileID: 857901081}
+  - component: {fileID: 857901084}
  m_Layer: 0
  m_Name: Cube (12)
  m_TagString: Untagged
@ -33917,6 +34054,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 857901079}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &857901084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 857901079}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 857901079}
 --- !u!1 &858802928
 GameObject:
  m_ObjectHideFlags: 0
@ -34125,6 +34276,7 @@ GameObject:
  - component: {fileID: 860142380}
  - component: {fileID: 860142379}
  - component: {fileID: 860142378}
+  - component: {fileID: 860142381}
  m_Layer: 0
  m_Name: Cube (13)
  m_TagString: Untagged
@ -34210,6 +34362,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 860142376}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &860142381
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860142376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 860142376}
 --- !u!1 &861029008
 GameObject:
  m_ObjectHideFlags: 0
@ -43333,6 +43499,68 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1043781156}
  m_Mesh: {fileID: 1436494636483585514, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
+--- !u!1001 &1045207883
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2401820165377604994}
+    m_Modifications:
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.127
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.57
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.668
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4228206944499231249, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+      propertyPath: m_Name
+      value: "\u9A8C\u7535\u7B14"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+--- !u!4 &1045207884 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4228206944499231248, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
+  m_PrefabInstance: {fileID: 1045207883}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1045357636
 GameObject:
  m_ObjectHideFlags: 0
@ -45374,6 +45602,7 @@ GameObject:
  - component: {fileID: 1104386625}
  - component: {fileID: 1104386624}
  - component: {fileID: 1104386623}
+  - component: {fileID: 1104386626}
  m_Layer: 0
  m_Name: Cube (7)
  m_TagString: Untagged
@ -45459,6 +45688,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1104386621}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1104386626
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1104386621}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 1104386621}
 --- !u!1 &1106039270
 GameObject:
  m_ObjectHideFlags: 0
@ -52722,6 +52965,25 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -584779548939971659, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3}
+--- !u!114 &1315042792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1315042783}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 2
+  CompletedorNot: 0
+  Erroritem: 0
+  scorercontinuer: 2
 --- !u!4 &1316576279 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 77b1d460d8db5724689f54dfac596fd9, type: 3}
@ -56499,6 +56761,7 @@ GameObject:
  - component: {fileID: 1424131460}
  - component: {fileID: 1424131459}
  - component: {fileID: 1424131458}
+  - component: {fileID: 1424131461}
  m_Layer: 0
  m_Name: Cube (9)
  m_TagString: Untagged
@ -56584,6 +56847,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1424131456}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1424131461
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1424131456}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 1424131456}
 --- !u!1 &1424258179
 GameObject:
  m_ObjectHideFlags: 0
@ -57462,6 +57739,7 @@ GameObject:
  - component: {fileID: 1439601817}
  - component: {fileID: 1439601816}
  - component: {fileID: 1439601815}
+  - component: {fileID: 1439601818}
  m_Layer: 0
  m_Name: Cube
  m_TagString: Untagged
@ -57547,6 +57825,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1439601813}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1439601818
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1439601813}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 1439601813}
 --- !u!1 &1444831160
 GameObject:
  m_ObjectHideFlags: 0
@ -58110,6 +58402,53 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1452087186}
  m_Mesh: {fileID: 3724841384961971033, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
+--- !u!1 &1452765200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1452765202}
+  - component: {fileID: 1452765201}
+  m_Layer: 0
+  m_Name: FractionManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1452765201
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452765200}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3811b0893edc7c841a6ce93262914e87, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+--- !u!4 &1452765202
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452765200}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 110.641846, y: 1.4590672, z: 323.03583}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 24
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1454996775 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2449794067885901426, guid: 028e09647b77e7d47a4bee758abe8f4f, type: 3}
@ -63338,8 +63677,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 3811b0893edc7c841a6ce93262914e87, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  fractions: []
-  Totalscore: 0
+  fractions:
+  - {fileID: 612038214}
+  - {fileID: 1315042792}
+  - {fileID: 1622483123}
+  Totalscore: 60
+  Btn: {fileID: 0}
 --- !u!1 &1593114876
 GameObject:
  m_ObjectHideFlags: 0
@ -64642,6 +64985,25 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -7611319514675676910, guid: fb9dcd7a1b7c9d541a485f770d0c786c, type: 3}
+--- !u!114 &1622483123
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1622483114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 0
+  CompletedorNot: 1
+  Erroritem: 0
+  scorercontinuer: 2
 --- !u!1 &1623173871
 GameObject:
  m_ObjectHideFlags: 0
@ -68733,6 +69095,7 @@ GameObject:
  - component: {fileID: 1729964139}
  - component: {fileID: 1729964138}
  - component: {fileID: 1729964137}
+  - component: {fileID: 1729964140}
  m_Layer: 0
  m_Name: Cube (5)
  m_TagString: Untagged
@ -68818,6 +69181,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1729964135}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1729964140
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1729964135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 1729964135}
 --- !u!1 &1730342209
 GameObject:
  m_ObjectHideFlags: 0
@ -70525,6 +70902,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ecf0517a4c6b1754da4221d7dc7f81d0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  fractions: []
+  Totalscore: 0
+  Btn: {fileID: 0}
+  id: 0
  CompletedorNot: 0
  Erroritem: 0
  scorercontinuer: 0
@ -76660,6 +77041,7 @@ GameObject:
  - component: {fileID: 1937373364}
  - component: {fileID: 1937373363}
  - component: {fileID: 1937373362}
+  - component: {fileID: 1937373365}
  m_Layer: 0
  m_Name: Cube (4)
  m_TagString: Untagged
@ -76745,6 +77127,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1937373360}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1937373365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1937373360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 1937373360}
 --- !u!1001 &1945015010
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -83239,6 +83635,7 @@ GameObject:
  - component: {fileID: 2083369483}
  - component: {fileID: 2083369482}
  - component: {fileID: 2083369481}
+  - component: {fileID: 2083369484}
  m_Layer: 0
  m_Name: Cube (10)
  m_TagString: Untagged
@ -83324,6 +83721,20 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2083369479}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &2083369484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2083369479}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 2083369479}
 --- !u!4 &2085620956 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 8218279069463963240, guid: c83d177251e39d341bd34e7b73295da7, type: 3}
@ -95208,6 +95619,7 @@ Transform:
  - {fileID: 1615034840}
  - {fileID: 1646795801}
  - {fileID: 911492682}
+  - {fileID: 1045207884}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 83.982, z: 0}
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs
@ -2,10 +2,18 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

-public class Fraction : MonoBehaviour
+public class Fraction : FractionManager
 {
+    public new int id;
+    [Header("是否完成")]
    public bool CompletedorNot;
+    [Header("是否是错误项")]
    public bool Erroritem;
+    [Header("当前项分数")]
    public int scorercontinuer;
+    private void OnDisable()
+    {
+        base.id.Enqueue(id);
+    }
    //public 
 }
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs
@ -1,15 +1,19 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;

 public class FractionManager : MonoBehaviour
 {
    [SerializeField] List<Fraction> fractions;
    [SerializeField] int Totalscore;
+    public Queue<int> id = new Queue<int>();
+    [SerializeField] Button Btn;
    // Start is called before the first frame update
    void Start()
    {
-
+        Btn = GetComponent<Button>();
+        Btn.onClick.AddListener(()=>over());
    }

    // Update is called once per frame
@ -19,13 +23,12 @@ public class FractionManager : MonoBehaviour
        {
            if(!fractions[i].CompletedorNot)
            {
-                if (!fractions[i].Erroritem)
+                if (!fractions[i].Erroritem|| !id.Dequeue().Equals(i))
                {
                    Totalscore -= fractions[i].scorercontinuer;
                    continue;
                }
-
-                    //Totalscore -= fractions[i].score;
+                Totalscore -= fractions[i].scorercontinuer;
            }
        }
        Debug.Log("¼Æ·ÖÍê³É");
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs
@ -15,7 +15,7 @@ public class ClampAmmetersInteractive : MonoBehaviour
    [ContextMenu("ÔËÐÐ")]
    void init()
    {
-        g1 = g1.GetComponent<GameObject>();
+        g1 = gameObject;
        //Destroy(g1.GetComponent<MeshFilter>());
        //Destroy(g1.GetComponent<MeshRenderer>());
        //Destroy(g1.GetComponent<BoxCollider>());
--- a/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
+++ b/Electrical_inspectionCompetitionSystem/Packages/packages-lock.json
@ -35,12 +35,12 @@
      "source": "builtin",
      "dependencies": {
        "com.unity.ide.visualstudio": "2.0.16",
-        "com.unity.ide.rider": "3.0.15",
+        "com.unity.ide.rider": "3.0.16",
        "com.unity.ide.vscode": "1.2.5",
        "com.unity.editorcoroutines": "1.0.0",
        "com.unity.performance.profile-analyzer": "1.1.1",
        "com.unity.test-framework": "1.1.31",
-        "com.unity.testtools.codecoverage": "1.0.1"
+        "com.unity.testtools.codecoverage": "1.2.2"
      }
    },
    "com.unity.ide.rider": {
@ -92,7 +92,7 @@
      "url": "https://packages.unity.cn"
    },
    "com.unity.services.core": {
-      "version": "1.4.2",
+      "version": "1.6.0",
      "depth": 1,
      "source": "registry",
      "dependencies": {
@ -121,7 +121,7 @@
      "url": "https://packages.unity.cn"
    },
    "com.unity.testtools.codecoverage": {
-      "version": "1.0.1",
+      "version": "1.2.2",
      "depth": 1,
      "source": "registry",
      "dependencies": {