23

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs

@@ -1,3 +1,4 @@
+using Components;
 using JData;
 using System.Collections;
 using System.Collections.Generic;
@@ -20,6 +21,17 @@ namespace Adam
         public InputField[] userNames;
         public InputField[] workSpace;
         public GameObject jobCardPanel;
+        public GameObject jobChoiceQuestionPanel;
+        public OptionItem optionItemPrefab;
+        public Transform optionItemContent;
+        /// <summary>
+        /// 风险点分析
+        /// </summary>
+        public Button RiskPointAnalysisBtn;
+        /// <summary>
+        /// 安全措施
+        /// </summary>
+        public Button SafetyMeasuresBtn;
         // Use this for initialization
         private void Start()
         {
@@ -31,7 +43,11 @@ namespace Adam
                     GetValue(numb, index);
                 });
             }
+
+
+
             jobCardPanel.SetActive(false);
+            jobChoiceQuestionPanel.SetActive(false);
         }
 
         public async void GetValue(string numb, int _index)
@@ -41,7 +57,27 @@ namespace Adam
             JobCardData jData = await AsyncWebReq.Get<JobCardData>(_url);
             userNames[_index].text = jData.data.name;
             workSpace[_index].text = jData.data.adress;
+        }
 
+        /// <summary>
+        /// 0- 风险点，1-安全措施
+        /// </summary>
+        /// <param name="index"></param>
+        public void OnClick(int index)
+        {
+            jobChoiceQuestionPanel.SetActive(true);
+            if (index == 0)
+            {
+
+            }
+            else if (index == 1)
+            {
+
+            }
+            else
+            {
+
+            }
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_无互感器_无光伏_电箱门.fbx.meta

@@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: 13e6757fcb98e1e4bbc94e07f67e0dbb
 ModelImporter:
   serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
   externalObjects:
   - first:
       type: UnityEngine:Material

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/三相_有互感器_无光伏_电箱门.fbx.meta

@@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: 6fbd9caa46e05824fb3eba389c7d1b27
 ModelImporter:
   serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
   externalObjects:
   - first:
       type: UnityEngine:Material

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

@@ -5017,7 +5017,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalPosition.y

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

@@ -8776,7 +8776,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6fbd9caa46e05824fb3eba389c7d1b27, type: 3}

Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs

@@ -28,7 +28,7 @@ public class newfollow : MonoBehaviour
 
             // 进行碰撞检测
             bool res = Physics.Raycast(ray, out hit) && !EventSystem.current.IsPointerOverGameObject();
-
+          
             // 如果产生了碰撞
             if (hit.transform.name.Equals(name))
             {

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.16",
+        "com.unity.ide.rider": "3.0.15",
         "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.2.2"
+        "com.unity.testtools.codecoverage": "1.0.1"
       }
     },
     "com.unity.ide.rider": {
@@ -92,7 +92,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.services.core": {
-      "version": "1.6.0",
+      "version": "1.4.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -121,7 +121,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.2",
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {