提交一个版本，准备开始压缩贴图优化场景

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

@@ -5721,6 +5721,7 @@ GameObject:
   - component: {fileID: 1161015377608566971}
   - component: {fileID: 2993244767725096902}
   - component: {fileID: 46496024152883105}
+  - component: {fileID: 2411257273451524686}
   m_Layer: 0
   m_Name: "\u4E09\u76F8_A\u76F8\u8FDB\u7EBF_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F01"
   m_TagString: Untagged
@@ -5793,6 +5794,20 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &2411257273451524686
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5149988740122459108}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4965981680657870382, guid: 9de60dd4d0d418643a35708676024434, type: 3}
 --- !u!1 &5200072525722102205
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -758,6 +758,7 @@ GameObject:
   - component: {fileID: 7205021066026841065}
   - component: {fileID: 1350879835740943699}
   - component: {fileID: 3390733723298016066}
+  - component: {fileID: 8365005119078370623}
   m_Layer: 0
   m_Name: "\u4E09\u76F8_C\u76F8\u51FA\u7EBF_\u4E0D\u5E26\u4E92\u611F\u5668"
   m_TagString: Untagged
@@ -830,6 +831,20 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!64 &8365005119078370623
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1986889133199046776}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 6554076910040402412, guid: 9de60dd4d0d418643a35708676024434, type: 3}
 --- !u!1 &2051170210203744448
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -12160,7 +12160,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: d4778f3011663de4bbdac0361e0bd21e, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3343662046069406077, guid: d4778f3011663de4bbdac0361e0bd21e, type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -12242,7 +12242,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 233d1ed5b8ca64a4f8c466cec322b7cf, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 233d1ed5b8ca64a4f8c466cec322b7cf, type: 3}

Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/钳形电流表.prefab

@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4746120913896119046}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group17
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -41,7 +41,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8908368846004673723}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_8
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -74,7 +74,7 @@ GameObject:
   - component: {fileID: 1510498653468131571}
   - component: {fileID: 8083333804028303023}
   - component: {fileID: 8060894827574564018}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh17
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -156,7 +156,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8476607629018925953}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_7
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -187,7 +187,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4569857264886921150}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -220,7 +220,7 @@ GameObject:
   - component: {fileID: 3593119658715885829}
   - component: {fileID: 8894608374412218228}
   - component: {fileID: 5902783392504266881}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -303,7 +303,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1412327515338934020}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_5
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -336,7 +336,7 @@ GameObject:
   - component: {fileID: 6863689414392290985}
   - component: {fileID: 8044578243574067465}
   - component: {fileID: 2995178057851021996}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -420,7 +420,7 @@ GameObject:
   - component: {fileID: 7166864065046920756}
   - component: {fileID: 8803119539513020876}
   - component: {fileID: 1323511220634850497}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh16
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -503,7 +503,7 @@ GameObject:
   - component: {fileID: 3744470472664545976}
   - component: {fileID: 4732807883570881695}
   - component: {fileID: 5267447848939407980}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -586,7 +586,7 @@ GameObject:
   - component: {fileID: 856354189508394070}
   - component: {fileID: 6185989547905503852}
   - component: {fileID: 6727731447967569148}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh18
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -668,7 +668,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7565062848938117245}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_6
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -699,7 +699,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3001571435648375146}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group16
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -741,7 +741,7 @@ GameObject:
   - component: {fileID: 7225766980221362327}
   - component: {fileID: 2642407967348639564}
   - component: {fileID: 712922406971046451}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh19
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -822,7 +822,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1250851749381091549}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -854,7 +854,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6176178018017224778}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -885,7 +885,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3558027010293232005}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: __
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -917,7 +917,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1318875288723816913}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: ____1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -952,7 +952,7 @@ GameObject:
   - component: {fileID: 6158171241742345503}
   - component: {fileID: 6158171241742345500}
   - component: {fileID: 1304439518211024554}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: "\u94B3\u5F62\u7535\u6D41\u8868"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -993,7 +993,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6158171241742345501}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 0.1543576, y: 0.03646712, z: 0.27555346}
@@ -1074,6 +1074,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   attribute: 2
   rightAndWrong: 0
+  onEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  onDown:
+    m_PersistentCalls:
+      m_Calls: []
+  onDrag:
+    m_PersistentCalls:
+      m_Calls: []
+  onExit:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6229784074040811293
 GameObject:
   m_ObjectHideFlags: 0
@@ -1083,7 +1095,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4381305327205380603}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1117,7 +1129,7 @@ GameObject:
   - component: {fileID: 8815301766835690312}
   - component: {fileID: 640432348759470623}
   - component: {fileID: 3148247045032298343}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh20
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1200,7 +1212,7 @@ GameObject:
   - component: {fileID: 8052766349307259215}
   - component: {fileID: 8077896581930785308}
   - component: {fileID: 8259873583255218498}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh21
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1281,7 +1293,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 798318469011142299}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1314,7 +1326,7 @@ GameObject:
   - component: {fileID: 2479850269220612731}
   - component: {fileID: 6680923818199869575}
   - component: {fileID: 6705236448059270355}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh15
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1397,7 +1409,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7775139103552558503}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group15
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1429,7 +1441,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8927848855781106664}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: ____2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1461,7 +1473,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3045188933783192207}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group12
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1493,7 +1505,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6714006973245369769}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Group11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1525,7 +1537,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6229437332415234806}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: ___1_1_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1557,7 +1569,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 529358269224803276}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: _U39_4
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1588,7 +1600,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5544607966390666044}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: __1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1622,7 +1634,7 @@ GameObject:
   - component: {fileID: 2284983111740971690}
   - component: {fileID: 7298726139806341806}
   - component: {fileID: 1528828075962168210}
-  m_Layer: 0
+  m_Layer: 6
   m_Name: Mesh12
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity

@@ -8174,6 +8174,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5863485535301246023, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
+      propertyPath: _url
+      value: http://192.168.0.104:8089/index.html
+      objectReference: {fileID: 0}
     - target: {fileID: 5863485535301246023, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
       propertyPath: newWindowAction
       value: 2
@@ -8196,7 +8200,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5863485535498290381, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9d013d05025dab8428d976610feb0b7d, type: 3}

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -22,7 +22,9 @@ public class GameManager : MonoBehaviour
     [SerializeField] List<GameObject> GFGame;//光伏板物体
     [SerializeField] SceneData SceneData;//暂时数据
     [SerializeField] List<GameObject> Inverter;
-    public void AwakeAsync()
+    [SerializeField] Transform trans;
+    [SerializeField] List<Transform> DianLiuCube;
+    public void Awake()
     {
         if (ins!=null)
         {
@@ -30,7 +32,7 @@ public class GameManager : MonoBehaviour
             return;
         }
         ins = this;
-        
+        //Debug.Log(trans.GetComponent<interactive>()!=null?true:false);
     }
     // Start is called before the first frame update
     async void Start()
@@ -111,6 +113,21 @@ public class GameManager : MonoBehaviour
     {
         return String.Concat(str.Split(charsToRemove.ToArray()));
     }
+    public Transform NameContrast(string name)
+    {
+        Transform trans = null;
+        if (!string.IsNullOrEmpty(name))
+        {
+            for (int i = 0; i < DianLiuCube.Count; i++)
+            {
+                if (DianLiuCube[i].name.Equals(name))
+                {
+                    trans = DianLiuCube[i];
+                }
+            }
+        }
+        return trans;
+    }
 }
 /// <summary>
 /// 后台读的数据

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 539cb771e34617b4ebf4f5922e17661a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/interactive.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class interactive : MonoBehaviour
+{
+    public bool isInteractive;
+    public GameObject g1;
+    [ContextMenu("ÔËÐÐ")]
+    void init()
+    {
+        g1 = transform.GetChild(0).gameObject;
+    }
+}

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/interactive.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9771fe28a2d2ef14fb81137b5f350275
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs

@@ -35,7 +35,7 @@ public class newfollow : MonoBehaviour
             {
                 Debug.Log(hit.transform.name);
                 game.gameObject.SetActive(true);
-                game.init("https://blog.csdn.net/qq_42481369/article/details/114674590");
+                game.init("http://192.168.0.104:8089/index.html");
 
             }
         }

Electrical_inspectionCompetitionSystem/Assets/Script/Prefab/ClampAmmeters.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 
 /// <summary>
@@ -13,10 +14,11 @@ public class ClampAmmeters : MonoBehaviour
     //{
     //    offset = GetMouseWorldPos();
     //}
+    public LayerMask clickableLayer;
     public bool isok = false;
-    public void MouseDrag()
+    public void Start()
     {
-        
+        clickableLayer.value = 6;
     }
     public void Update()
     {
@@ -27,13 +29,14 @@ public class ClampAmmeters : MonoBehaviour
 
             if (Physics.Raycast(ray, out hitInfo))
             {
-                float Z = Math.Clamp(hitInfo.point.z, 0.2f, 1f);
+                Transform trans = GameManager.ins.NameContrast(hitInfo.collider.name);
-                if (hitInfo.point.x!=0|| hitInfo.point.y!=0)
+                if (trans != null)
                 {
-                    transform.GetComponent<BoxCollider>().isTrigger= true;
+                    transform.position = trans.position;
-                    transform.position = hitInfo.point;
                 }
             }
         }
     }
+
+
 }

Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset

@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - door
+  - dianliu
   layers:
   - Default
   - TransparentFX
@@ -12,14 +13,14 @@ TagManager:
   - PostProcess
   - Water
   - UI
-  - gaowen
+  - QianXing
-  - daidian
+  - 
-  - qianxing
+  - 
-  - wanyong
+  - 
-  - noevent
+  - 
-  - tools
+  - 
   - map
-  - LocalWatch
+  - 
   - 
   - 
   -