提交电箱，及剩余判分逻辑

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

@@ -5910,3 +5910,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isDian: 0
+--- !u!114 &1791810248
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4728026782583967234}
+  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: 5
+  name: "\u9A8C\u7535\u7B14(Clone)"
+  orderName: "\u9A8C\u7535"

Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity

@@ -3278,6 +3278,7 @@ MonoBehaviour:
   stopValveImage: {fileID: 1948143378}
   timeCount: 0
   limitTime: 0.15
+  linearMeasure: 0
   index: 0
   currentPos: {x: 0, y: 0}
   trans: {fileID: 0}
@@ -14826,8 +14827,9 @@ MonoBehaviour:
   id: 0
   CompletedorNot: 0
   Erroritem: 0
-  scorercontinuer: 0
+  scorercontinuer: 2
   name: 
+  orderName: "\u5DE5\u4F5C\u8BC1"
 --- !u!4 &426491808 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8248288153746938395, guid: 07ac2788930297046a9a9aaff8c97b2c, type: 3}
@@ -16106,6 +16108,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 0
   name: 
+  orderName: 
 --- !u!114 &451662891
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -16126,6 +16129,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 0
   name: 
+  orderName: 
 --- !u!1001 &458864385
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -18634,6 +18638,7 @@ MonoBehaviour:
   stopValveImage: {fileID: 1752228207}
   timeCount: 0
   limitTime: 0.2
+  linearMeasure: 0
   index: 0
   currentPos: {x: 0, y: 0}
   trans: {fileID: 0}
@@ -26850,6 +26855,32 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5589534452104218409, guid: 9b54ee1e7aceeba4088aa0d3b7241aae, type: 3}
   m_PrefabInstance: {fileID: 696764693}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &696764696 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8923754507355673164, guid: 9b54ee1e7aceeba4088aa0d3b7241aae, type: 3}
+  m_PrefabInstance: {fileID: 696764693}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &696764697
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 696764696}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 2
+  name: 
+  orderName: 
 --- !u!1001 &696870979
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -29352,6 +29383,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 0
   name: 
+  orderName: 
 --- !u!4 &766006828 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 946436029104906300, guid: 568d8d8f18356ad4caa6547c08ceaab3, type: 3}
@@ -36449,6 +36481,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 2.5
   name: "\u9A8C\u7535\u7B14(Clone)"
+  orderName: 
 --- !u!1 &939356159
 GameObject:
   m_ObjectHideFlags: 0
@@ -55918,6 +55951,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 2.5
   name: "\u9A8C\u7535\u7B14(Clone)"
+  orderName: 
 --- !u!1 &1477332144
 GameObject:
   m_ObjectHideFlags: 0
@@ -58940,6 +58974,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1543654487}
   - component: {fileID: 1543654486}
+  - component: {fileID: 1543654488}
   m_Layer: 0
   m_Name: CameraManager
   m_TagString: Untagged
@@ -58978,6 +59013,27 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1543654488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1543654485}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 2
+  name: 
+  orderName: 
 --- !u!1 &1544715151
 GameObject:
   m_ObjectHideFlags: 0
@@ -67117,6 +67173,7 @@ MonoBehaviour:
   Erroritem: 0
   scorercontinuer: 0
   name: 
+  orderName: 
 --- !u!1 &1775938654
 GameObject:
   m_ObjectHideFlags: 0
@@ -67718,10 +67775,30 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
 --- !u!1 &1791810247 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 4728026782583967234, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
+  m_CorrespondingSourceObject: {fileID: 7422967581352539548, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
   m_PrefabInstance: {fileID: 1791810246}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1791810248
+--- !u!1 &1791810248 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3950599454043995376, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
+  m_PrefabInstance: {fileID: 1791810246}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1791810249 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4189062048988151872, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
+  m_PrefabInstance: {fileID: 1791810246}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1791810250 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 675359599343669253, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
+  m_PrefabInstance: {fileID: 1791810246}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1791810251 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6708985574009128475, guid: 65bfd8393f8649845a55ae25b42f6099, type: 3}
+  m_PrefabInstance: {fileID: 1791810246}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1791810252
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67739,8 +67816,93 @@ MonoBehaviour:
   id: 0
   CompletedorNot: 0
   Erroritem: 0
-  scorercontinuer: 0
+  scorercontinuer: 0.3
   name: 
+  orderName: 
+--- !u!114 &1791810253
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1791810248}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 0.3
+  name: 
+  orderName: 
+--- !u!114 &1791810254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1791810249}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 0.3
+  name: 
+  orderName: 
+--- !u!114 &1791810255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1791810250}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 0.3
+  name: 
+  orderName: 
+--- !u!114 &1791810256
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1791810251}
+  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: 0
+  Erroritem: 0
+  scorercontinuer: 0.3
+  name: 
+  orderName: 
 --- !u!1 &1794701649
 GameObject:
   m_ObjectHideFlags: 0
@@ -81492,6 +81654,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!33 &103665586572150244
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -82844,6 +83008,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!4 &554189251323931875
 Transform:
   m_ObjectHideFlags: 0
@@ -82968,6 +83134,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!1 &590723110959959151
 GameObject:
   m_ObjectHideFlags: 0
@@ -83869,6 +84037,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!23 &832619338999474934
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -84581,6 +84751,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!4 &984881775158257347
 Transform:
   m_ObjectHideFlags: 0
@@ -84611,6 +84783,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!33 &986493321439845694
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -85236,6 +85410,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!4 &1127675622180248741
 Transform:
   m_ObjectHideFlags: 0
@@ -85853,6 +86029,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!33 &1254889740818102185
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -93416,6 +93594,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!23 &2498195703580325393
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -93885,6 +94065,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!23 &2598389080269526869
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -94539,6 +94721,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!1 &2739453376186451831
 GameObject:
   m_ObjectHideFlags: 0
@@ -94666,6 +94850,8 @@ MonoBehaviour:
   isInteractive: 0
   g1: {fileID: 0}
   name: 
+  linearMeasure: 0
+  floats: []
 --- !u!1 &2768174694713984503
 GameObject:
   m_ObjectHideFlags: 0

Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/Fraction.cs

@@ -15,16 +15,37 @@ public class Fraction : FractionManager
     public string name;
     [Header("Ãû×Ö")]
     public string orderName;
+    bool Enable = false;
+    private void Start()
+    {
+        ins.fractions.Add(this);
+        Enable = true;
+    }
     private void OnDisable()
     {
-        base.order.Add(id,orderName);
+        if (Enable)
+        {
+            base.order.Add(id, orderName);
+        }
+
     }
     public void OnCollisionEnter(Collision collision)
     {
-        if (collision.collider.name.Equals(name))
+        if (Enable)
+        {
+            if (collision.collider.name.Equals(name))
+            {
+                CompletedorNot = true;
+            }
+        }
+    }
+    public void OnMouseDown()
+    {
+        if (Enable)
         {
             CompletedorNot = true;
         }
+
     }
     //public 
 }

Electrical_inspectionCompetitionSystem/Assets/Script/FractionManager/FractionManager.cs

@@ -1,15 +1,21 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class FractionManager : MonoBehaviour
 {
-    [SerializeField] List<Fraction> fractions;
+    public static FractionManager ins;
+    public List<Fraction> fractions;
     [SerializeField] float Totalscore;
     public Dictionary<int, string> order = new Dictionary<int, string>();
     [SerializeField] Button Btn;
-
+    private void Awake()
+    {
+        ins = this;
+        fractions = new List<Fraction>();
+    }
     // Start is called before the first frame update
     void Start()
     {

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -24,8 +24,8 @@ public class GameManager : MonoBehaviour
     [SerializeField] SceneData SceneData;//暂时数据
     [SerializeField] List<GameObject> Inverter;
     [SerializeField] Transform trans;
-    [SerializeField] StopValve WanStopValve;
+    public StopValve WanStopValve;
-    [SerializeField] StopValve QianStopValve;
+    public StopValve QianStopValve;
     [SerializeField] GameObject NiBianQi;
     [SerializeField] Image XiangWeiUI;//相位UI
     public GameObject temp;

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxPengZhuang.cs

@@ -21,6 +21,7 @@ public class BoxPengZhuang : MonoBehaviour
             g1.gameObject.SetActive(true);
             g1.init(dialogue);
             fraction.CompletedorNot = true;
+            GetComponent<Fraction>().CompletedorNot = true;
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs

@@ -9,6 +9,8 @@ public class ClampAmmetersInteractive : MonoBehaviour
     public bool isInteractive;
     public GameObject g1;
     public string name;
+    public float linearMeasure;//默认的大小
+    public List<float> floats;
     private void Start()
     {
         transform.AddComponent<MeshCollider>();
@@ -24,12 +26,19 @@ public class ClampAmmetersInteractive : MonoBehaviour
     private void OnMouseDown()
     {
         //Debug.Log("ok");
-        if (GameManager.ins.temp.transform!=null&& GameManager.ins.temp.transform.name.Equals("钳形电流表(Clone)")|| GameManager.ins.temp.transform.name.Equals("钳形电流表_大(Clone)"))
+        if (GameManager.ins.temp.transform != null && GameManager.ins.temp.transform.name.Equals("钳形电流表(Clone)") || GameManager.ins.temp.transform.name.Equals("钳形电流表_大(Clone)"))
         {
             GameManager.ins.temp.transform.parent = g1.transform;
             GameManager.ins.temp.transform.DOLocalRotate(new Vector3(44.98f, 0, 0), 0.25f);
             GameManager.ins.temp.transform.DOScale(new Vector3(20, 20, 20), 0.25f);
             GameManager.ins.temp.transform.DOLocalMove(new Vector3(1.04f, -3.91f, 3.82f), 0.25f);
+            for (int i = 0; i < floats.Count; i++)
+            {
+                if (floats[(int)(GameManager.ins.QianStopValve.linearMeasure / 10)]> linearMeasure)
+                {
+                    GetComponent<Fraction>().CompletedorNot = true;
+                }
+            }
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs

@@ -10,6 +10,7 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
     [SerializeField] Image stopValveImage;   //截止阀
     public float timeCount = 0;
     public float limitTime = 0;
+    public float linearMeasure;
     public int index;   //阀门旋转多少圈可以开到100
     public Vector2 currentPos = new Vector2();
     public Transform trans;
@@ -60,6 +61,7 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
     {
         float z = Mathf.Clamp(angle, mix, max);
         stopValveImage.transform.eulerAngles = new Vector3(0, 0, z);
+        linearMeasure = z;
         if (transform.name.Equals("万用表"))
         {
             trans.DOLocalRotate(new Vector3(X, 0, ~(int)z), 0.01f);

Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs

@@ -30,6 +30,7 @@ public class CameraManager : MonoBehaviour
         //text = Btn.GetComponentInChildren<TextMeshProUGUI>();
         to.onValueChanged.AddListener((x) =>
         {
+            GetComponent<Fraction>().CompletedorNot = true;
             if (x)
             {
                 OverLook();

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": {