none

Electrical_inspectionCompetitionSystem/Assets/02_ui/农家乐.jpg.meta

@@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 0128dc9a1e444534ea6027038c8425ec
+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: 0
+    wrapV: 0
+    wrapW: 0
+  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/Adam/Prefabs/Item/OptionItem.prefab

@@ -248,6 +248,7 @@ GameObject:
   - component: {fileID: 7841566712123838780}
   - component: {fileID: 7841566712123838781}
   - component: {fileID: 7841566712123838783}
+  - component: {fileID: -7945763279749003775}
   m_Layer: 5
   m_Name: OptionItem
   m_TagString: Untagged
@@ -330,3 +331,48 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ID: {fileID: 7841566711167579075}
   info: {fileID: 7841566711052037343}
+  selfBtn: {fileID: -7945763279749003775}
+--- !u!114 &-7945763279749003775
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7841566712123838755}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7841566712123838781}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Electrical_inspectionCompetitionSystem/Assets/Adam/Prefabs/三相_无互感器_有光伏View.prefab

@@ -182,90 +182,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!1 &4301222307498929195
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4301222307498929192}
-  - component: {fileID: 4301222307498929193}
-  m_Layer: 0
-  m_Name: "\u53D1\u7535"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4301222307498929192
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4301222307498929195}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4301222307786538278}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &4301222307498929193
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4301222307498929195}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  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: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 1}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &4301222307786538273
 GameObject:
   m_ObjectHideFlags: 0
@@ -296,7 +212,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4301222306241434058}
-  - {fileID: 4301222307498929192}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -313,6 +228,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   url: http://111.229.30.246:10013/Handler/Taiqu.ashx?action=rdjdydl&bianhao=
+  trainStateUrl: 
   spriteRenderer: {fileID: 4301222306241434059}
   textMesh: {fileID: 4301222306098253161}
   sprites:

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs

@@ -55,6 +55,7 @@ namespace Adam
             closeBtn.gameObject.SetActive(true);
             SwitchPanel(false);
             SceneLoad.Instance.SceneChange("工具间场景");
+           
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs

@@ -18,6 +18,7 @@ namespace Adam
         public GameObject[] panels;
         public GameObject buttomPanel;
         public Toggle BirdEyeView;
+        public FirstPersonController firstPersonController;
         // Use this for initialization
         private void Start()
         {
@@ -31,6 +32,9 @@ namespace Adam
                 toggles[index].onValueChanged.AddListener((isOn) =>
                 {
                     panels[index].SetActive(isOn);
+                    if (firstPersonController == null)
+                        firstPersonController = GameObject.FindGameObjectWithTag("Player").GetComponent<FirstPersonController>();
+                    firstPersonController.enabled = !isOn;
                 });
             }
             SwitchPanel(false);

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/OptionItem.cs

@@ -16,6 +16,7 @@ namespace Components
     {
         public Text ID;
         public Text info;
+        public Button selfBtn;
         public void SetValue(string _id, string _info)
         {
             ID.text = _id;

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolItem.cs

@@ -51,6 +51,9 @@ public class ToolItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
     public void SetState(bool isActive)
     {
         closeButton.gameObject.SetActive(isActive);
+        if (toolName == "工作卡")
+            selfButton.interactable = isActive;
+        else
             selfButton.interactable = !isActive;
     }
 

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs

@@ -50,7 +50,6 @@ public enum RightAndWrong
 
 public class ToolModelClick : MonoBehaviour
 {
-
     public Attribute attribute = Attribute.defaultModel;
     public RightAndWrong rightAndWrong = RightAndWrong.defaultModel;
 
@@ -64,13 +63,6 @@ public class ToolModelClick : MonoBehaviour
 
     public Highlighter selfHighlighter;
 
-    //public GameObject tipPrefab;
-    //public GameObject tip;
-    //[ContextMenu("Set")]
-    //public void TTTTT()
-    //{
-    //    tipPrefab = Resources.Load<GameObject>("ModelTips");
-    //}
 
     private void Awake()
     {
@@ -92,18 +84,14 @@ public class ToolModelClick : MonoBehaviour
         var current = SceneManager.GetActiveScene();
         if (current.name == "工具间场景")
             UIManager.Instance.SetThreeDTip(gameObject.name);
-        //tip = Instantiate(tipPrefab);
-        //tip.GetComponentInChildren<TextMesh>().text = gameObject.name;
-        //tip.transform.localPosition = transform.localPosition;
-        //tip.transform.localScale = Vector3.one;
-        //tip.transform.LookAt(Camera.main.transform.position);
-        //tip.transform.localEulerAngles = new Vector3(90f, 0, 0);
     }
 
     private void OnMouseDown()
     {
         if (EventSystem.current.IsPointerOverGameObject())
             return;
+        var current = SceneManager.GetActiveScene();
+        if (current.name != "工具间场景") return;
         onDown?.Invoke();
         ToolsItemManager.Instance.CreatToolItem(gameObject);
         UIManager.Instance.SetThreeDTip("");
@@ -124,6 +112,5 @@ public class ToolModelClick : MonoBehaviour
             return;
         onExit?.Invoke();
         UIManager.Instance.SetThreeDTip("");
-        //Destroy(tip);
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/ExamusersData.cs

@@ -1,44 +1,63 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
 using System;
-//============================================================
+using System.Collections.Generic;
-//支持中文，文件使用UTF-8编码
+
-//@author	YangHua
-//@create	20230916
-//@company	QianHuo
-//
-//@description:
-//============================================================
 namespace EData
 {
     [Serializable]
-    public class Root
+    public class Exam
     {
         /// <summary>
         /// 
         /// </summary>
+        public string id ;
+        /// <summary>
+        /// 试卷11
+        /// </summary>
+        public string exam_name ;
+        /// <summary>
+        /// 已发布
+        /// </summary>
         public string state ;
         /// <summary>
         /// 
         /// </summary>
-        public string message;
+        public string start_time ;
         /// <summary>
         /// 
         /// </summary>
-        public Data data;
+        public string end_time ;
-    }
-    [Serializable]
-    public class Data
-    {
         /// <summary>
         /// 
         /// </summary>
-        public ExamusersData exam;
+        public string create_time ;
         /// <summary>
         /// 
         /// </summary>
-        public List<ListItem> list;
+        public string create_user_id ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string r1 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string r2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string r3 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string r4 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string r5 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string state_dsc ;
     }
     [Serializable]
     public class ListItem
@@ -56,11 +75,11 @@ namespace EData
         /// </summary>
         public string user_no ;
         /// <summary>
-        /// 仪征市弘桥路
+        /// 
         /// </summary>
         public string Address ;
         /// <summary>
-        /// 刘生萍
+        /// 用户9600001129
         /// </summary>
         public string UserName ;
         /// <summary>
@@ -72,11 +91,11 @@ namespace EData
         /// </summary>
         public string AreaName ;
         /// <summary>
-        /// 
+        /// 有光伏
         /// </summary>
         public string UserType ;
         /// <summary>
-        /// 
+        /// 三相_无互感器_有光伏
         /// </summary>
         public string BiaoType ;
         /// <summary>
@@ -84,7 +103,7 @@ namespace EData
         /// </summary>
         public string Scene ;
         /// <summary>
-        /// 干扰
+        /// 异常
         /// </summary>
         public string UserState ;
         /// <summary>
@@ -102,26 +121,74 @@ namespace EData
         /// <summary>
         /// 
         /// </summary>
+        public string AA2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AA3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int AV ;
         /// <summary>
         /// 
         /// </summary>
+        public string AV2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string AV3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int BA ;
         /// <summary>
         /// 
         /// </summary>
+        public string BA2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BA3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int BV ;
         /// <summary>
         /// 
         /// </summary>
+        public string BV2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string BV3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int CA ;
         /// <summary>
         /// 
         /// </summary>
+        public string CA2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CA3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int CV ;
         /// <summary>
         /// 
         /// </summary>
+        public string CV2 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CV3 ;
+        /// <summary>
+        /// 
+        /// </summary>
         public int Beilv ;
         /// <summary>
         /// 
@@ -195,64 +262,41 @@ namespace EData
         /// 
         /// </summary>
         public int v5 ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string huhao ;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string is_fd ;
     }
     [Serializable]
-    public class ExamusersData
+    public class Data
     {
         /// <summary>
         /// 
         /// </summary>
-        public string id;
+        public Exam exam ;
         /// <summary>
-        /// 试卷11
+        /// 
         /// </summary>
-        public string exam_name;
+        public List<ListItem> list ;
+    }
+    [Serializable]
+    public class Root
+    {
         /// <summary>
-        /// 已发布
+        /// 
         /// </summary>
         public string state ;
         /// <summary>
         /// 
         /// </summary>
-        public string start_time;
+        public string message ;
         /// <summary>
         /// 
         /// </summary>
-        public string end_time;
+        public Data data ;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string create_time;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string create_user_id;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string r1;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string r2;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string r3;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string r4;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string r5;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string state_dsc;
     }
-
-    
-
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/ThreeTransformerPhotovoltaicData.cs

@@ -22,12 +22,22 @@ namespace ttpData
     [Serializable]
     public class Data
     {
+        public string zhbl;
+        public string yxrl;
         public string[] rdj;
         public string qxA;
         public string qxB;
         public string qxC;
-        public string qyA;
+        public string dyA;
-        public string qyB;
+        public string dyB;
-        public string qyC;
+        public string dyC;
+    }
+
+    [Serializable]
+    public class TrainState
+    {
+        public string state;
+        public string message;
+        public string data;
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Data/UserViewData.cs

@@ -18,181 +18,182 @@ namespace MobileTerminal
     {
         public string state;
         public string message;
-        public Data data;
+        public List<string> data;
-    }
-    [Serializable]
-    public class Data
-    {
-        public JBSX[] jbsx;
-        public JBXX[] jbxx;
-        public JLZZXX[] jlzzxx;
-    }
-    [Serializable]
-    public class JBSX
-    {
-        /// <summary>
-        /// 周保林 用电户：3209600004110
-        /// </summary>
-        public string 名称;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 用户编号;
-        /// <summary>
-        /// 仪征市供电公司
-        /// </summary>
-        public string 供电单位;
-        /// <summary>
-        /// 考核
-        /// </summary>
-        public string 用户分类;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否专线;
-        /// <summary>
-        /// 正常用电客户
-        /// </summary>
-        public string 用户状态;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 合同容量;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 运行容量;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 首次建档日期;
-        /// <summary>
-        /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
-        /// </summary>
-        public string 用电地址;
-        /// <summary>
-        /// 无转供
-        /// </summary>
-        public string 转供户信息;
-    }
-    [Serializable]
-    public class JBXX
-    {
-        /// <summary>
-        /// 周保林
-        /// </summary>
-        public string 用户名称;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 用户编号;
-        /// <summary>
-        /// 正常用电客户
-        /// </summary>
-        public string 用户状态;
-        /// <summary>
-        /// 考核
-        /// </summary>
-        public string 用户分类;
-        /// <summary>
-        /// 仪征市供电公司
-        /// </summary>
-        public string 供电单位;
-        /// <summary>
-        /// 太阳能发电
-        /// </summary>
-        public string 所属行业;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 合同容量;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 运行容量;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 电压等级;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 重要等级;
-        /// <summary>
-        /// 考核
-        /// </summary>
-        public string 用电类别;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否重点用户;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否专线;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 首次建档;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否双电源;
-        /// <summary>
-        /// PMS_石桥146线
-        /// </summary>
-        public string 线路名称;
-        /// <summary>
-        /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
-        /// </summary>
-        public string 用电地址;
-    }
-    [Serializable]
-    public class JLZZXX
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 序号;
-        /// <summary>
-        /// 上网计量点1
-        /// </summary>
-        public string 计量点名称;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 计量点ID;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 电表ID;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 电表资产编号;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否参考表;
-        /// <summary>
-        /// 否
-        /// </summary>
-        public string 是否专线;
-        /// <summary>
-        /// 上网关口
-        /// </summary>
-        public string 主用途类型;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 计量点级数;
-        /// <summary>
-        /// 在用
-        /// </summary>
-        public string 状态;
-        /// <summary>
-        /// 
-        /// </summary>
-        public string 倍率;
     }
+
+    //[Serializable]
+    //public class Data
+    //{
+    //    public JBSX[] jbsx;
+    //    public JBXX[] jbxx;
+    //    public JLZZXX[] jlzzxx;
+    //}
+    //[Serializable]
+    //public class JBSX
+    //{
+    //    /// <summary>
+    //    /// 周保林 用电户：3209600004110
+    //    /// </summary>
+    //    public string 名称;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 用户编号;
+    //    /// <summary>
+    //    /// 仪征市供电公司
+    //    /// </summary>
+    //    public string 供电单位;
+    //    /// <summary>
+    //    /// 考核
+    //    /// </summary>
+    //    public string 用户分类;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否专线;
+    //    /// <summary>
+    //    /// 正常用电客户
+    //    /// </summary>
+    //    public string 用户状态;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 合同容量;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 运行容量;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 首次建档日期;
+    //    /// <summary>
+    //    /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
+    //    /// </summary>
+    //    public string 用电地址;
+    //    /// <summary>
+    //    /// 无转供
+    //    /// </summary>
+    //    public string 转供户信息;
+    //}
+    //[Serializable]
+    //public class JBXX
+    //{
+    //    /// <summary>
+    //    /// 周保林
+    //    /// </summary>
+    //    public string 用户名称;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 用户编号;
+    //    /// <summary>
+    //    /// 正常用电客户
+    //    /// </summary>
+    //    public string 用户状态;
+    //    /// <summary>
+    //    /// 考核
+    //    /// </summary>
+    //    public string 用户分类;
+    //    /// <summary>
+    //    /// 仪征市供电公司
+    //    /// </summary>
+    //    public string 供电单位;
+    //    /// <summary>
+    //    /// 太阳能发电
+    //    /// </summary>
+    //    public string 所属行业;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 合同容量;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 运行容量;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 电压等级;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 重要等级;
+    //    /// <summary>
+    //    /// 考核
+    //    /// </summary>
+    //    public string 用电类别;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否重点用户;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否专线;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 首次建档;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否双电源;
+    //    /// <summary>
+    //    /// PMS_石桥146线
+    //    /// </summary>
+    //    public string 线路名称;
+    //    /// <summary>
+    //    /// 江苏省扬州市仪征市真州镇（仪征市区）镇解放东路12号
+    //    /// </summary>
+    //    public string 用电地址;
+    //}
+    //[Serializable]
+    //public class JLZZXX
+    //{
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 序号;
+    //    /// <summary>
+    //    /// 上网计量点1
+    //    /// </summary>
+    //    public string 计量点名称;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 计量点ID;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 电表ID;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 电表资产编号;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否参考表;
+    //    /// <summary>
+    //    /// 否
+    //    /// </summary>
+    //    public string 是否专线;
+    //    /// <summary>
+    //    /// 上网关口
+    //    /// </summary>
+    //    public string 主用途类型;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 计量点级数;
+    //    /// <summary>
+    //    /// 在用
+    //    /// </summary>
+    //    public string 状态;
+    //    /// <summary>
+    //    /// 
+    //    /// </summary>
+    //    public string 倍率;
+    //}
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ExamusersController.cs

@@ -49,5 +49,26 @@ namespace Adam
             }
             return pvw;
         }
+
+        public List<string> GetABCcurrentAndvoltage()
+        {
+            List<string> listABC = new List<string>();
+            for (int i = 0;i < root.data.list.Count; i++)
+            {
+                int index = i;
+                string uerID = GlobalFlag.userId;
+                if (uerID.Equals(root.data.list[index].user_no))
+                {
+                    listABC.Add(root.data.list[index].AA.ToString());
+                    listABC.Add(root.data.list[index].BA.ToString());
+                    listABC.Add(root.data.list[index].CA.ToString());
+                    listABC.Add(root.data.list[index].AV.ToString());
+                    listABC.Add(root.data.list[index].BV.ToString());
+                    listABC.Add(root.data.list[index].CV.ToString());
+                }
+            }
+            return listABC;
+        }
+
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GlobalFlag.cs

@@ -23,5 +23,5 @@ public class GlobalFlag
 
     public static int pvw;
 
-    public static string userId = "9600004109";
+    public static string userId;
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/GoToSceneController.cs

@@ -28,36 +28,36 @@ namespace Adam
 
         public void OnGo()
         {
-
             string sceneInfo = ExamusersController.Instance.GetSceneInfoByUseNo(userID.text);
-
+            GlobalFlag.userId = userID.text;
-
+            Debug.Log(GlobalFlag.userId);
             string[] tt = ToolUtility.GetInfo(sceneInfo, '_');
-
             SceneInfoData sceneInfoData = new SceneInfoData(tt[0], tt[1], tt[2]);
             GlobalFlag.sceneData = sceneInfoData;
             GlobalFlag.pvw = ExamusersController.Instance.GetPVWByUseNo(userID.text);
-            switch (tt[3])
+            SceneLoad.Instance.SceneChange(tt[3]);
-            {
+            //switch (tt[3])
-                case "自建房场景":
+            //{
-                    SceneLoad.Instance.SceneChange("居民自建");
+            //    case "自建房场景":
-                    break;
+            //        SceneLoad.Instance.SceneChange("居民自建");
-                case "农家乐场景":
+            //        break;
-                    SceneLoad.Instance.SceneChange("农家乐");
+            //    case "农家乐场景":
-                    break;
+            //        SceneLoad.Instance.SceneChange("农家乐");
-                case "小商户场景":
+            //        break;
-                    SceneLoad.Instance.SceneChange("小商户");
+            //    case "小商户场景":
-                    break;
+            //        SceneLoad.Instance.SceneChange("小商户");
-                case "农贸市场场景":
+            //        break;
-                    SceneLoad.Instance.SceneChange("农贸市场");
+            //    case "农贸市场场景":
-                    break;
+            //        SceneLoad.Instance.SceneChange("农贸市场");
-            }
+            //        break;
+            //}
             SwitchPanel();
             UIManager.Instance.backToToolBtn.gameObject.SetActive(true);
         }
 
         public void SwitchPanel()
         {
+            UIManager.Instance.threeDTip.gameObject.SetActive(false);
             GoToTheScenePlane.SetActive(false);
         }
     }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/JobCardController.cs

@@ -21,10 +21,16 @@ namespace Adam
         public InputField[] userIDs;
         public InputField[] userNames;
         public InputField[] workSpace;
+
+        public InputField[] aqcss;
+        public InputField[] fxdfx;
+
         public GameObject jobCardPanel;
         public GameObject jobChoiceQuestionPanel;
         public OptionItem optionItemPrefab;
         public Transform optionItemContent;
+
+        public Text optionTitleText;
         /// <summary>
         /// 风险点分析
         /// </summary>
@@ -75,10 +81,12 @@ namespace Adam
             if (index == 0)
             {
                 GetAQCSandFXDFX("FXDFX");
+                optionTitleText.text = "工作现场风险点分析";
             }
             else if (index == 1)
             {
                 GetAQCSandFXDFX("AQCS");
+                optionTitleText.text = "注意事项及安全措施";
             }
             else
             {
@@ -99,9 +107,28 @@ namespace Adam
             for (int i = 0; i < af.data.Length; i++)
             {
                 int index = i;
+                string infoTemp = af.data[index];
                 OptionItem optionItemTemp = Instantiate(optionItemPrefab, optionItemContent);
-                optionItemTemp.SetValue(index.ToString(), af.data[i]);
+                optionItemTemp.SetValue(index.ToString(), infoTemp);
-            }
+                optionItemTemp.selfBtn.onClick.AddListener(() =>
+                {
+                    OnOptionItemClick(index, infoTemp, name);
+                });
+            }
+        }
+
+
+        private void OnOptionItemClick(int index, string info, string name)
+        {
+            if (name == "FXDFX")
+            {
+                fxdfx[index].text = info;
+            }
+            else if (name == "AQCS")
+            {
+                aqcss[index].text = info;
+            }
+
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs

@@ -18,8 +18,8 @@ using UnityEngine.UI;
 
 public class MobileTerminalController : MonoBehaviour
 {
-    public string userViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao= ";
+    public string userViewUrl;
-    public string tabelViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao=";
+    public string tabelViewUrl;
     public InputField number;
     /// <summary>
     /// 表记数据
@@ -68,32 +68,37 @@ public class MobileTerminalController : MonoBehaviour
         isOnLoad = true;
         string url = userViewUrl + number.text;
         mData = await AsyncWebReq.Get<UserViewData>(url);
-        string jsonData = JsonConvert.SerializeObject(mData);
+        for (int i = 0; i < mData.data.Count; i++)
-        AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx);
-
-        foreach (var item in jbsx)
         {
             MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
-            string info = item.Key + ":     " + item.Value;
+            itemTip.SetValue(mData.data[i]);
-            itemTip.SetValue(info);
         }
+        //string jsonData = JsonConvert.SerializeObject(mData);
+        //AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx);
 
-        foreach (var item in jbxx)
+        //foreach (var item in jbsx)
-        {
+        //{
-            MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
+        //    MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
-            string info = item.Key + ":     " + item.Value;
+        //    string info = item.Key + ":     " + item.Value;
-            itemTip.SetValue(info);
+        //    itemTip.SetValue(info);
-        }
+        //}
 
-        for (int i = 0; i < jlzzxx.Count; i++)
+        //foreach (var item in jbxx)
-        {
+        //{
-            foreach (var item in jlzzxx[i])
+        //    MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
-            {
+        //    string info = item.Key + ":     " + item.Value;
-                MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
+        //    itemTip.SetValue(info);
-                string info = item.Key + ":     " + item.Value;
+        //}
-                itemTip.SetValue(info);
+
-            }
+        //for (int i = 0; i < jlzzxx.Count; i++)
-        }
+        //{
+        //    foreach (var item in jlzzxx[i])
+        //    {
+        //        MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, userContent);
+        //        string info = item.Key + ":     " + item.Value;
+        //        itemTip.SetValue(info);
+        //    }
+        //}
         SwitchView(0);
         isOnLoad = false;
     }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ShowNameplate.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 
 public class ShowNameplate : MonoBehaviour
 {
@@ -15,8 +16,11 @@ public class ShowNameplate : MonoBehaviour
 
     private void OnMouseDown()
     {
+        if (EventSystem.current.IsPointerOverGameObject())
+        {
+            return;
+        }
         NameplateController.Instance.RefreshShown();
-
         if (!NameplateController.Instance.DictextMeshPro.ContainsKey(myName))
         {
             return;

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolModelManager.cs

@@ -12,5 +12,12 @@ using UnityEngine;
 
 public class ToolModelManager : MonoBehaviour
 {
+    public ToolModelClick[] toolModelClicks;
+
+    public void GetAllToolModels()
+    {
+        GameObject toolContent = GameObject.FindGameObjectWithTag("AllTools");
+        toolModelClicks = toolContent.transform.GetComponentsInChildren<ToolModelClick>();
        
     }
+}

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemManager.cs

@@ -21,6 +21,7 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
     public Button closeBtn;
     public UnityEvent<GameObject> ItemClick;
     public Button recoverBtn;
+    public UnityEvent recoverEvent = new UnityEvent();
     public Toggle bottomToolToggle;
     public GameObject currentTool;
     public GameObject ServerRecorderPanel;
@@ -30,7 +31,9 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
         closeBtn.onClick.AddListener(() => { SwictchToolPanel(false); });
         recoverBtn.onClick.AddListener(() =>
         {
+            recoverEvent?.Invoke();
             RecoverCurrentInstantiateTool(currentTool);
+
         });
         recoverBtn.gameObject.SetActive(false);
         ServerRecorderPanel.gameObject.SetActive(false);
@@ -125,6 +128,15 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
         }
     }
 
+    public void ResetState()
+    {
+        for (int i = 0; i < toolItems.Count; i++)
+        {
+            toolItems[i].SetState(true);
+        }
+    }
+
+
     public IEnumerator WaitShowServerRecorderPanel()
     {
         ServerRecorderPanel.gameObject.SetActive(true);

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs

@@ -1,6 +1,7 @@
 using Adam;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using UnityEngine;
 using UnityEngine.UI;
 //============================================================
@@ -20,6 +21,7 @@ public class UIManager : MonoSingleton<UIManager>
     public BottomController bottomCotroller;
     public JobCardController jobCardController;
     public ExitCheckController exitCheckController;
+    public ToolModelManager toolModelManager;
     public Button exitBtn;
     public Button backToToolBtn;
     public Text threeDTip;
@@ -39,14 +41,34 @@ public class UIManager : MonoSingleton<UIManager>
             }
         });
         exitBtn.gameObject.SetActive(false);
-        backToToolBtn.onClick.AddListener(BackToTool);
+        backToToolBtn.onClick.AddListener(() =>
+        {
+            ToolsItemManager.recoverEvent.RemoveAllListeners();
+            ToolsItemManager.ResetState();
+            backToToolBtn.gameObject.SetActive(false);
+            bottomCotroller.BirdEyeView.gameObject.SetActive(false);
+            BackToTool();
+        });
         backToToolBtn.gameObject.SetActive(false);
         DontDestroyOnLoad(this);
     }
 
-    private void BackToTool()
+    private async void BackToTool()
     {
         SceneLoad.Instance.SceneChange("工具间场景");
+        await Task.Delay(500);
+        toolModelManager.GetAllToolModels();
+        for (int i = 0; i < ToolsItemManager.toolItems.Count; i++)
+        {
+            for (int j = 0; j < toolModelManager.toolModelClicks.Length; j++)
+            {
+                if (ToolsItemManager.toolItems[i].originPos == toolModelManager.toolModelClicks[j].transform.localPosition)
+                {
+                    Destroy(toolModelManager.toolModelClicks[j].gameObject);
+                }
+            }
+        }
+
     }
 
     public void SetThreeDTip(string name)
@@ -59,7 +81,6 @@ public class UIManager : MonoSingleton<UIManager>
         {
             threeDTip.transform.parent.gameObject.SetActive(true);
             threeDTip.text = name;
-
         }
     }
 }

Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Views/ThreeTransformerPhotovoltaicView.cs

@@ -1,5 +1,7 @@
+using Adam;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using ttpData;
 using UnityEngine;
 //============================================================
@@ -14,18 +16,41 @@ namespace Views
 {
     public class ThreeTransformerPhotovoltaicView : MonoBehaviour
     {
-        public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=rdjdydl&bianhao=";
+        public string url = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=zhengchang&bianhao=";
+        public string trainStateUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=isright&bianhao=";
         public SpriteRenderer spriteRenderer;
         public TextMesh textMesh;
+        public string isFD;
         public Sprite[] sprites;
-        public string[] infos;
+        public List<string> infos = new List<string>();
+        public ThreeTransformerPhotovoltaicData ttpData;
+        public TrainState trainData;
         // Use this for initialization
         private async void Start()
         {
             string _url = url + GlobalFlag.userId;
-            Debug.Log(_url);
+            string trainUrl = trainStateUrl + GlobalFlag.userId;
-            ThreeTransformerPhotovoltaicData ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
+            ttpData = await AsyncWebReq.Get<ThreeTransformerPhotovoltaicData>(_url);
-            infos = ttpData.data.rdj;
+            infos = ttpData.data.rdj.ToList();
+            trainData = await AsyncWebReq.Get<TrainState>(trainUrl);
+            if (trainData.message == "正常")
+            {
+                infos.Add(ttpData.data.qxA);
+                infos.Add(ttpData.data.qxB);
+                infos.Add(ttpData.data.qxC);
+                infos.Add(ttpData.data.dyA);
+                infos.Add(ttpData.data.dyB);
+                infos.Add(ttpData.data.dyC);
+            }
+            else
+            {
+                List<string> listTemp = ExamusersController.Instance.GetABCcurrentAndvoltage();
+                foreach (string info in listTemp)
+                {
+                    infos.Add(info);
+                    Debug.Log(info);
+                }
+            }
         }
 
         public int index = 0;

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_2.mat

@@ -11,9 +11,7 @@ Material:
   m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords:
   - _EMISSION
-  - _METALLICGLOSSMAP
   - _NORMALMAP
-  - _SPECGLOSSMAP
   m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -49,7 +47,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
-        m_Texture: {fileID: 2800000, guid: d0b7d05edaefa614e8929df8517a966f, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
@@ -61,7 +59,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
-        m_Texture: {fileID: 2800000, guid: c5c247aacad8d25458d64deab8e0b469, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -71,7 +69,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 1
     - _GlossyReflections: 1
     - _Metallic: 0
     - _Mode: 0
@@ -83,6 +81,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Material/电箱_3.mat

@@ -11,9 +11,7 @@ Material:
   m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords:
   - _EMISSION
-  - _METALLICGLOSSMAP
   - _NORMALMAP
-  - _SPECGLOSSMAP
   m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -49,7 +47,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
-        m_Texture: {fileID: 2800000, guid: d5f54caf270ea3248b7a4b29e2d91922, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
@@ -61,7 +59,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _SpecGlossMap:
-        m_Texture: {fileID: 2800000, guid: 337bc24cb63a502498f73f3f989a58aa, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Ints: []
@@ -71,9 +69,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 1
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.5
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/电箱(new)/Model/NEW/LOGO.mat

@@ -10,14 +10,14 @@ Material:
   m_Name: LOGO
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords:
-  - _ALPHABLEND_ON
+  - _ALPHATEST_ON
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: 2450
   stringTagMap:
-    RenderType: Transparent
+    RenderType: TransparentCutout
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -61,21 +61,21 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _Cutoff: 0.5
+    - _Cutoff: 0.618
     - _DetailNormalMapScale: 1
-    - _DstBlend: 10
+    - _DstBlend: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.14142135
     - _GlossyReflections: 1
     - _Metallic: 0
-    - _Mode: 2
+    - _Mode: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
-    - _SrcBlend: 5
+    - _SrcBlend: 1
     - _UVSec: 0
-    - _ZWrite: 0
+    - _ZWrite: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

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

@@ -406,7 +406,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 183119646645465955}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
@@ -880,6 +880,8 @@ MonoBehaviour:
   name: "\u7528\u7535_AA2"
   linearMeasure: 0
   floats: []
+  Fuan: 5
+  unit: A
 --- !u!114 &1791810255
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1011,10 +1013,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 5
   name: "\u7528\u7535_CV2"
   isBlack: 0
+  VV: V
 --- !u!1 &763471463664476292
 GameObject:
   m_ObjectHideFlags: 0
@@ -1623,10 +1626,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 5
   name: "\u7528\u7535_CV3"
   isBlack: 0
+  VV: V
 --- !u!1 &1241165713762030815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1986,10 +1990,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 10
   name: "\u7528\u7535_CV3"
   isBlack: 0
+  VV: ' V'
 --- !u!1 &1918222522557054203
 GameObject:
   m_ObjectHideFlags: 0
@@ -2566,6 +2571,8 @@ MonoBehaviour:
   name: "\u7528\u7535_CA2"
   linearMeasure: 0
   floats: []
+  Fuan: 10
+  unit: A
 --- !u!1 &2848851287756016752
 GameObject:
   m_ObjectHideFlags: 0
@@ -2672,7 +2679,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2848851287756016752}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
@@ -2690,6 +2697,8 @@ GameObject:
   - component: {fileID: 3313878054425819741}
   - component: {fileID: 999037576174543312}
   - component: {fileID: 5490236489971416305}
+  - component: {fileID: 2923343074421989141}
+  - component: {fileID: 7441753607890645216}
   m_Layer: 0
   m_Name: Object428
   m_TagString: Untagged
@@ -2762,6 +2771,32 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &2923343074421989141
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3186866297575896574}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.0457753, y: 0.043387014, z: 0.033180986}
+  m_Center: {x: -0.0011986911, y: -0.007815547, z: 0.012166697}
+--- !u!114 &7441753607890645216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3186866297575896574}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mesh: {fileID: 828720081697923098}
 --- !u!1 &3257671273237242133
 GameObject:
   m_ObjectHideFlags: 0
@@ -3077,10 +3112,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 7
   name: "\u7528\u7535_CV3"
   isBlack: 0
+  VV: V
 --- !u!1 &3780776059789330294
 GameObject:
   m_ObjectHideFlags: 0
@@ -3302,6 +3338,8 @@ MonoBehaviour:
   name: "\u7528\u7535_BA2"
   linearMeasure: 0
   floats: []
+  Fuan: 6
+  unit: A
 --- !u!114 &1791810253
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3629,6 +3667,8 @@ MonoBehaviour:
   name: "\u7528\u70B9_BA2"
   linearMeasure: 0
   floats: []
+  Fuan: 5
+  unit: A
 --- !u!114 &1791810254
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4009,10 +4049,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 2
   name: "\u7528\u7535_CV2"
   isBlack: 0
+  VV: V
 --- !u!1 &5317200332185298439
 GameObject:
   m_ObjectHideFlags: 0
@@ -4641,6 +4682,8 @@ MonoBehaviour:
   name: "\u7528\u7535_AA2"
   linearMeasure: 0
   floats: []
+  Fuan: 2
+  unit: A
 --- !u!64 &7534600608170525114
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -4862,6 +4905,8 @@ MonoBehaviour:
   name: "\u7528\u7535_CA2"
   linearMeasure: 0
   floats: []
+  Fuan: 10
+  unit: A
 --- !u!114 &1791810252
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -5221,10 +5266,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
   activation: 0
   name: N
   isBlack: 1
+  VV: 
 --- !u!1 &8644223648774417466
 GameObject:
   m_ObjectHideFlags: 0
@@ -5418,10 +5464,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a43fdde5b2278bc4ea8228a3eae8c8ec, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  electricity: 0
+  electricity: 1
-  activation: 0
+  activation: 9
   name: "\u7528\u7535_CV2"
   isBlack: 0
+  VV: V
 --- !u!1 &8686247563076990760
 GameObject:
   m_ObjectHideFlags: 0
@@ -5515,6 +5562,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6482818628852478495}
+  - component: {fileID: 6276449713238507259}
   m_Layer: 0
   m_Name: "\u4E09\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F"
   m_TagString: Untagged
@@ -5544,6 +5592,19 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6276449713238507259
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8814916775944311458}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clampAmmetersInteractives: []
 --- !u!1 &8891900236170593541
 GameObject:
   m_ObjectHideFlags: 0
@@ -5865,6 +5926,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -8116758301364444328, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7104531441027181592, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -6135323959174509748, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -5260060894338397145, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -0.00006103506
@@ -5877,6 +5950,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0.00016784667
       objectReference: {fileID: 0}
+    - target: {fileID: -3094519758374681016, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -3013769497943921491, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalScale.x
       value: 0.5318197
@@ -5897,6 +5974,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1437794174185993398, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1934297243589407246, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_LocalPosition.y
       value: 1.2
@@ -5929,6 +6010,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2097911494752482903, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2337052985069988118, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3306945913174669214, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3587840515185738510, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4100218984641909529, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5213865969853075656, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_DirtyAABB
       value: 0
@@ -5961,6 +6062,14 @@ PrefabInstance:
       propertyPath: m_BlendShapeWeights.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6464544102738605386, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
+      propertyPath: m_Layer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8526372940484349156, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_TagString
       value: YanDian

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

@@ -990,6 +990,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1281350692733807052}
+  - component: {fileID: 5154148772792602419}
   m_Layer: 0
   m_Name: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F"
   m_TagString: Untagged
@@ -1013,6 +1014,19 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &5154148772792602419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4358485102403047296}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clampAmmetersInteractives: []
 --- !u!1 &4536213603823072826
 GameObject:
   m_ObjectHideFlags: 0
@@ -1467,6 +1481,7 @@ GameObject:
   - component: {fileID: 6537657585278089496}
   - component: {fileID: 1212982477888520073}
   - component: {fileID: 1767016721318962665}
+  - component: {fileID: 8197923010207683825}
   m_Layer: 0
   m_Name: Cube
   m_TagString: Untagged
@@ -1552,6 +1567,25 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8197923010207683825
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5160934536123890940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: 
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
+  unit: A
 --- !u!1 &5212337995932975501
 GameObject:
   m_ObjectHideFlags: 0
@@ -1709,6 +1743,7 @@ GameObject:
   - component: {fileID: 2165562875724244635}
   - component: {fileID: 8842432876491479579}
   - component: {fileID: 7746830116685398759}
+  - component: {fileID: 6302226075843317434}
   m_Layer: 0
   m_Name: Cube (2)
   m_TagString: Untagged
@@ -1794,6 +1829,25 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6302226075843317434
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5588630746499621630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: 
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
+  unit: A
 --- !u!1 &5982637422382916246
 GameObject:
   m_ObjectHideFlags: 0
@@ -2511,6 +2565,7 @@ GameObject:
   - component: {fileID: 9209109392834754406}
   - component: {fileID: 7184405967805637078}
   - component: {fileID: 6105149369182064439}
+  - component: {fileID: 8129728896665383273}
   m_Layer: 0
   m_Name: Cube (3)
   m_TagString: Untagged
@@ -2596,6 +2651,25 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8129728896665383273
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7768802114381553643}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: 
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
+  unit: A
 --- !u!1 &7868346936396067874
 GameObject:
   m_ObjectHideFlags: 0
@@ -2778,6 +2852,7 @@ GameObject:
   - component: {fileID: 6946322289921225406}
   - component: {fileID: 1581057759612490857}
   - component: {fileID: 143325299643025178}
+  - component: {fileID: 5210950029859728950}
   m_Layer: 0
   m_Name: Cube (1)
   m_TagString: Untagged
@@ -2863,6 +2938,25 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &5210950029859728950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8291716159056416811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: 
+  linearMeasure: 0
+  floats: []
+  Fuan: 0
+  unit: A
 --- !u!1 &8755456981224617160
 GameObject:
   m_ObjectHideFlags: 0

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

@@ -1,5 +1,102 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &943746232492794008
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8269563355153497800}
+  - component: {fileID: 8984783813853376040}
+  - component: {fileID: 1252588107035233893}
+  - component: {fileID: 5697897373468217628}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8269563355153497800
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.1078, y: -0, z: -0.0054}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 5911856406943029848}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8984783813853376040
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1252588107035233893
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_Enabled: 0
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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!65 &5697897373468217628
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 943746232492794008}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &4737607472722466619
 GameObject:
   m_ObjectHideFlags: 0
@@ -62,6 +159,103 @@ Transform:
   m_Father: {fileID: 2884146482280011232}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5736492336811819089
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1951137652969104597}
+  - component: {fileID: 3946426028967011025}
+  - component: {fileID: 8202066586217476281}
+  - component: {fileID: 2120365149609610248}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1951137652969104597
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.10827636, y: 0, z: 0.0029983744}
+  m_LocalScale: {x: 0.009999999, y: 0.01, z: 0.009999999}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3556094348336752178}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3946426028967011025
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8202066586217476281
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_Enabled: 0
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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!65 &2120365149609610248
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5736492336811819089}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &6770620356190950818
 GameObject:
   m_ObjectHideFlags: 0
@@ -71,6 +265,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8778434969602832201}
+  - component: {fileID: 2333959920688638985}
   m_Layer: 0
   m_Name: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F"
   m_TagString: Untagged
@@ -95,6 +290,21 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2333959920688638985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6770620356190950818}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf85d7ecb61a07b44af353b4076e57ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  clampAmmetersInteractives: []
+  Multimeter: []
+  Three: {fileID: 0}
 --- !u!1001 &1895296105669336917
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -146,6 +356,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -91101163219016857, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
       propertyPath: m_Name
       value: "\u5355\u9879_\u65E0\u4E92\u611F\u5668_\u6709\u5149\u4F0F_\u7535\u7BB1\u95E8"
@@ -190,6 +404,22 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 329.098
       objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.3172626
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.3172626
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.6319372
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.631937
+      objectReference: {fileID: 0}
     - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: -90
@@ -198,6 +428,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6952971920300389842, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 126.682
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6b79bb0092bf09c4c8044d9cc6913f3e, type: 3}
 --- !u!1 &1624700047647515140 stripped
@@ -244,7 +478,7 @@ MeshCollider:
   m_GameObject: {fileID: 7273636919654661170}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -395,7 +629,7 @@ MeshCollider:
   m_GameObject: {fileID: 1239480889199565793}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -480,9 +714,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 5398975006695019102}
-  name: 
+  name: "\u53D1\u7535_AA2"
   linearMeasure: 0
   floats: []
+  Fuan: 0
+  unit: A
 --- !u!4 &2071851086393313155 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -493,6 +729,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3696473539125736840, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
   m_PrefabInstance: {fileID: 1966393981994950760}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &3556094348336752178 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3031978151336248922, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5556055090688204035 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 6219781433053871467, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -519,13 +760,18 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5556055090688204035}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   name: "\u76D6\u5B50"
   ammeterSon: {fileID: 0}
+--- !u!4 &5911856406943029848 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5278547504029415984, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &5934706453412920569 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5266494653353647249, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -564,6 +810,20 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: -3902609203009237696, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
   m_PrefabInstance: {fileID: 1966393981994950760}
   m_PrefabAsset: {fileID: 0}
+--- !u!64 &6847984861762042287
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952964257958112552}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8360860469862521707, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
 --- !u!114 &4028878535299181004
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -578,9 +838,49 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   isInteractive: 0
   g1: {fileID: 4737607472722466619}
-  name: 
+  name: "\u7528\u7535_AA2"
   linearMeasure: 0
   floats: []
+  Fuan: 0
+  unit: A
+--- !u!1 &6254938070638835678 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5585600301986535350, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &7509094282354524766
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254938070638835678}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -3839749303547444047, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+--- !u!114 &4511783290274347834
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6254938070638835678}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: "\u53D1\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 
+  unit: 
 --- !u!1 &7014173801403137452 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8799278309008104900, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
@@ -607,7 +907,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7014173801403137452}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
@@ -640,13 +940,69 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7387676191130023632}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1b7105d1f10415c419458fa7df96cb55, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   name: 
   ammeterSon: {fileID: 0}
+--- !u!1 &7983708125869743983 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -756080454203080953, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8855525376343487698
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7983708125869743983}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7c87fecd3e21b334ba6ebe2ad40d106c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mesh: {fileID: 3242825642925887410}
+--- !u!1 &8173016374239192056 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -1574452274598771824, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+  m_PrefabInstance: {fileID: 1966393981994950760}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &8162217028778764928
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8173016374239192056}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 3038099331006426753, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}
+--- !u!114 &1170793500808225503
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8173016374239192056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9771fe28a2d2ef14fb81137b5f350275, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isInteractive: 0
+  g1: {fileID: 0}
+  name: "\u53D1\u7535_AA2"
+  linearMeasure: 0
+  floats: []
+  Fuan: 
+  unit: 
 --- !u!1 &8210758798105662891 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 7690021121139553731, guid: 1d8bc851bde52b94c86fa0702f2d840b, type: 3}

Electrical_inspectionCompetitionSystem/Assets/GameAssets/Models/验电插座_盒子.prefab

@@ -9,8 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 786925774}
-  - component: {fileID: 786925777}
-  - component: {fileID: 786925776}
   - component: {fileID: 786925775}
   - component: {fileID: 1253040782233410607}
   m_Layer: 0
@@ -35,56 +33,6 @@ Transform:
   m_Father: {fileID: 4300732867488139875}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &786925777
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 786925773}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &786925776
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 786925773}
-  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  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!65 &786925775
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -120,8 +68,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1114701756}
-  - component: {fileID: 1114701759}
-  - component: {fileID: 1114701758}
   - component: {fileID: 1114701757}
   - component: {fileID: 1106640731186029337}
   m_Layer: 0
@@ -146,56 +92,6 @@ Transform:
   m_Father: {fileID: 4300732867488139875}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &1114701759
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1114701755}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &1114701758
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1114701755}
-  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  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!65 &1114701757
 BoxCollider:
   m_ObjectHideFlags: 0

Electrical_inspectionCompetitionSystem/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs

@@ -136,7 +136,7 @@ public class FirstPersonController : MonoBehaviour
 
     #endregion
 
-    float fieldView;
+    
 
     private void Awake()
     {
@@ -369,10 +369,7 @@ public class FirstPersonController : MonoBehaviour
         #endregion
 
         CheckGround();
-        fieldView = playerCamera.fieldOfView;
+       
-        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
-        fieldView = Mathf.Clamp(fieldView, 20, 60);
-        playerCamera.fieldOfView = fieldView;
 
 
 

Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/万用表.prefab

@@ -648,7 +648,6 @@ MonoBehaviour:
   line: {fileID: 7094745485471664169}
   Higth: {fileID: 0}
   selfHighlighter: {fileID: 0}
-  tipPrefab: {fileID: 3004857750428858783, guid: 5cb5fabd80716b64b88f3517ee4bbbc3, type: 3}
 --- !u!114 &8256763883766496110
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1033,109 +1032,173 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1001 &7977265530582431096
+--- !u!1 &4514950303074652478
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 2131893628021589511}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -0.0937
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.2268
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.0853
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -6980580695861291056, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: RedWanYon
-      objectReference: {fileID: 0}
-    - target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_TagString
-      value: Line
-      objectReference: {fileID: 0}
-    - target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Name
-      value: BlackWanYon
-      objectReference: {fileID: 0}
-    - target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 5772668992839476294, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-      propertyPath: m_Layer
-      value: 7
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!4 &3988769801855775873 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 6480123220174193145, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
-  m_PrefabInstance: {fileID: 7977265530582431096}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &5495617035047539862 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  m_ObjectHideFlags: 0
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7715750418364421036}
+  - component: {fileID: 3059428695271397638}
+  - component: {fileID: 2568701473469145960}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF03"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7715750418364421036
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3059428695271397638
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  m_Mesh: {fileID: -4189706640963767879, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &2568701473469145960
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4514950303074652478}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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!1 &5495617035047539862
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8868651887891220814}
+  - component: {fileID: 5805159065386198747}
+  - component: {fileID: 1440140695464012828}
+  - component: {fileID: 7660596071481276608}
+  m_Layer: 7
+  m_Name: BlackWanYon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8868651887891220814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.10578924, y: 0.22393799, z: 0.11220816}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5805159065386198747
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &1440140695464012828
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5495617035047539862}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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!64 &7660596071481276608
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1150,11 +1213,90 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!1 &6444039670963408484 stripped
+--- !u!1 &6444039670963408484
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  m_ObjectHideFlags: 0
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3988769801855775873}
+  - component: {fileID: 1250084940839689348}
+  - component: {fileID: 7806420585310816576}
+  - component: {fileID: 7038635384121928425}
+  m_Layer: 7
+  m_Name: RedWanYon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3988769801855775873
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.038024954, y: 0.22393799, z: 0.11220816}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1250084940839689348
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &7806420585310816576
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6444039670963408484}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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!64 &7038635384121928425
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1169,18 +1311,121 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
---- !u!1 &7094745485471664169 stripped
+--- !u!1 &7094745485471664169
 GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  m_ObjectHideFlags: 0
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &7583579917626380947 stripped
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7583579917626380947}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
+  m_TagString: Line
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7583579917626380947
 Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  m_ObjectHideFlags: 0
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
---- !u!4 &8868651887891220814 stripped
+  m_GameObject: {fileID: 7094745485471664169}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.0937, y: -0.2268, z: -0.0853}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7544377102779913609}
+  - {fileID: 7715750418364421036}
+  - {fileID: 8868651887891220814}
+  - {fileID: 3988769801855775873}
+  m_Father: {fileID: 2131893628021589511}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8190656202517537448
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7544377102779913609}
+  - component: {fileID: 1390955141036317076}
+  - component: {fileID: 6007683287941016964}
+  m_Layer: 7
+  m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF02"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7544377102779913609
 Transform:
-  m_CorrespondingSourceObject: {fileID: 1560276661819145270, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  m_ObjectHideFlags: 0
-  m_PrefabInstance: {fileID: 7977265530582431096}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7583579917626380947}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1390955141036317076
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  m_Mesh: {fileID: -2495079305668151455, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+--- !u!23 &6007683287941016964
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8190656202517537448}
+  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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
+  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}

Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/工作证.prefab

@@ -135,7 +135,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6219929193322986586}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 10.199997, y: 0.25000054, z: 8}

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

@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4746120913896119046}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group17
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -41,7 +41,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8908368846004673723}
-  m_Layer: 7
+  m_Layer: 0
   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: 7
+  m_Layer: 0
   m_Name: Mesh17
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -156,7 +156,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8476607629018925953}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_7
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -187,7 +187,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5141020518187440115}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: GameObject
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -229,7 +229,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4569857264886921150}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -262,7 +262,7 @@ GameObject:
   - component: {fileID: 3593119658715885829}
   - component: {fileID: 8894608374412218228}
   - component: {fileID: 5902783392504266881}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -345,7 +345,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1412327515338934020}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_5
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -378,7 +378,7 @@ GameObject:
   - component: {fileID: 6863689414392290985}
   - component: {fileID: 8044578243574067465}
   - component: {fileID: 2995178057851021996}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -462,7 +462,7 @@ GameObject:
   - component: {fileID: 7166864065046920756}
   - component: {fileID: 8803119539513020876}
   - component: {fileID: 1323511220634850497}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh16
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -545,7 +545,7 @@ GameObject:
   - component: {fileID: 3744470472664545976}
   - component: {fileID: 4732807883570881695}
   - component: {fileID: 5267447848939407980}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -628,7 +628,7 @@ GameObject:
   - component: {fileID: 856354189508394070}
   - component: {fileID: 6185989547905503852}
   - component: {fileID: 6727731447967569148}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh18
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -710,7 +710,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7565062848938117245}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_6
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -741,7 +741,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3001571435648375146}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group16
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -783,7 +783,7 @@ GameObject:
   - component: {fileID: 7225766980221362327}
   - component: {fileID: 2642407967348639564}
   - component: {fileID: 712922406971046451}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: "\u65CB\u8F6C"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -864,7 +864,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1250851749381091549}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group14
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -896,7 +896,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6176178018017224778}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -927,7 +927,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3558027010293232005}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: __
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -959,7 +959,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1318875288723816913}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: ____1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -994,7 +994,7 @@ GameObject:
   - component: {fileID: 6158171241742345503}
   - component: {fileID: 6158171241742345500}
   - component: {fileID: 1304439518211024554}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: "\u94B3\u5F62\u7535\u6D41\u8868"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1028,8 +1028,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.1543576, y: 0.03646712, z: 0.27555346}
+  m_Size: {x: 0.09950634, y: 0.03646712, z: 0.26431698}
-  m_Center: {x: -0.049798988, y: -0.005653805, z: -0.13292134}
+  m_Center: {x: -0.047818907, y: -0.005653806, z: -0.1273031}
 --- !u!114 &6158171241742345500
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1121,7 +1121,6 @@ MonoBehaviour:
   line: {fileID: 0}
   Higth: {fileID: 0}
   selfHighlighter: {fileID: 0}
-  tipPrefab: {fileID: 3004857750428858783, guid: 5cb5fabd80716b64b88f3517ee4bbbc3, type: 3}
 --- !u!1 &6229784074040811293
 GameObject:
   m_ObjectHideFlags: 0
@@ -1131,7 +1130,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4381305327205380603}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group13
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1165,7 +1164,7 @@ GameObject:
   - component: {fileID: 8815301766835690312}
   - component: {fileID: 640432348759470623}
   - component: {fileID: 3148247045032298343}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh20
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1248,7 +1247,7 @@ GameObject:
   - component: {fileID: 8052766349307259215}
   - component: {fileID: 8077896581930785308}
   - component: {fileID: 8259873583255218498}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh21
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1329,7 +1328,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 798318469011142299}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1362,7 +1361,7 @@ GameObject:
   - component: {fileID: 2479850269220612731}
   - component: {fileID: 6680923818199869575}
   - component: {fileID: 6705236448059270355}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh15
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1445,7 +1444,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7775139103552558503}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group15
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1477,7 +1476,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8927848855781106664}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: ____2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1509,7 +1508,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3045188933783192207}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group12
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1541,7 +1540,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6714006973245369769}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Group11
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1573,7 +1572,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6229437332415234806}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: ___1_1_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1605,7 +1604,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 529358269224803276}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: _U39_4
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1636,7 +1635,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5544607966390666044}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: __1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1670,7 +1669,7 @@ GameObject:
   - component: {fileID: 2284983111740971690}
   - component: {fileID: 7298726139806341806}
   - component: {fileID: 1528828075962168210}
-  m_Layer: 7
+  m_Layer: 0
   m_Name: Mesh12
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐/农家乐碰撞盒.prefab.meta

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

Electrical_inspectionCompetitionSystem/Assets/Scenes/农贸市场.unity

@@ -197029,6 +197029,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d38da66309ccf6640acd6bd3ea8ee27a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  loadingPanel: {fileID: 0}
 --- !u!64 &2958352253880195830
 MeshCollider:
   m_ObjectHideFlags: 0

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

@@ -185,6 +185,39 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3822654451255398218, guid: 2ac06dd92c2069f4db98276a4465b943, type: 3}
   m_PrefabInstance: {fileID: 1875591}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2400468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2400469}
+  m_Layer: 0
+  m_Name: "All\u5DE5\u5177\u5668"
+  m_TagString: AllTools
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2400469
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2400468}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1873, y: 1024.4, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 865266376}
+  - {fileID: 1233633457}
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &15887556
 GameObject:
   m_ObjectHideFlags: 0
@@ -845,7 +878,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &214298342
 GameObject:
@@ -2966,7 +2999,6 @@ GameObject:
   - component: {fileID: 333646760}
   - component: {fileID: 333646759}
   - component: {fileID: 333646758}
-  - component: {fileID: 333646762}
   m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
@@ -3007,7 +3039,7 @@ MonoBehaviour:
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 1920, y: 1080}
-  m_ScreenMatchMode: 1
+  m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
@@ -3033,7 +3065,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 3
   m_TargetDisplay: 0
 --- !u!224 &333646761
 RectTransform:
@@ -3046,29 +3078,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
-  m_Children:
+  m_Children: []
-  - {fileID: 1214987529}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
---- !u!114 &333646762
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 333646757}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2ef62ef58861f594ca67aff0391b0765, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  browser: {fileID: 0}
 --- !u!1001 &379696848
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4814,11 +4832,6 @@ MeshCollider:
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 7974993928628611473, guid: 20ffa010543df1a46896595ac300588e, type: 3}
---- !u!1 &786522454 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-  m_PrefabInstance: {fileID: 1214987528}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &809465737
 GameObject:
   m_ObjectHideFlags: 0
@@ -5069,7 +5082,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 865266375}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -1873, y: -1024.4, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -5115,8 +5128,8 @@ Transform:
   - {fileID: 6166402648483344093}
   - {fileID: 3190690649765978568}
   - {fileID: 485612229}
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 2400469}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1039716617
 PrefabInstance:
@@ -5127,7 +5140,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 3350233854110697392, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5179,6 +5192,29 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
+--- !u!1 &1039716618 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3350233854110697404, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
+  m_PrefabInstance: {fileID: 1039716617}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1039716619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1039716618}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5eb279537374e4e4d8f1ad4cf74d2b06, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playerCamera: {fileID: 1039716620}
+--- !u!20 &1039716620 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 3350233855506296104, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
+  m_PrefabInstance: {fileID: 1039716617}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1064116793
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5333,7 +5369,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 4.747, y: 249.743, z: 439.425}
 --- !u!1 &1096617073
 GameObject:
@@ -5680,76 +5716,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 8218745123122009150, guid: 4b06ca5b0865ade40b27cf11a123ba5c, type: 3}
   m_PrefabInstance: {fileID: 1172275066}
   m_PrefabAsset: {fileID: 0}
---- !u!1001 &1214987528
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 333646761}
-    m_Modifications:
-    - target: {fileID: 324364665315715489, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: InstructionMessage
-      value: 
-      objectReference: {fileID: 333646757}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -960
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -538.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_Name
-      value: SceneManager
-      objectReference: {fileID: 0}
-    - target: {fileID: 324364665315715516, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
---- !u!4 &1214987529 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 324364665315715491, guid: 99da977971c2c1343a37bbcc6d10f2ef, type: 3}
-  m_PrefabInstance: {fileID: 1214987528}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1233633456
 GameObject:
   m_ObjectHideFlags: 0
@@ -5761,7 +5727,7 @@ GameObject:
   - component: {fileID: 1233633457}
   m_Layer: 0
   m_Name: "\u5DE5\u5668\u5177"
-  m_TagString: Untagged
+  m_TagString: AllTools
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -5773,8 +5739,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1233633456}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -1873, y: -1024.4, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -5807,8 +5773,8 @@ Transform:
   - {fileID: 1284012090}
   - {fileID: 1850070997}
   - {fileID: 643759145}
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 2400469}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1234414489
 GameObject:
@@ -6053,7 +6019,7 @@ Transform:
   m_Children:
   - {fileID: 2059769794}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1265359521
 MonoBehaviour:
@@ -6129,9 +6095,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 936e1a57cc0a2944a89d7b1617875726, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  game: {fileID: 786522454}
+  _name: Computer
-  name: Computer
+  _focusedPrefab: {fileID: 0}
-  url: http://192.168.0.104:8089/
+  _canvas: {fileID: 333646757}
 --- !u!1001 &1266954248
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7137,7 +7103,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3}
       propertyPath: m_RootOrder
-      value: 9
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 962704353483637904, guid: eba75dd16d820074fbba9f43892bc9a8, type: 3}
       propertyPath: m_LocalPosition.x
@@ -7329,7 +7295,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1532770825
 PrefabInstance:

Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/Multimeter.cs

@@ -8,9 +8,11 @@ public class Multimeter : MonoBehaviour
     [Header("ÊÇ·ñ´øµç")]
     public bool electricity = false;
     [Header("µçÁ÷")]
-    public int activation;
+    public string activation;
     public string name;
     public bool isBlack;
+    public string VV;
+    public bool isok = false;
 
     private void OnMouseDown()
     {
@@ -19,18 +21,21 @@ public class Multimeter : MonoBehaviour
             GameManager.ins.BlackWanYon.transform.parent = transform;
             GameManager.ins.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.ins.BlackWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
-            GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(0,0,-2), 0.25f);
+            GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
             GameManager.ins.BlackWanYon.layer = 0;
             GameManager.ins.MultimeterIm.gameObject.SetActive(true);
+            
         }
         if (GameManager.ins.RedWanYon != null&&!isBlack)
         {
             GameManager.ins.RedWanYon.transform.parent = transform;
             GameManager.ins.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.ins.RedWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
-            GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(0,0, -2f), 0.25f);
+            GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f,0.08f,0.11f), 0.25f);
             GameManager.ins.RedWanYon.layer = 0;
             GameManager.ins.MultimeterIm.gameObject.SetActive(true);
+            GameManager.ins.show(activation + VV);
+            Debug.Log(activation + VV + "安康就是看到机会");
         }
         Debug.Log("³É¹¦");
     }

Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterManager.cs

@@ -5,8 +5,8 @@ using UnityEngine.EventSystems;
 
 public class MultimeterManager : MonoBehaviour
 {
-    [SerializeField] Transform blackXian;
+    public Transform blackXian;
-    [SerializeField] Transform RedXian;
+    public Transform RedXian;
     private Multimeter multimeter;
     public Camera Camera;
     public List<Multimeter> Multimeter;
@@ -26,13 +26,10 @@ public class MultimeterManager : MonoBehaviour
             {
                 // 从相机位置发射一条射线经过屏幕上的鼠标点击位置
                 Ray ray = Camera.ScreenPointToRay(Input.mousePosition);
-
                 // 声明一个射线碰撞信息类
                 RaycastHit hit;
-
                 // 进行碰撞检测
                 bool res = Physics.Raycast(ray, out hit, 1 << 7) && !EventSystem.current.IsPointerOverGameObject();
-
                 if (res)
                 {
                     // 如果产生了碰撞
@@ -40,11 +37,13 @@ public class MultimeterManager : MonoBehaviour
                     {
                         //GameManager.ins.BlackWanYon = null;
                         GameManager.ins.RedWanYon = RedXian.gameObject;
+                        //GameManager.ins.RedWanYonPos = GameManager.ins.RedWanYon.transform.localPosition;
                     }
                     if (hit.collider.name.Equals("BlackWanYon"))
                     {
                         //GameManager.ins.RedWanYon = null;
                         GameManager.ins.BlackWanYon = blackXian.gameObject;
+                        //GameManager.ins.BlackWanYonPos = GameManager.ins.BlackWanYon.transform.localPosition;
                     }
                     Debug.Log(hit.collider.name);
                 }

Electrical_inspectionCompetitionSystem/Assets/Script/AmmeterManager/MultimeterRecovery.cs

@@ -12,6 +12,8 @@ public class MultimeterRecovery : MonoBehaviour
     [SerializeField] Transform trans;
     [SerializeField] Vector3 Redpos;
     [SerializeField] Vector3 Blackpos;
+    public float Multimeter;
+    public string MultimeterV;
     // Start is called before the first frame update
     void Start()
     {
@@ -19,6 +21,8 @@ public class MultimeterRecovery : MonoBehaviour
         btn = GetComponent<Button>();
         btn.onClick.AddListener(() =>
         {
+            GameManager.ins.DianFuIm.gameObject.SetActive(true);
+            GameManager.ins.DianFuTex.text = Multimeter + MultimeterV;
             trans = GameManager.ins.temp.transform;
             if (GameManager.ins.RedWanYon)
             {

Electrical_inspectionCompetitionSystem/Assets/Script/AmpereMeter/AmpereMeter.cs

@@ -21,7 +21,7 @@ public class AmpereMeter : MonoBehaviour
         if (Input.GetMouseButton(0))
         {
             //1.参数ray 为射线碰撞检测的光线(返回一个从相机到屏幕鼠标位置的光线)
-            Ray ray = cam.ScreenPointToRay(Input.mousePosition);
+            Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
             RaycastHit hit;
             if (Physics.Raycast(ray, out hit, 50) && !EventSystem.current.IsPointerOverGameObject()) //如果碰撞检测到物体
             {

Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl.cs

@@ -4,148 +4,40 @@ using UnityEngine;
 
 public class CameraControl : MonoBehaviour
 {
-    public static CameraControl Instance { private set; get; }
+    float fieldView;
-    public float minDis = 0.5f;
+    public Camera playerCamera;
-    public float maxDis = 1.5f;
-    public float rSmoothTime = 0.3f, sSmoothTime = 0.3f, mSmoothTime = 0.3f;
-    public float mouseRotSpeed = 8, mouseMoveSpeed = 1, mouseZoomSpeed = 15;
-    public float minVerticalAngle = -30, maxVerticalAngle = 60;
-    public float minHorizontalAngle = -60, maxHorizontalAngle = 60;
-    [Header("初始化数据"), SerializeField] float orginDis = 0;
-    Vector3 currentPosition, movVelocity, targetPosition;
-    float targetDis, currentDis, disVelocity;
-    Vector3 currentRotation, targetRotation, rotVelocity;
-    [SerializeField] Transform target;
-    Vector3 pos;
-    bool isok = false;
-    public bool ZhoLI = false;//是否是重力模式
-    float speed = 20;
-    private void Awake()
-    {
-        Instance = this;
-        SetCameraTrans();
-        //Debug.Log("CameraControl");
-    }
-    [ContextMenu("设置相机位置")]
-    private void SetCameraTrans()
-    {
-        currentDis = targetDis = orginDis;
-        currentPosition = targetPosition = transform.position;
-        currentRotation = targetRotation = transform.localEulerAngles;
-    }
-    public void SetOrginDis(Vector3 orginPos, Vector3 orginRO)
-    {
-        target = null;
-        targetPosition = orginPos;
-        targetRotation = orginRO;
-        targetDis = 0;
-    }
-    public void SetPos(Vector3 pos,Vector3 ro)
-    {
-        targetPosition = pos;
-        targetRotation = ro;
-    }
     private void Update()
     {
-        if (Input.touchCount == 0 && Input.GetMouseButton(1))
+        fieldView = playerCamera.fieldOfView;
+        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
+        fieldView = Mathf.Clamp(fieldView, 30, 60);
+        playerCamera.fieldOfView = fieldView;
+        if (GameManager.ins.interactiveEnum != Interactive.YanDian)
         {
-            targetRotation.y += Input.GetAxis("Mouse X") * mouseRotSpeed;
+            if (GameManager.ins.temp && !GameManager.ins.temp.name.Equals("ǯÐεçÁ÷±í(Clone)"))
-            targetRotation.x -= Input.GetAxis("Mouse Y") * mouseRotSpeed;
+            {
+                switch (fieldView / 10)
+                {
+                    case 3:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
+                        break;
+                    case 4:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
+                        break;
+                    case 5:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
+                        break;
+                    case 6:
+                        GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
+                        break;
+                    default:
+                        break;
                 }
-        targetDis = targetDis - Input.GetAxis("Mouse ScrollWheel") * mouseZoomSpeed;
-        targetRotation.x = Mathf.Clamp(targetRotation.x, minVerticalAngle, maxVerticalAngle);
-        //targetRotation.y = Mathf.Clamp(targetRotation.y, minHorizontalAngle, maxHorizontalAngle);
-        targetDis = Mathf.Clamp(targetDis, minDis, maxDis);
-        currentDis = Mathf.SmoothDamp(currentDis, targetDis, ref disVelocity, rSmoothTime);
-        currentRotation = Vector3.SmoothDamp(currentRotation, targetRotation, ref rotVelocity, rSmoothTime);
-        var tmpRotation = Quaternion.Euler(currentRotation);
-        var offset = tmpRotation * Vector3.forward * -currentDis;
-        if (target != null)
-        {
-            targetPosition = target.position;
-        }
-        currentPosition = Vector3.SmoothDamp(currentPosition, targetPosition, ref movVelocity, mSmoothTime);
-        var tmpPosition = currentPosition + offset;
-        if (transform.rotation != tmpRotation)
-        {
-            transform.rotation=tmpRotation;
-        }
-        if (ZhoLI)
-        {
-            if (transform.position.y > 3f)
-            {
-                transform.position = new Vector3(transform.position.x, 2.1f, transform.position.z);
-            }
-        }
-        else
-        {
-            if (transform.position.y > 20f)
-            {
-                transform.position = new Vector3(transform.position.x, 20f, transform.position.z);
-            }
-        }
-        if (transform.position.y < 2f)
-        {
-            transform.position = new Vector3(transform.position.x, 2.1f, transform.position.z);
-        }
-        if (Input.GetKey(KeyCode.LeftShift))
-        {
-            speed = 25f;
-        }
-        else
-        {
-            speed = 12f;
-        }
-
-        
-        float x= Mathf.Clamp(transform.position.x, -137f, 102f);
-        //float y = Mathf.Clamp(transform.position.y, 2.1f, 20f);
-        float z= Mathf.Clamp(transform.position.z, -125f, 119f);
-        transform.position = new Vector3(x,transform.position.y,z);
-    }
-    private void FixedUpdate()
-    {
-        float x = Input.GetAxis("Horizontal");
-        float y = Input.GetAxis("Vertical");
-        float z = Input.GetAxis("Updown");
-        if (x != 0 || y != 0 || z != 0)
-        {
-            Debug.Log("Horizontal " + x + " Ver" + y);
-            if (!ZhoLI)
-            {
-                z = (z * Time.deltaTime * speed);
-                Debug.Log(z);
-            }
-            pos = new Vector3(x * Time.deltaTime * speed, z, y * Time.deltaTime * speed);
-            isok = true;
-            
-        }
-        else
-        {
-            isok = false;
-        }
-        if (isok)
-        {
-            if (transform.position != pos || x != 0 || y != 0||z !=0)
-            {
-                transform.Translate(pos);
-                
             }
         }
         
     }
-    //public void Fly()
+
-    //{
-    //    ZhoLI = false;
-    //    transform.GetComponent<Rigidbody>().useGravity = false;
-    //    transform.position = new Vector3(transform.position.x, 20f, transform.position.z);
-    //}
-    //public void NotFly()
-    //{
-    //    ZhoLI = true;
-    //    transform.GetComponent<Rigidbody>().useGravity = true;
-    //    transform.position = new Vector3(transform.position.x,2.1f,transform.position.z);
-    //}
 }
 ////声明部分public float horizontalinput;
 /////水平参数public float Verticalinput;

Electrical_inspectionCompetitionSystem/Assets/Script/Camera/CameraControl1.cs

@@ -8,169 +8,14 @@ using TMPro;
 
 public class CameraControl1 : MonoBehaviour
 {
-    
+    float fieldView;
-    public static CameraControl1 ins;
+    public Camera playerCamera;
-    [Header("设置参数")]
-    [SerializeField] float minDis = 2;
-     [SerializeField]  float maxDis ;
-    [SerializeField] float mouseRotSpeed = 8;
-    [SerializeField] float touchZoomSpeed = 0.1f;
-    [SerializeField] float touchRotateSpeed = 0.3f;
-    [SerializeField] float mouseMoveSpeed = 1;
-    [SerializeField] float mouseZoomSpeed = 10;
-    [SerializeField] float rSmoothTime = 0.3f;
-    [SerializeField] float sSmoothTime = 0.3f;
-    [SerializeField] float mSmoothTime = 0.3f;
-    [SerializeField] float minVerticalAngle = 0;
-    [SerializeField] float maxVerticalAngle = 60;
-    [Header("用于展示数据")]
-    [SerializeField] float horizontalAngle = 0;
-    [SerializeField] float verticalAngle = 0;
-    [SerializeField] float currentDis = 80;
-    [SerializeField] Vector3 originPosition;
-    [SerializeField] Vector3 targetPosition;
-    //[HideInInspector] public bool isrotateend;
-    bool isrotateable;
-    bool isscaleable;
-    float _targetDis;
-    private Touch oldTouch1;
-    private Touch oldTouch2;
-    // 
-    public bool UPDOWN = false;
-
-
-    float targetDis
-    {
-        set
-        {
-            _targetDis = value > maxDis ? maxDis : value < minDis ? minDis : value;
-        }
-        get { return _targetDis; }
-    }
-    Vector3 rVelocity = Vector3.zero;
-    float sVelocity = 0;
-    Vector3 mVelocity = Vector3.zero;
-    Vector3 dampRotation;
-    Transform targetTrans;
-    bool m_IsSingleFinger;
-    private void Awake()
-    {
-        ins = this;
-        targetDis = currentDis;
-        targetPosition = originPosition;
-    }
-
-    [ContextMenu("设置相机位置")]
-    private void SetCameraTrans()
-    {
-        transform.eulerAngles = new Vector3(verticalAngle, horizontalAngle, 0);
-        var offset = transform.forward * -currentDis;
-        transform.position = originPosition + offset;
-    }
-    public void SetTarget(Transform target, float distance = 4)
-    {
-        targetDis = distance;
-        targetTrans = target;
-    }
-    public void SetCenterPoint(Vector3 target, float distance = 4)
-    {
-        targetDis = distance;
-        targetPosition = target;
-    }
-    public void Recover(float max, float min)
-    {
-
-        // targetPosition = originPosition = Vector3.zero;
-        horizontalAngle -= horizontalAngle % 360;
-        verticalAngle = 0;
-        maxDis = max;
-        minDis = min;
-        targetDis = maxDis;
-        // targetTrans = null;
-    }
-    public void RecoverTwo()
-    {
-        horizontalAngle -= horizontalAngle % 360;
-        verticalAngle = 0;
-        targetDis = maxDis;
-    }
-    
-  
     private void Update()
     {
-        //限制视角上下
+        fieldView = playerCamera.fieldOfView;
-        if (UPDOWN)
+        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
-        {
+        fieldView = Mathf.Clamp(fieldView, 30, 60);
-            if (verticalAngle < -15)
+        playerCamera.fieldOfView = fieldView;
-            {
-                verticalAngle = -15;
-            }
-        }
-       
-        if (Input.touchCount == 0)
-        {
-            //  isscaleable  = true;
-            isrotateable = true;
-            if (Input.GetMouseButton(0))
-            {
-                horizontalAngle += Input.GetAxis("Mouse X") * mouseRotSpeed;
-                verticalAngle -= Input.GetAxis("Mouse Y") * mouseRotSpeed;
-
-                verticalAngle = Mathf.Clamp(verticalAngle, minVerticalAngle, maxVerticalAngle);
-            }
-            targetDis = targetDis - Input.GetAxis("Mouse ScrollWheel") * mouseZoomSpeed;
-        }
-
-        if (Input.touchCount == 1)
-        {
-            if (isrotateable)
-            {
-                if (Input.touches[0].phase == TouchPhase.Began)
-                {
-                    oldTouch1 = Input.touches[0];
-                }
-                var deltaPos = Input.touches[0].position - oldTouch1.position;
-                horizontalAngle += deltaPos.x * touchRotateSpeed*3f ;
-                verticalAngle -= deltaPos.y * touchRotateSpeed;
-                verticalAngle = Mathf.Clamp(verticalAngle, minVerticalAngle, maxVerticalAngle);
-                oldTouch1 = Input.touches[0];
-            }
-        }
-        if (Input.touchCount == 2)
-        {
-            isrotateable = false ;
-            if (Input.touches[1].phase == TouchPhase.Began)
-            {
-                oldTouch1 = Input.touches[0];
-                oldTouch2 = Input.touches[1];
-            }
-            float currentTouchDistance = Vector2.Distance(Input.touches[0].position, Input.touches[1].position);
-            float lastTouchDistance = Vector2.Distance(oldTouch1.position, oldTouch2.position);
-            if (Input.touches[0].phase != TouchPhase.Ended && Input.touches[1].phase != TouchPhase.Ended)
-            {
-                //计算上次和这次双指触摸之间的距离差距  
-                //然后去更改摄像机的距离  
-                targetDis -= (currentTouchDistance - lastTouchDistance) * touchZoomSpeed;
-                oldTouch1 = Input.touches[0];
-                oldTouch2 = Input.touches[1];
-            }
-        }
-
-        currentDis = Mathf.SmoothDamp(currentDis, targetDis, ref sVelocity, rSmoothTime);
-        dampRotation = Vector3.SmoothDamp(dampRotation, new Vector3(verticalAngle, horizontalAngle), ref rVelocity, rSmoothTime);
-        transform.rotation = Quaternion.Euler(dampRotation);
-        if (targetTrans != null)
-        {
-            if (originPosition != targetTrans.position)
-                originPosition = Vector3.SmoothDamp(originPosition, targetTrans.position, ref mVelocity, mSmoothTime);
-        }
-        else
-        {
-            if (originPosition != targetPosition)
-                originPosition = Vector3.SmoothDamp(originPosition, targetPosition, ref mVelocity, mSmoothTime);
-        }
-        var offset = transform.forward * -currentDis;
-        transform.position = originPosition + offset;
     }
 
 }

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DoolsPlayer : MonoBehaviour
+{
+    [SerializeField] door_control mesh;
+    // Start is called before the first frame update
+    void Start()
+    {
+        mesh.启用交互 = false;
+    }
+
+    private void OnMouseDown()
+    {
+        mesh.启用交互 = true;
+        gameObject.SetActive(false);
+    }
+}

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/DoolsPlayer.cs.meta

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

Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs

@@ -24,14 +24,16 @@ public class GameManager : MonoBehaviour
     [SerializeField] SceneData SceneData;//暂时数据
     [SerializeField] List<GameObject> Inverter;
     [SerializeField] Transform trans;
-    public StopValve WanStopValve;//万用表UI旋钮
+    public StopValveGai WanStopValve;//万用表UI旋钮
-    public StopValve QianStopValve;//钳形表UI旋钮
+    public StopValveGai QianStopValve;//钳形表UI旋钮
     [SerializeField] GameObject NiBianQi;
     [SerializeField] Image XiangWeiUI;//相位UI
     public GameObject temp;
-    [SerializeField] List<GameObject> interactive;
+    public List<GameObject> interactive;
     public GameObject RedWanYon;
+    public Vector3 RedWanYonPos;
     public GameObject BlackWanYon;
+    public Vector3 BlackWanYonPos;
     public GameObject FuAnBiao;
     public Interactive interactiveEnum = Interactive.none;
     public Transform biaojiPos;
@@ -39,6 +41,7 @@ public class GameManager : MonoBehaviour
     public Image MultimeterIm;
     public Image DianFuIm;
     public Text DianFuTex;
+    [SerializeField] FirstPersonController FirstPersonController;
     public void Awake()
     {
         if (ins != null)
@@ -52,8 +55,17 @@ public class GameManager : MonoBehaviour
     // Start is called before the first frame update
     private void Start()
     {
+
         UIManager.Instance.ToolsItemManager.ItemClick.AddListener(ToolsShow);
-        string sceneInfo = "三相_无互感器_无光伏";
+        UIManager.Instance.ToolsItemManager.recoverEvent.AddListener(() =>
+        {
+            WanStopValve.gameObject.SetActive(false);
+            QianStopValve.gameObject.SetActive(false);
+            DianFuIm.gameObject.SetActive(false);
+            interactiveEnum = Interactive.none;
+            FirstPersonController.enabled = true;
+        });
+        string sceneInfo = GlobalFlag.SceneInfo();
         var tempStr = sceneInfo.Split('_');
         int pvwCount = (GlobalFlag.pvw * 1000) / 295;
         if (tempStr[tempStr.Length-1].Equals("有光伏"))
@@ -74,20 +86,25 @@ public class GameManager : MonoBehaviour
                 GameObject obj = Instantiate(Inverter[i]);
                 obj.transform.localPosition = biaojiPos.localPosition;
                 obj.transform.localEulerAngles = biaojiPos.localEulerAngles;
+                interactive.Add(obj.GetComponentInChildren<door_control>().gameObject);
             }
         }
     }
-
+    public void show(string Str)
+    {
+        DianFuIm.gameObject.SetActive(true);
+        DianFuTex.text = Str;
+    }
     private void Update()
     {
         switch (interactiveEnum)
         {
-            case Interactive.none:
+            //case Interactive.none:
-                for (int i = 0; i < interactive.Count; i++)
+            //    for (int i = 0; i < interactive.Count; i++)
-                {
+            //    {
-                    interactive[i].transform.GetComponent<door_control>().启用交互 = true;
+            //        interactive[i].transform.GetComponent<door_control>().启用交互 = true;
-                }
+            //    }
-                break;
+            //    break;
             case Interactive.YanDian:
                 for (int i = 0; i < interactive.Count; i++)
                 {
@@ -103,16 +120,18 @@ public class GameManager : MonoBehaviour
             default:
                 break;
         }
-        if (Input.GetKeyDown(KeyCode.K))
+        //if (Input.GetKeyDown(KeyCode.K))
-        {
+        //{
-            ToolsShow(QianXing);
+        //    ToolsShow(QianXing);
-        }
+        //}
     }
     /// <summary>
     /// 工具生成方法
     /// </summary>
     public void ToolsShow(GameObject tools)
     {
+        Camera.main.fieldOfView = 60;
+        FirstPersonController.enabled = false;
         if (temp != null)
         {
             Destroy(temp.gameObject);
@@ -131,14 +150,15 @@ public class GameManager : MonoBehaviour
                 QianStopValve.gameObject.SetActive(false);
                 GameObject t2 = GameObject.FindGameObjectWithTag("旋转");
                 WanStopValve.trans = t2.transform;
+                BlackWanYonPos = temp.GetComponent<MultimeterManager>().blackXian.localPosition;
+                RedWanYonPos = temp.GetComponent<MultimeterManager>().RedXian.localPosition;
                 temp.GetComponent<MultimeterManager>();
                 temp.GetComponent<MultimeterManager>().Camera = toolsCam;
                 temp.GetComponent<ToolModelClick>().line.SetActive(true);
                 break;
             case "钳形电流表":
                 interactiveEnum = Interactive.QianXing;
-                temp.transform.localRotation = Quaternion.Euler(new Vector3(90, 180, 0));
+                temp.transform.localEulerAngles = new Vector3(90, 180, 0);
-
                 QianStopValve.trans = temp.transform.Find("旋转");
                 WanStopValve.gameObject.SetActive(false);
                 QianStopValve.gameObject.SetActive(true);

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxDools.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BoxDools : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other != null)
+        {
+            for (int i = 0; i < GameManager.ins.interactive.Count; i++)
+            {
+                if (!GameManager.ins.interactive[i].GetComponent<door_control>().启用交互)
+                {
+                    GameManager.ins.interactive[i].GetComponent<door_control>().启用交互 = true;
+                }
+            }
+        }
+    }
+    private void OnTriggerExit(Collider other)
+    {
+        if (other != null)
+        {
+            for (int i = 0; i < GameManager.ins.interactive.Count; i++)
+            {
+                GameManager.ins.interactive[i].GetComponent<door_control>().启用交互 = false;
+                if (GameManager.ins.interactive[i].GetComponent<door_control>().是否开门)
+                {
+                    GameManager.ins.interactive[i].GetComponent<door_control>().animator.Play(GameManager.ins.interactive[i].GetComponent<door_control>().关门动画);
+                }
+            }
+        }
+    }
+}

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

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

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/BoxPengZhuang.cs

@@ -20,7 +20,11 @@ public class BoxPengZhuang : MonoBehaviour
         {
             g1.gameObject.SetActive(true);
             g1.init(dialogue);
+            if (fraction)
+            {
                 fraction.CompletedorNot = true;
+            }
+            PlayerPrefs.SetString("isWorkingPersonnel", "1");
             GetComponent<Fraction>().CompletedorNot = true;
         }
     }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersInteractive.cs

@@ -11,6 +11,8 @@ public class ClampAmmetersInteractive : MonoBehaviour
     public string name;
     public float linearMeasure;//默认的大小
     public List<float> floats;
+    public string Fuan;
+    public string unit;
     private void Start()
     {
         transform.AddComponent<MeshCollider>();
@@ -28,17 +30,27 @@ public class ClampAmmetersInteractive : MonoBehaviour
         //Debug.Log("ok");
         if (GameManager.ins.temp.transform != null && GameManager.ins.temp.transform.name.Equals("钳形电流表(Clone)") || GameManager.ins.temp.transform.name.Equals("钳形电流表_大(Clone)"))
         {
+            GameManager.ins.DianFuIm.gameObject.SetActive(true);
             GameManager.ins.temp.transform.parent = g1.transform;
-            GameManager.ins.temp.transform.DOLocalRotate(new Vector3(40.35f,186.12f,-142.8f), 0.25f);
+            GameManager.ins.temp.transform.DOLocalRotate(new Vector3(47.52f,0,53.88f), 0.25f);
-            GameManager.ins.temp.transform.DOScale(new Vector3(30,30,30), 0.25f);
+            GameManager.ins.temp.transform.DOScale(new Vector3(50,50,50), 0.25f);
-            GameManager.ins.temp.transform.DOLocalMove(new Vector3(0.6f,-5.43f,-7.09f), 0.25f);
+            GameManager.ins.temp.transform.DOLocalMove(new Vector3(1.42f,-6.02f,8.35f), 0.25f);
+            GameManager.ins.DianFuTex.text = Fuan +" "+ unit;
             for (int i = 0; i < floats.Count; i++)
             {
-                if (floats[(int)(GameManager.ins.QianStopValve.linearMeasure / 10)]> linearMeasure)
+                
+                if (floats[(int)(GameManager.ins.QianStopValve.Sum / 10)]> linearMeasure)
                 {
                     GetComponent<Fraction>().CompletedorNot = true;
                 }
             }
         }
     }
+    private void Update()
+    {
+        if (Input.GetKeyDown("t"))
+        {
+            Debug.Log(GameManager.ins.DianFuTex.text + "==== GameManager.ins.DianFuTex.text");
+        }
+    }
 }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/ClampAmmetersManager.cs

@@ -0,0 +1,70 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using Views;
+
+public class ClampAmmetersManager : MonoBehaviour
+{
+    [SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives = new List<ClampAmmetersInteractive>();
+    [SerializeField] List<Multimeter> Multimeter = new List<Multimeter>();
+    public Dictionary<int, float> data = new Dictionary<int, float>();
+    public ThreeTransformerPhotovoltaicView Three;
+    private void Awake()
+    {
+        run();
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        //init();
+        StartCoroutine(QiDon());
+    }
+    IEnumerator QiDon()
+    {
+        yield return new WaitForSeconds(5f);
+        init();
+    }
+    /// <summary>
+    /// 获取低下预设数据
+    /// </summary>
+    void run()
+    {
+        clampAmmetersInteractives = GetComponentsInChildren<ClampAmmetersInteractive>().ToList();
+        Multimeter = GetComponentsInChildren<Multimeter>().ToList();
+        Three = GetComponentInChildren<ThreeTransformerPhotovoltaicView>();
+    }
+    void init()
+    {
+        for (int i = 0; i < clampAmmetersInteractives.Count; i++)
+        {
+            if (clampAmmetersInteractives[i].name.Equals("用电_AA2")|| clampAmmetersInteractives[i].name.Equals("用电_AA3"))
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
+            }
+            if (clampAmmetersInteractives[i].name.Equals("用电_BA2")|| clampAmmetersInteractives[i].name.Equals("用电_BA3"))
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxB;
+            }
+            if (clampAmmetersInteractives[i].name.Equals("用电_CA2") || clampAmmetersInteractives[i].name.Equals("用电_CA3") )
+            {
+                clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
+            }
+        }
+        for (int i = 0; i < Multimeter.Count; i++)
+        {
+            if (Multimeter[i].name.Equals("用电_AV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyA;
+            }
+            if (Multimeter[i].name.Equals("用电_BV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyB;
+            }
+            if (Multimeter[i].name.Equals("用电_CV1"))
+            {
+                Multimeter[i].activation = Three.ttpData.data.dyC;
+            }
+        }
+    }
+}

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

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

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValve.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
-public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDragHandler
+public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, /*IDragHandler,*/ IPointerClickHandler
 {
     private Vector3 start = new Vector3(0, 0, -80);
     //滑动点到阀门图片中点的向量
@@ -32,29 +32,42 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
 
     public void OnBeginDrag(PointerEventData eventData)
     {
-        currentPos = eventData.position;
+        //currentPos = transform.position;
+        //sum = (int)linearMeasure;
     }
 
-    /// <summary>
+    ///// <summary>
-    /// 拖拽中
+    ///// 拖拽中
-    /// </summary>
+    ///// </summary>
-    /// <param name="eventData"></param>
+    ///// <param name="eventData"></param>
-    public void OnDrag(PointerEventData eventData)
+    //public void OnDrag(PointerEventData eventData)
+    //{
+    //    timeCount += Time.deltaTime;
+    //    if (timeCount > limitTime)
+    //    {
+    //        float x = Input.GetAxis("Mouse X");
+    //        float y = Input.GetAxis("Mouse Y");
+    //        if (x != 0 || y != 0)
+    //        {
+    //            if (x > 0 || y > 0)
+    //            {
+    //                sum = ZhuanSum;
+    //            }
+    //            else if (x < 0 || y < 0)
+    //            {
+    //                sum = -ZhuanSum;
+    //            }
+    //        }
+    //        Debug.Log("旋转的方法"+x+" "+y);
+    //        Deng(sum);
+    //        timeCount = 0;
+    //    }
+    //}
+    void Update()
     {
-        timeCount += Time.deltaTime;
+        if (true)
-        if (timeCount > limitTime)
         {
-            if (currentPos.x - eventData.position.x > 0)
+
-            {
-                sum += ZhuanSum;
-            }
-            if (currentPos.x - eventData.position.x < 0)
-            {
-                sum += -ZhuanSum;
-            }
-            Debug.Log("旋转的方法");
-            Deng(sum);
-            timeCount = 0;
         }
     }
     void Deng(float angle)
@@ -82,4 +95,38 @@ public class StopValve : MonoBehaviour, IBeginDragHandler, IEndDragHandler, IDra
     {
         timeCount = 0;
     }
+
+    public void OnPointerClick(PointerEventData eventData)
+    {
+        //timeCount += Time.deltaTime;
+        //if (timeCount > limitTime)
+        //{
+        //float x = Input.GetAxis("Mouse X");
+        //float y = Input.GetAxis("Mouse Y");
+        //if (x != 0 || y != 0)
+        //{
+        //    if (x > 0 || y > 0)
+        //    {
+        //        sum = ZhuanSum;
+        //    }
+        //    else if (x < 0 || y < 0)
+        //    {
+        //        sum = -ZhuanSum;
+        //    }
+        //}
+        //Debug.Log("旋转的方法" + x + " " + y);
+        //Deng(sum);
+        int z = (int)linearMeasure;
+        if (z % max != 0)
+        {
+            z += ZhuanSum;
+        }
+        else
+        {
+            z = mix;
+        }
+        Deng(z);
+        //    timeCount = 0;
+        //}
+    }
 }

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/StopValveGai.cs

@@ -0,0 +1,66 @@
+using DG.Tweening;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class StopValveGai : MonoBehaviour
+{
+    [SerializeField] int mix;
+    [SerializeField] int max;
+    [SerializeField] float initPos;
+    public float Sum;
+    public Transform trans;
+    [SerializeField] float x;
+    [SerializeField] int ZhuanSum;//要旋转一次的角度
+    [SerializeField] bool isok = false;
+    [SerializeField] Button btn;
+    // Start is called before the first frame update
+    void Start()
+    {
+        btn.onClick.AddListener(() =>
+        {
+            if (!isok)
+            {
+                if (Sum < max)
+                {
+                    Sum += ZhuanSum;
+                }
+                else
+                {
+                    isok = true;
+                }
+            }
+            else
+            {
+                if (Sum > mix)
+                {
+                    
+                    Sum -= ZhuanSum;
+                }
+                else
+                {
+                    isok = false;
+                }
+                
+            }
+            
+            Deng(Sum);
+        });
+    }
+    void Deng(float angle)
+    {
+        float z = Mathf.Clamp(angle, mix, max);
+        btn.transform.eulerAngles = new Vector3(0, 0, z);
+        Sum = z;
+        if (transform.name.Equals("万用表"))
+        {
+            trans.DOLocalRotate(new Vector3(x, 0, ~(int)z), 0.01f);
+        }
+        else
+        {
+            trans.DOLocalRotate(new Vector3(x, ~(int)z, 0), 0.01f);
+        }
+        //Debug.Log(Mathf.Clamp(~(int)z, mix, max));
+    }
+}

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

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

Electrical_inspectionCompetitionSystem/Assets/Script/Interactive/TestPenInteractive.cs

@@ -24,7 +24,7 @@ public class TestPenInteractive : MonoBehaviour
             //1.参数ray 为射线碰撞检测的光线(返回一个从相机到屏幕鼠标位置的光线)
             Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
             RaycastHit hit;
-            if (Physics.Raycast(ray, out hit, 50)) //如果碰撞检测到物体
+            if (Physics.Raycast(ray, out hit, 100)) //如果碰撞检测到物体
             {
                 if (hit.collider.transform.tag.Equals("YanDian"))
                 {

Electrical_inspectionCompetitionSystem/Assets/Script/KDLURL/newfollow.cs

@@ -1,20 +1,16 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
+using Vuplex.WebView;
 
 public class newfollow : MonoBehaviour
 {
-    [SerializeField] GameObject game;
+    [SerializeField] string _name;
-    [SerializeField] string name;
+    public CanvasWebViewPrefab _focusedPrefab;
-    public string url;
+    public GameObject _canvas;
-    //[SerializeField] Dialogue dialogue;
+    private void Start()
-    // Start is called before the first frame update
+    {
-    //void Start()
-    //{
-    //    //EventTriggerListener.Get(transform.gameObject).onClick += g =>
-    //    //{
 
-    //    //};
+    }
-    //}
     private void Update()
     {
         // 鼠标左键按下
@@ -31,18 +27,113 @@ public class newfollow : MonoBehaviour
             if (res)
             {
                 // 如果产生了碰撞
-                if (hit.transform.name.Equals(name))
+                if (hit.transform.name.Equals(_name))
                 {
                     Debug.Log(hit.transform.name);
-                    game.SetActive(true);
+                    CreatView();
-                    //game.init(url);
                 }
             }
         }
+
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            if (_focusedPrefab != null)
+                Destroy(_focusedPrefab.gameObject);
         }
-    //// Update is called once per frame
+    }
-    //private void FixedUpdate()
+
-    //{
+    private void CreatView()
-    //    transform.LookAt(game);
+    {
-    //}
+        // Enable the native touch screen keyboard for Android and iOS.
+        Web.SetTouchScreenKeyboardEnabled(true);
+
+        //_canvas = GameObject.Find("Canvas");
+        // Create a webview for the main content.
+        var mainWebViewPrefab = CanvasWebViewPrefab.Instantiate();
+        mainWebViewPrefab.transform.SetParent(_canvas.transform, false);
+        var rectTransform = mainWebViewPrefab.transform as RectTransform;
+        rectTransform.anchoredPosition3D = Vector3.zero;
+        rectTransform.offsetMin = Vector2.zero;
+        rectTransform.offsetMax = Vector2.zero;
+        mainWebViewPrefab.transform.localScale = Vector3.one;
+
+        _focusedPrefab = mainWebViewPrefab;
+        mainWebViewPrefab.Initialized += (s, e) =>
+        {
+            var webViewWithPopups = mainWebViewPrefab.WebView as IWithPopups;
+            if (webViewWithPopups == null)
+            {
+                mainWebViewPrefab.WebView.LoadHtml(NOT_SUPPORTED_HTML);
+                return;
+            }
+
+            WebViewLogger.Log("Loading Pinterest as an example because it uses popups for third party login. Click 'Login', then select Facebook or Google to open a popup for authentication.");
+            mainWebViewPrefab.WebView.LoadUrl("http://111.229.30.246:10015/");
+
+            webViewWithPopups.SetPopupMode(PopupMode.LoadInNewWebView);
+            webViewWithPopups.PopupRequested += (webView, eventArgs) =>
+            {
+                WebViewLogger.Log("Popup opened with URL: " + eventArgs.Url);
+                var popupPrefab = CanvasWebViewPrefab.Instantiate(eventArgs.WebView);
+                _focusedPrefab = popupPrefab;
+
+                popupPrefab.transform.SetParent(_canvas.transform, false);
+                var popupRectTransform = popupPrefab.transform as RectTransform;
+                popupRectTransform.anchoredPosition3D = Vector3.zero;
+                popupRectTransform.offsetMin = Vector2.zero;
+                popupRectTransform.offsetMax = Vector2.zero;
+                popupPrefab.transform.localScale = Vector3.one;
+                // Place the popup in front of the main webview.
+                var localPosition = popupPrefab.transform.localPosition;
+                localPosition.z = 0.1f;
+                popupPrefab.transform.localPosition = localPosition;
+
+                popupPrefab.Initialized += (sender, initializedEventArgs) =>
+                {
+                    popupPrefab.WebView.CloseRequested += (popupWebView, closeEventArgs) =>
+                    {
+                        WebViewLogger.Log("Closing the popup");
+                        _focusedPrefab = mainWebViewPrefab;
+                        popupPrefab.Destroy();
+                    };
+                };
+            };
+        };
+    }
+
+    const string NOT_SUPPORTED_HTML = @"
+            <body>
+                <style>
+                    body {
+                        font-family: sans-serif;
+                        display: flex;
+                        justify-content: center;
+                        align-items: center;
+                        line-height: 1.25;
+                    }
+                    div {
+                        max-width: 80%;
+                    }
+                    li {
+                        margin: 10px 0;
+                    }
+                </style>
+                <div>
+                    <p>
+                        Sorry, but this 3D WebView package doesn't support yet the <a href='https://developer.vuplex.com/webview/IWithPopups'>IWithPopups</a> interface. Current packages that support popups:
+                    </p>
+                    <ul>
+                        <li>
+                            <a href='https://developer.vuplex.com/webview/StandaloneWebView'>3D WebView for Windows and macOS</a>
+                        </li>
+                        <li>
+                            <a href='https://developer.vuplex.com/webview/AndroidWebView'>3D WebView for Android</a>
+                        </li>
+                        <li>
+                            <a href='https://developer.vuplex.com/webview/AndroidGeckoWebView'>3D WebView for Android with Gecko Engine</a>
+                        </li>
+                    </ul>
+                </div>
+            </body>
+        ";
 }

Electrical_inspectionCompetitionSystem/Assets/Script/Shader.meta

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

Electrical_inspectionCompetitionSystem/Assets/Script/Shader/Fade.shadergraph.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 25d70fabd09336447aa2c510e9eb5081
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/Shader/New Material.mat

@@ -0,0 +1,96 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Material
+  m_Shader: {fileID: -6465566751694194690, guid: 25d70fabd09336447aa2c510e9eb5081, type: 3}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Emission:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normal:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

Electrical_inspectionCompetitionSystem/Assets/Script/Shader/New Material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bb3e1ce8ad122e46a84c2eec2b26aa8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel.meta

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

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel/WorkingPersonnel.cs

@@ -0,0 +1,40 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WorkingPersonnel : MonoBehaviour
+{
+    public static WorkingPersonnel instance;
+    [SerializeField] string isWorkingPersonnel;
+    [SerializeField] GameObject game;
+    private void Awake()
+    {
+        if (instance != null)
+        {
+            Destroy(gameObject);
+            return;
+        }
+        instance = this;
+        DontDestroyOnLoad(gameObject);
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (string.IsNullOrEmpty(PlayerPrefs.GetString("isWorkingPersonnel")))
+        {
+            PlayerPrefs.GetString("isWorkingPersonnel", "0");
+        }
+        else
+        {
+            isWorkingPersonnel = PlayerPrefs.GetString("isWorkingPersonnel");
+            if (isWorkingPersonnel.Equals("1"))
+            {
+                game.SetActive(false);
+            }
+        }
+    }
+    private void OnDestroy()
+    {
+        PlayerPrefs.SetString("isWorkingPersonnel","0");
+    }
+}

Electrical_inspectionCompetitionSystem/Assets/Script/WorkingPersonnel/WorkingPersonnel.cs.meta

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

Electrical_inspectionCompetitionSystem/Assets/Textures/切图-2/底框-2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 82ea5eb356a6ccf4689b59042739154a
+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: 0
+    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: Android
+    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/Textures/底框-2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 6bdaa1e1cf231284685da170dba13ee9
+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: 0
+    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: Android
+    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/Textures/电表屏幕/三相_有互感器_无互感器_有光伏_无光伏/总尖峰平谷17.jpg.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 51d2ad5223c8a6048a08f53f53d80f3b
+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: 0
+    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: Android
+    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/Packages/manifest.json

@@ -7,7 +7,6 @@
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.postprocessing": "3.2.2",
-    "com.unity.shadergraph": "12.1.8",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",

Electrical_inspectionCompetitionSystem/Packages/packages-lock.json

@@ -91,23 +91,6 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.render-pipelines.core": {
-      "version": "12.1.8",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      }
-    },
-    "com.unity.searcher": {
-      "version": "4.9.1",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.services.core": {
       "version": "1.6.0",
       "depth": 1,
@@ -126,15 +109,6 @@
       "dependencies": {},
       "url": "https://packages.unity.cn"
     },
-    "com.unity.shadergraph": {
-      "version": "12.1.8",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.render-pipelines.core": "12.1.8",
-        "com.unity.searcher": "4.9.1"
-      }
-    },
     "com.unity.test-framework": {
       "version": "1.1.31",
       "depth": 0,

Electrical_inspectionCompetitionSystem/ProjectSettings/DynamicsManager.asset

@@ -18,7 +18,7 @@ PhysicsManager:
   m_ClothInterCollisionDistance: 0
   m_ClothInterCollisionStiffness: 0
   m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: 7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: 7ffefffffffffffffffffffffffffffffffffffffffffffffffffffffefeffff7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 0
   m_ReuseCollisionCallbacks: 1

Electrical_inspectionCompetitionSystem/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.15f1c1
+m_EditorVersion: 2021.3.10f1c2
-m_EditorVersionWithRevision: 2021.3.15f1c1 (080beb55ecda)
+m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5)

Electrical_inspectionCompetitionSystem/ProjectSettings/ShaderGraphSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  customInterpolatorErrorThreshold: 32
+  customInterpolatorWarningThreshold: 16

Electrical_inspectionCompetitionSystem/ProjectSettings/TagManager.asset

@@ -14,6 +14,7 @@ TagManager:
   - Line
   - "\u65CB\u8F6C"
   - FuAnBiao
+  - AllTools
   layers:
   - Default
   - TransparentFX
@@ -23,7 +24,7 @@ TagManager:
   - UI
   - QianXing
   - Player
-  - 
+  - Men
   - 
   - 
   -