2023.9.2

Electrical_inspectionCompetitionSystem/Assets/8.23/GameAssets/Models/0719/配电箱线缆及G杆抱箍.fbm/NDKS_089.jpg.meta

@@ -53,7 +53,7 @@ TextureImporter:
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 1
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1

Electrical_inspectionCompetitionSystem/Assets/Scenes/主流程_开放.unity

@@ -52029,6 +52029,11 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 478151283}
   m_CullTransparentMesh: 1
+--- !u!1 &479069284 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
+  m_PrefabInstance: {fileID: 1980167795}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &479978855
 GameObject:
   m_ObjectHideFlags: 0
@@ -67324,15 +67329,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.0047858665
+      value: 0.0267
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.0019513558
+      value: -0.0034
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -0.025580889
+      value: -0.0039
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_LocalRotation.w
@@ -67370,6 +67375,10 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 11
       objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
 --- !u!4 &626200198 stripped
@@ -100466,6 +100475,11 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 942048511}
   m_Mesh: {fileID: 7537268807720273559, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
+--- !u!1 &943289090 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
+  m_PrefabInstance: {fileID: 626200197}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &944122609
 GameObject:
   m_ObjectHideFlags: 0
@@ -141290,7 +141304,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1304341814}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.1701, y: 0.6709999, z: 0.429}
+  m_LocalPosition: {x: 0.0595, y: 0.6709999, z: 0.429}
   m_LocalScale: {x: 0.131498, y: 0.13149798, z: 0.083593346}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -141311,7 +141325,7 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1, y: 1.75, z: 1}
-  m_Center: {x: -0.12, y: -0.59, z: 0}
+  m_Center: {x: 0.76, y: -0.59, z: 0}
 --- !u!23 &1304341817
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -141393,8 +141407,10 @@ MonoBehaviour:
   raycast_Control: {fileID: 1304341822}
   audioSource: {fileID: 138818147}
   "\u9A8C\u7535\u7B14": {fileID: 1536710593}
-  "\u4F7F\u7528\u4E2D\u6A21\u578B": {fileID: 0}
+  "\u62D6\u62FD\u8D77\u59CB\u4F4D\u7F6E": {fileID: 1304341815}
-  "\u521D\u59CB\u89D2\u5EA6\u6A21\u578B": {fileID: 0}
+  "\u4F7F\u7528\u4E2D\u6A21\u578B": {fileID: 479069284}
+  "\u521D\u59CB\u89D2\u5EA6\u6A21\u578B": {fileID: 943289090}
+  highlighter: {fileID: 1805128070}
 --- !u!114 &1304341822
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -194693,6 +194709,166 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1804149261}
   m_Mesh: {fileID: -8474200710523060804, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
+--- !u!1 &1805128068
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1805128069}
+  - component: {fileID: 1805128073}
+  - component: {fileID: 1805128072}
+  - component: {fileID: 1805128071}
+  - component: {fileID: 1805128070}
+  m_Layer: 11
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1805128069
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805128068}
+  m_LocalRotation: {x: -0.7332768, y: -0.009350583, z: -0.008668892, w: 0.67981064}
+  m_LocalPosition: {x: 0.0003, y: -0.0021, z: -0.00396}
+  m_LocalScale: {x: -0.0034782127, y: -0.008760092, z: 0.00009842123}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1980167796}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: -94.334, y: 0, z: -1.4609985}
+--- !u!114 &1805128070
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805128068}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67d4de287b46eb34e83a61e4f9115070, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  forceRender: 0
+  color: {r: 1, g: 1, b: 1, a: 1}
+  _overlay: 0
+  _occluder: 0
+  _tween: 0
+  _tweenGradient:
+    serializedVersion: 2
+    key0: {r: 0, g: 1, b: 1, a: 0}
+    key1: {r: 0, g: 1, b: 1, a: 1}
+    key2: {r: 0, g: 0, b: 0, a: 0}
+    key3: {r: 0, g: 0, b: 0, a: 0}
+    key4: {r: 0, g: 0, b: 0, a: 0}
+    key5: {r: 0, g: 0, b: 0, a: 0}
+    key6: {r: 0, g: 0, b: 0, a: 0}
+    key7: {r: 0, g: 0, b: 0, a: 0}
+    ctime0: 0
+    ctime1: 65535
+    ctime2: 0
+    ctime3: 0
+    ctime4: 0
+    ctime5: 0
+    ctime6: 0
+    ctime7: 0
+    atime0: 0
+    atime1: 65535
+    atime2: 0
+    atime3: 0
+    atime4: 0
+    atime5: 0
+    atime6: 0
+    atime7: 0
+    m_Mode: 0
+    m_NumColorKeys: 2
+    m_NumAlphaKeys: 2
+  _tweenDuration: 1
+  _tweenReverse: 0
+  _tweenLoop: 2
+  _tweenEasing: 0
+  _tweenDelay: 0
+  _tweenRepeatCount: -1
+  _tweenUseUnscaledTime: 0
+  _constant: 0
+  _constantColor: {r: 1, g: 0.08682595, b: 0.015686274, a: 1}
+  _constantFadeInTime: 0.1
+  _constantFadeOutTime: 0.25
+  _constantEasing: 0
+  _constantUseUnscaledTime: 0
+  _filterMode: 0
+  _filterList: []
+--- !u!65 &1805128071
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805128068}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1805128072
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805128068}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 695c4b7303c525c4cbc95d93f2ee7a63, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1805128073
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805128068}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1806307777
 GameObject:
   m_ObjectHideFlags: 0

Electrical_inspectionCompetitionSystem/Assets/Script/raycast/CheckCurrent.cs

@@ -7,17 +7,29 @@ public class CheckCurrent : MonoBehaviour
     public Raycast_control raycast_Control;
     public AudioSource audioSource;
     public Transform 验电笔;
+    public Transform 拖拽起始位置;
     public GameObject 使用中模型;
     public GameObject 初始角度模型;
+    public HighlightingSystem.Highlighter highlighter;
     private Vector3 startrot;
     private Vector3 startpos;
-    // Start is called before the first frame update
+    private Vector3 originpos;
+    private Vector3 originrot;
+    // Start is called before the fir
+    // st frame update
     void Start()
     {
         startrot = 验电笔.transform.localEulerAngles;
         startpos = 验电笔.transform.localPosition;
-    }
+         originpos = 拖拽起始位置.transform.localPosition ;
+         originrot = 拖拽起始位置.transform.localEulerAngles ;
      
+    }
+    private void OnEnable()
+    {
+        //拖拽起始位置.transform.localPosition = originpos;
+        //拖拽起始位置.transform.localEulerAngles = originrot;
+    }
     // Update is called once per frame
     void Update()
     {
@@ -27,11 +39,16 @@ public class CheckCurrent : MonoBehaviour
             if (raycast_Control.hitgo.GetComponent<CurrentJudgment>())
             {
                 if (raycast_Control.hitgo.GetComponent<CurrentJudgment>().是否带电 == true)
-                { audioSource.gameObject.SetActive(true); }
+                { audioSource.gameObject.SetActive(true);
-
+                    highlighter.constant = true;
+                }
+                初始角度模型.SetActive(false);
+                使用中模型.SetActive(true);
                 验电笔.transform.localEulerAngles = raycast_Control.hitgo.transform.forward;
                 验电笔.transform.position = raycast_Control.hitInfo.point;
                 验电笔.GetComponent<Collider>().enabled = true;
+
+
             }
            
 
@@ -41,11 +58,12 @@ public class CheckCurrent : MonoBehaviour
         else
         {
             
-
             audioSource.gameObject.SetActive(false);
-
+            highlighter.constant = false;
-            Ñéµç±Ê.transform.localEulerAngles = startrot;
+            初始角度模型.SetActive(true);
+            使用中模型.SetActive(false);
             验电笔.transform.localPosition = startpos;
+            验电笔.transform.localEulerAngles = startrot;
             验电笔.GetComponent<Collider>().enabled = false;
         }
     }