Merge branch 'master' of http://119.45.94.212:1280/zhuyayu/E_ElecCompetition

Electrical_inspectionCompetitionSystem/Assets/02_ui.meta

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

Electrical_inspectionCompetitionSystem/Assets/02_ui/组 37 (2).png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: c3c4e7b6ac51c114b9658e4a8cd0d5aa
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/02_ui/组 37.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 52ba8aa3a825e0e4696540e8684a9ee8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/02_ui/组 38 (2).png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: ea55b0ddb30e3414eb83903f01f8a1aa
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/02_ui/组 38.png.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 88573bcf672d7af4b9209c17aa53db02
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Plugins/Camera Filter Pack/Scripts/CameraFilterPack_Blur_GaussianBlur.cs

@@ -6,83 +6,79 @@ using UnityEngine;
 using System.Collections;
 
 [ExecuteInEditMode]
-[AddComponentMenu ("Camera Filter Pack/Blur/GaussianBlur")]
+[AddComponentMenu("Camera Filter Pack/Blur/GaussianBlur")]
-public class CameraFilterPack_Blur_GaussianBlur : MonoBehaviour {
+public class CameraFilterPack_Blur_GaussianBlur : MonoBehaviour
-#region Variables
+{
-public Shader SCShader;
+    #region Variables
-private float TimeX = 1.0f;
+    public Shader SCShader;
-[Range(1, 16)] public float Size = 10;
+    private float TimeX = 1.0f;
- 
+    [Range(1, 16)] public float Size = 10;
-private Material SCMaterial;
 
-#endregion
+    private Material SCMaterial;
 
-#region Properties
+    #endregion
-Material material
-{
-get
-{
-if(SCMaterial == null)
-{
-SCMaterial = new Material(SCShader);
-SCMaterial.hideFlags = HideFlags.HideAndDontSave;	
-}
-return SCMaterial;
-}
-}
-#endregion
-void Start () 
-{
 
-SCShader = Shader.Find("CameraFilterPack/Blur_GaussianBlur");
+    #region Properties
+    Material material
+    {
+        get
+        {
+            if (SCMaterial == null)
+            {
+                SCMaterial = new Material(SCShader);
+                SCMaterial.hideFlags = HideFlags.HideAndDontSave;
+            }
+            return SCMaterial;
+        }
+    }
+    #endregion
+    void Start()
+    {
 
-if(!SystemInfo.supportsImageEffects)
+        SCShader = Shader.Find("CameraFilterPack/Blur_GaussianBlur");
-{
-enabled = false;
-return;
-}
-}
 
-void OnRenderImage (RenderTexture sourceTexture, RenderTexture destTexture)
+        if (!SystemInfo.supportsImageEffects)
-{
+        {
-if(SCShader != null)
+            enabled = false;
-{
+            return;
-TimeX+=Time.deltaTime;
+        }
-if (TimeX>100)  TimeX=0;
+    }
-material.SetFloat("_TimeX", TimeX);
+    void OnRenderImage(RenderTexture sourceTexture, RenderTexture destTexture)
-material.SetFloat("_Distortion", Size);
+    {
-material.SetVector("_ScreenResolution",new Vector2(Screen.width,Screen.height));
+        if (SCShader != null)
-Graphics.Blit(sourceTexture, destTexture, material);
+        {
-}
+            TimeX += Time.deltaTime;
-else
+            if (TimeX > 100) TimeX = 0;
-{
+            material.SetFloat("_TimeX", TimeX);
-Graphics.Blit(sourceTexture, destTexture);	
+            material.SetFloat("_Distortion", Size);
-}
+            material.SetVector("_ScreenResolution", new Vector2(Screen.width, Screen.height));
+            Graphics.Blit(sourceTexture, destTexture, material);
+        }
+        else
+        {
+            Graphics.Blit(sourceTexture, destTexture);
+        }
 
 
-}
+    }
-
+    void Update()
-void Update () 
+    {
-{
 
 #if UNITY_EDITOR
-if (Application.isPlaying!=true)
+        if (Application.isPlaying != true)
-{
+        {
-SCShader = Shader.Find("CameraFilterPack/Blur_GaussianBlur");
+            SCShader = Shader.Find("CameraFilterPack/Blur_GaussianBlur");
 
-}
+        }
 #endif
 
-}
+    }
-
+    void OnDisable()
-void OnDisable ()
+    {
-{
+        if (SCMaterial)
-if(SCMaterial)
+        {
-{
+            DestroyImmediate(SCMaterial);
-DestroyImmediate(SCMaterial);	
+        }
-}
-
-}
-
 
+    }
 }

Electrical_inspectionCompetitionSystem/Assets/Prefeb.meta

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

Electrical_inspectionCompetitionSystem/Assets/Prefeb/三相_无互感器_有光伏.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 816399f72a4ea6447ae4f7fe14789c1f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Prefeb/三相_无带互感器_无光伏.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c8fac3e8ce5c3eb43871a276144e497a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Prefeb/三相_有互感器_无光伏.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9461863e4e6908144bf2de9d1000f37e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -24,6 +24,8 @@ public class GameManager : MonoBehaviour
     [SerializeField] List<GameObject> Inverter;
     [SerializeField] Transform trans;
     public GameObject temp;
+    [SerializeField] List<GameObject> interactive;
+    public Interactive interactiveEnum = Interactive.none;
     public void Awake()
     {
         if (ins != null)
@@ -73,15 +75,40 @@ public class GameManager : MonoBehaviour
         {
             ToolsShow(YanDianBi);
         }
+        switch (interactiveEnum)
+        {
+            case Interactive.none:
+                for (int i = 0; i < interactive.Count; i++)
+                {
+                    interactive[i].transform.GetComponent<door_control>().启用交互 = true;
+                }
+                break;
+            case Interactive.YanDian:
+                for (int i = 0; i < interactive.Count; i++)
+                {
+                    interactive[i].transform.GetComponent<door_control>().启用交互 = false;
+                }
+                break;
+            case Interactive.QianXing:
+                for (int i = 0; i < interactive.Count; i++)
+                {
+                    interactive[i].transform.GetComponent<door_control>().启用交互 = true;
+                }
+                break;
+            default:
+                break;
+        }
     }
     /// <summary>
     /// 工具生成方法
     /// </summary>
     public void ToolsShow(GameObject tools)
     {
+        if (temp != null)
+        {
+            Destroy(temp.gameObject);
+        }
         temp = Instantiate(tools, Player.transform);
-        temp.transform.localPosition = new Vector3(0.319f, -0.471f, 0.87f);
-        temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0));
         string name = Filter(temp.name, TempChar);
         Debug.Log(name);
         switch (name)
@@ -89,16 +116,19 @@ public class GameManager : MonoBehaviour
             case "万用表":
                 break;
             case "钳形电流表":
-
+                interactiveEnum = Interactive.QianXing;
+                temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0));
+                temp.transform.localPosition = new Vector3(0.312f, 0.316f, 0.618f);
                 break;
             case "验电笔":
+                interactiveEnum = Interactive.YanDian;
+                temp.transform.localPosition = new Vector3(0.307f, 0.504f, 0.654f);
                 temp.AddComponent<TestPenInteractive>();
                 break;
             default:
                 break;
         }
     }
-
     public string Filter(string str, char[] charsToRemove)
     {
         return String.Concat(str.Split(charsToRemove.ToArray()));
@@ -121,3 +151,9 @@ public class data2s
     public string jxfs;
     public string zhbl;
 }
+public enum Interactive
+{
+    none,
+    YanDian,
+    QianXing
+}

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs

@@ -22,7 +22,7 @@ public class ClampAmmetersInteractive : MonoBehaviour
     }
     private void OnMouseDown()
     {
-        Debug.Log("ok");
+        //Debug.Log("ok");
         if (GameManager.ins.temp.transform!=null)
         {
             GameManager.ins.temp.transform.parent = g1.transform;

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs

@@ -0,0 +1,81 @@
+using DG.Tweening;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using TMPro;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using ZenFulcrum.EmbeddedBrowser;
+
+public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler
+{
+    //滑动点
+    private Vector3 end;
+    private Vector3 start = new Vector3(0, 0, -80);
+    //滑动点到阀门图片中点的向量
+    private Vector3 v1;
+    private Vector3 v2;
+    private float al;
+    [SerializeField] private Image stopValveImage;   //截止阀
+    Vector2 tempPos;
+
+    private float valveOpen;     //阀门开度
+    public int index;   //阀门旋转多少圈可以开到100
+    int sum = 80;
+    void OnEnable()
+    {
+        //UIManager.ins.ButtonToUI_but(true, confirm, popup);
+        //AudioManager.ins.PlayAudio(7);
+        //StartCoroutine(Deng());
+    }
+    /// <summary>
+    /// 开始拖拽
+    /// </summary>
+    /// <param name="eventData"></param>
+    public Vector2 currentPos = new Vector2();
+    public void OnBeginDrag(PointerEventData eventData)
+    {
+        v1 = start - stopValveImage.transform.position;
+        currentPos = eventData.position;
+    }
+    public float timeCount = 0;
+    public float limitTime = 0;
+    /// <summary>
+    /// 拖拽中
+    /// </summary>
+    /// <param name="eventData"></param>
+    public void OnDrag(PointerEventData eventData)
+    {
+        timeCount += Time.deltaTime;
+        if (timeCount > limitTime)
+        {
+            Debug.Log(currentPos.x-eventData.position.x);
+            if (currentPos.x - eventData.position.x > 0)
+            {
+                sum = 10;
+            }
+            if (currentPos.x - eventData.position.x < 0)
+            {
+                sum = -10;
+            }
+            Debug.Log("旋转的方法");
+            Deng(sum);
+            timeCount = 0;
+        }
+    }
+    void Deng(float angle)
+    {
+        float Temp = Math.Clamp(angle,-80,80);
+        stopValveImage.transform.Rotate(new Vector3(0,0, Temp));
+    }
+    /// <summary>
+    /// 拖拽结束
+    /// </summary>
+    /// <param name="eventData"></param>
+    public void OnEndDrag(PointerEventData eventData)
+    {
+        timeCount = 0;
+    }
+}

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

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

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