ronghe

2023-09-14 13:33:28 +08:00 · 2023-09-14 13:33:28 +08:00 · 033076790f
parent b8ebd27711 a29c15e24f
commit 033076790f
34 changed files with 152581 additions and 22666 deletions
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scenes/UI.unity
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/AssignmentController.cs
@ -15,10 +15,13 @@ namespace Adam
    public class AssignmentController : MonoBehaviour
    {
        public GameObject RWPanel;
+        public RectTransform rws;
        public Button loadBtn;
+        public Vector2 originPos = new Vector2();

        private void Start()
        {
+            originPos = rws.anchoredPosition;
            loadBtn.onClick.AddListener(OnLoad);
            SwitchPanel(false);
        }
@ -27,14 +30,21 @@ namespace Adam
        public void SwitchPanel(bool isActive)
        {
            RWPanel.SetActive(isActive);
+        }

+        public void ChangeRWPanelPos()
+        {
+            rws.anchoredPosition = originPos;
        }

        public void OnLoad()
        {
-            SceneLoad.Instance.SceneChange("工具间场景");
+            UIManager.Instance.bottomCotroller.SwitchPanel(true);
+            UIManager.Instance.exitBtn.gameObject.SetActive(true);
+            rws.anchoredPosition = Vector2.zero;
            loadBtn.gameObject.SetActive(false);
            SwitchPanel(false);
+            SceneLoad.Instance.SceneChange("工具间场景");
        }
    }
 }
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/BottomController.cs
@ -6,16 +6,18 @@ using UnityEngine.UI;
 //支持中文，文件使用UTF-8编码
 //@author	YangHua
 //@create	20230913
-//@company	QianHuo
+//@company	Adam
 //
 //@description:
 //============================================================
-namespace QianHuo
+namespace Adam
 {
    public class BottomController : MonoBehaviour
    {
        public Toggle[] toggles;
        public GameObject[] panels;
+        public GameObject buttomPanel;
+        public Toggle BirdEyeView;
        // Use this for initialization
        private void Start()
        {
@ -31,6 +33,14 @@ namespace QianHuo
                    panels[index].SetActive(isOn);
                });
            }
+            SwitchPanel(false);
+            //GameManager.ins.CameraManager.BtnOnClick(BirdEyeView);
+            BirdEyeView.gameObject.SetActive(false);
+        }
+
+        public void SwitchPanel(bool isActive)
+        {
+            buttomPanel.SetActive(isActive);
        }
    }
 }
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/BottomTips.cs
@ -18,6 +18,7 @@ public class BottomTips : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl
    public Text tips;
    [HideInInspector]
    public GameObject tipsContent;
+    [HideInInspector]
    public Toggle selfToggle;
    private void Start()
    {
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/PermanentToolItem.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/PermanentToolItem.cs
@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+//============================================================
+//支持中文，文件使用UTF-8编码
+//@author	YangHua
+//@create	20230914
+//@company	QianHuo
+//
+//@description:
+//============================================================
+namespace Components
+{
+    public class PermanentToolItem : MonoBehaviour
+    {
+        public Button selfBtn;
+        public GameObject panel;
+        // Use this for initialization
+        private void Start()
+        {
+            panel.SetActive(false);
+            selfBtn.onClick.AddListener(() =>
+            {
+                OnSelf();
+            });
+        }
+
+        public void OnSelf()
+        {
+            UIManager.Instance.ToolsItemManager.SwictchToolPanel(false);
+            panel.SetActive(true);
+        }
+    }
+}
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/PermanentToolItem.cs.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/PermanentToolItem.cs.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 768f4b53964d4054d8dfed1d682c5ec8
+guid: 59702d98d7f84674a943df1984332d6f
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/Components/ToolModelClick.cs
@ -63,7 +63,7 @@ public class ToolModelClick : MonoBehaviour
            Debug.Log(EventSystem.current.gameObject.name);
            return;
        }
-        ToolsItemManager.Instance.CreatToolItem(gameObject);
+        ToolsItemController.Instance.CreatToolItem(gameObject);
        Destroy(gameObject);
    }

--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/MobileTerminalController.cs
@ -18,10 +18,16 @@ using UnityEngine.UI;

 public class MobileTerminalController : MonoBehaviour
 {
-    public string userViewUrl;
-    public string tapViewUrl;
+    public string userViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=dianbianhao&bianhao= ";
+    public string tabelViewUrl = "http://111.229.30.246:10013/Handler/Taiqu.ashx?action=bianhaobiaoji&bianhao=";
    public InputField number;
+    /// <summary>
+    /// 表记数据
+    /// </summary>
    public Button outsideBtn;
+    /// <summary>
+    /// 用户数据
+    /// </summary>
    public Button electricitBtn;
    public Button backBtn;

@ -33,19 +39,25 @@ public class MobileTerminalController : MonoBehaviour
    public MobileTerminalTipsItem itemPrfab;
    [HideInInspector]
    public UserViewData mData = new UserViewData();
-    //[HideInInspector]
+    [HideInInspector]
    public TableViewData tData = new TableViewData();
    public JObject jbsx;
    public JObject jbxx;
    public List<JObject> jlzzxx = new List<JObject>();

    // Use this for initialization
-    private async void Start()
+    private void Start()
    {
-        mData = await AsyncWebReq.Get<UserViewData>(userViewUrl);
-        tData = await AsyncWebReq.Get<TableViewData>(tapViewUrl);
-
+        outsideBtn.onClick.AddListener(OnOutsideView);
+        electricitBtn.onClick.AddListener(OnElectricitView);
+        backBtn.onClick.AddListener(OnBack);
+        SwitchView(-1);
+    }

+    public async void OnUser()
+    {
+        string url = userViewUrl + number.text;
+        mData = await AsyncWebReq.Get<UserViewData>(url);
        string jsonData = JsonConvert.SerializeObject(mData);
        AsyncWebReq.SetValue(jsonData, out jbsx, out jbxx, out jlzzxx);

@ -72,31 +84,35 @@ public class MobileTerminalController : MonoBehaviour
                itemTip.SetValue(info);
            }
        }
+    }

+    public async void OnTable()
+    {
+        string url = tabelViewUrl + number.text;
+        tData = await AsyncWebReq.Get<TableViewData>(url);
        for (int i = 0; i < tData.data.Count; i++)
        {
            MobileTerminalTipsItem itemTip = Instantiate(itemPrfab, tapContent);
            itemTip.SetValue(tData.data[i]);
        }
-
-        outsideBtn.onClick.AddListener(OnOutsideView);
-        electricitBtn.onClick.AddListener(OnElectricitView);
-        backBtn.onClick.AddListener(OnBack);
-        SwitchView(-1);
    }


-
-
-
+    /// <summary>
+    /// 用户数据
+    /// </summary>
    public void OnElectricitView()
    {
        SwitchView(0);
+        OnUser();
    }
-
+    /// <summary>
+    /// 表记数据
+    /// </summary>
    public void OnOutsideView()
    {
        SwitchView(1);
+        OnTable();
    }


--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemController.cs
@ -4,14 +4,14 @@ using UnityEngine;
 using UnityEngine.UI;
 //============================================================
 //支持中文，文件使用UTF-8编码
-//@author	#AUTHOR#
-//@create	#CREATEDATE#
-//@company	#COMPANY#
+//@author	YangHua
+//@create	20230914
+//@company	QianHuo
 //
 //@description:
 //============================================================

-public class ToolsItemManager : MonoSingleton<ToolsItemManager>
+public class ToolsItemController : MonoSingleton<ToolsItemController>
 {
    public GameObject toolPanel;
    public List<ToolItem> toolItems = new List<ToolItem>();
@ -20,10 +20,10 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
    public Button closeBtn;
    private void Start()
    {
-        closeBtn.onClick.AddListener(() => { Swictch(false); });
+        closeBtn.onClick.AddListener(() => { SwictchToolPanel(false); });
    }

-    private void Swictch(bool isActive)
+    public void SwictchToolPanel(bool isActive)
    {
        toolPanel.SetActive(isActive);
    }
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemController.cs.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/ToolsItemController.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cc00741f50f6afd4587cb1b2e2b20668
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Adam/Scripts/UIManager.cs
@ -2,6 +2,7 @@ using Adam;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 //============================================================
 //支持中文，文件使用UTF-8编码
 //@author	#AUTHOR#
@ -13,15 +14,24 @@ using UnityEngine;

 public class UIManager : MonoSingleton<UIManager>
 {
-    public ToolsItemManager ToolsItemManager;
+    public ToolsItemController ToolsItemManager;
    public MobileTerminalController MobileTerminalController;
    public AssignmentController assignmentController;
-
+    public BottomController bottomCotroller;
+    public Button exitBtn;
+    public Button backToToolBtn;
    // Use this for initialization
    private void Start()
    {
+        exitBtn.onClick.AddListener(OnExit);
+        exitBtn.gameObject.SetActive(false);
+        backToToolBtn.gameObject.SetActive(false);
        DontDestroyOnLoad(this);
    }

+    public void OnExit()
+    {
+        Application.Quit();
+    }

 }
--- a/Electrical_inspectionCompetitionSystem/Assets/Art/0任务书/MapFlowManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art/0任务书/MapFlowManager.cs
@ -10,14 +10,15 @@ public class MapFlowManager : MonoBehaviour
    void Start()
    {
        //XUIPanel.ShowPanel<ExamDataPanel>("畿窟묏데푯澗");
-        Invoke("Delay",12f);
+        obj.SetActive(false);
+        Invoke("Delay", 12f);
    }
    void Delay()
    {
-      //  XUIPanel.ShowPanel<AssignmentPanel>();
+        //  XUIPanel.ShowPanel<AssignmentPanel>();
        playableDirector.Pause();
        obj.gameObject.SetActive(true);
-
+        UIManager.Instance.assignmentController.ChangeRWPanelPos();
    }
    private void Update()
    {
--- a/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/并网柜柜体_前门集合.fbx.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/并网柜柜体_前门集合.fbx.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: e5988130443eacd4680af289719aeb23
 ModelImporter:
  serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
  externalObjects:
  - first:
      type: UnityEngine:Material
--- a/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/并网柜柜体_后门集合.fbx.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/并网柜柜体_后门集合.fbx.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: ca3ae87322d659b4a9bbc188b8f02848
 ModelImporter:
  serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
  externalObjects:
  - first:
      type: UnityEngine:Material
--- a/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/计量柜柜体_后门集合.fbx.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/计量柜柜体_后门集合.fbx.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: 33d7b0c7dd7a15249a5c8ea65c997e47
 ModelImporter:
  serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
  externalObjects:
  - first:
      type: UnityEngine:Material
--- a/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/配电房_电缆沟盖板.fbx.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Art/Art_9.3/用电竞赛柜门电缆沟盖板模型提换/配电房_电缆沟盖板.fbx.meta
@ -2,7 +2,10 @@ fileFormatVersion: 2
 guid: 1e8d0871f7b20144da00917f3f74d3cc
 ModelImporter:
  serializedVersion: 21300
-  internalIDToNameTable: []
+  internalIDToNameTable:
+  - first:
+      74: 1827226128182048838
+    second: Take 001
  externalObjects: {}
  materials:
    materialImportMode: 2
--- a/Electrical_inspectionCompetitionSystem/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Plugins/ModularFirstPersonController/FirstPersonController/FirstPersonController.cs
@ -371,7 +371,7 @@ public class FirstPersonController : MonoBehaviour
        CheckGround();

        fieldView = playerCamera.fieldOfView;
-        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 8f;
+        fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
        fieldView = Mathf.Clamp(fieldView, 20, 60);
        playerCamera.fieldOfView = fieldView;

--- a/Electrical_inspectionCompetitionSystem/Assets/Prefab/Player.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Prefab/Player.prefab
@ -183,9 +183,9 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3350233854110697404}
-  m_LocalRotation: {x: -0, y: 0.66901064, z: -0, w: 0.7432529}
+  m_LocalRotation: {x: 0, y: 0.669014, z: 0, w: 0.7432499}
  m_LocalPosition: {x: 32.42, y: 1.474, z: 337.78}
-  m_LocalScale: {x: 1, y: 0.8, z: 1}
+  m_LocalScale: {x: 1, y: 0.8000001, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 3878725675878135936}
@ -278,7 +278,7 @@ MonoBehaviour:
  mouseSensitivity: 2
  maxLookAngle: 50
  lockCursor: 0
-  crosshair: 1
+  crosshair: 0
  crosshairImage: {fileID: 21300000, guid: be4ce60e2c9768c44b9b10b9c5258045, type: 3}
  crosshairColor: {r: 1, g: 1, b: 1, a: 1}
  enableZoom: 1
@ -290,7 +290,7 @@ MonoBehaviour:
  stopForce: 1
  walkSpeed: 5
  maxVelocityChange: 10
-  enableSprint: 1
+  enableSprint: 0
  unlimitedSprint: 1
  enableSprintZoom: 0
  sprintKey: 0
@ -644,10 +644,7 @@ GameObject:
  - component: {fileID: 3350233855506296104}
  - component: {fileID: 3350233855506296105}
  - component: {fileID: 1412710278296957264}
-  - component: {fileID: 7282095818597331622}
  - component: {fileID: 7105923273792966489}
-  - component: {fileID: 297991526742624335}
-  - component: {fileID: 1412710278670516487}
  - component: {fileID: 1412710278670516733}
  - component: {fileID: 4846373890045576794}
  m_Layer: 0
@ -807,19 +804,6 @@ MonoBehaviour:
    _blurSpread: 0
    _blurIntensity: 1
    _blurDirections: 2
--- !u!114 &7282095818597331622
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3350233855506296106}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f3abd6366bed4634d8ad951c4eda5116, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  hoverColor: {r: 1, g: 0, b: 0, a: 1}
 --- !u!124 &7105923273792966489
 Behaviour:
  m_ObjectHideFlags: 0
@ -828,55 +812,6 @@ Behaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3350233855506296106}
  m_Enabled: 1
--- !u!114 &297991526742624335
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3350233855506296106}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EventMask:
-    serializedVersion: 2
-    m_Bits: 1023
-  m_MaxRayIntersections: 0
--- !u!114 &1412710278670516487
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3350233855506296106}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef461167744658345a46344ed5a0c0db, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  updateEvent: 1
-  layerMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  rayLength: -1
-  onHover:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 7282095818597331622}
-        m_TargetAssemblyTypeName: HighlightingSystem.Demo.HighlighterInteractionDemo,
-          Assembly-CSharp-firstpass
-        m_MethodName: OnHover
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!114 &1412710278670516733
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab
@ -11,7 +11,7 @@ GameObject:
  - component: {fileID: 1042915213259079038}
  - component: {fileID: 1042915213259079036}
  - component: {fileID: 1042915213259079039}
-  m_Layer: 11
+  m_Layer: 0
  m_Name: Cube
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -93,7 +93,7 @@ GameObject:
  m_Component:
  - component: {fileID: 4228206943469040965}
  - component: {fileID: 4228206943469040964}
-  m_Layer: 11
+  m_Layer: 0
  m_Name: Audio Source
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -225,7 +225,7 @@ GameObject:
  - component: {fileID: 4228206944499231263}
  - component: {fileID: 6545336454578547337}
  - component: {fileID: 3220441723494787463}
-  m_Layer: 11
+  m_Layer: 0
  m_Name: "\u9A8C\u7535\u7B14"
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -399,7 +399,7 @@ GameObject:
  - component: {fileID: 4228206944798740710}
  - component: {fileID: 4228206944798740709}
  - component: {fileID: 4228206944798740708}
-  m_Layer: 11
+  m_Layer: 0
  m_Name: "\u7B14\u5934"
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -521,7 +521,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
      propertyPath: m_Layer
-      value: 11
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
      propertyPath: m_IsActive
@ -603,7 +603,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
      propertyPath: m_Layer
-      value: 11
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
      propertyPath: m_IsActive
--- a/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab.meta
--- a/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png
+++ b/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png
--- a/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png.meta
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/02_MapScene.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/02_MapScene.unity
@ -1113,7 +1113,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3896808385014992809}
-  m_RootOrder: 3
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
@ -1392,6 +1392,74 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1367307655
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1367307658}
+  - component: {fileID: 1367307657}
+  - component: {fileID: 1367307656}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1367307656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367307655}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1367307657
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367307655}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1367307658
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1367307655}
+  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: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1453251944
 GameObject:
  m_ObjectHideFlags: 0
@ -2072,347 +2140,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2129679569}
  m_CullTransparentMesh: 1
--- !u!222 &40495114356425204
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2441307748079225935}
-  m_CullTransparentMesh: 1
--- !u!1 &264846937380550309
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6531847754770110265}
-  - component: {fileID: 467825922712878735}
-  - component: {fileID: 6684204543470345897}
-  m_Layer: 5
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!222 &467825922712878735
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 264846937380550309}
-  m_CullTransparentMesh: 1
--- !u!114 &580062392597887337
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1285323917183940655}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: edca0fc2ae6cf314189e4bd639cf45eb, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!1 &669766700617993297
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8245640972432680989}
-  - component: {fileID: 4459188950332457817}
-  - component: {fileID: 7485176376493527017}
-  - component: {fileID: 8245640972432680990}
-  m_Layer: 5
-  m_Name: magBtn
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &689819641852632246
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2441307748079225935}
-  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: 3896808385014992809}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 129, y: -369}
-  m_SizeDelta: {x: 206, y: 52}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &783179824089474350
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2441307748079225935}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 24
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: 
--- !u!1 &1285323917183940655
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8503746945508930936}
-  - component: {fileID: 8386231987470631845}
-  - component: {fileID: 580062392597887337}
-  m_Layer: 5
-  m_Name: bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!114 &1464913868116621290
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9029326305111261340}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.39607844, g: 0.972549, b: 0.9764706, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 25
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1.8
-  m_Text: "\u5DE5\u5355\u5185\u5BB9\uFF1A\u60A8\u4ECA\u5929\u5DE5\u4F5C\u4EFB\u52A1\u662F\u5BF910kV\u5B9E\u8BAD1\u7EBF9#\u6746\u654F\u77E5\uFF08\u6839\u636E\u51FA\u9898\u9009\u62E9\u53F0\u533A\uFF0C\u654F\u77E5\u3001\u654F\u6167\u3001\u654F\u884C\u3001\u654F\u5B66\u3001\u6BD3\u79C0\uFF091#\u914D\u53D8411\u4E1C\u7EBF\u8FDB\u884C\u8BA1\u5212\u5DE1\u89C6\u3002\u8BF7\u53CA\u65F6\u7EC4\u7EC7\u4EBA\u5458\u3001\u5907\u9F50\u5DE5\u5668\u5177\u5230\u73B0\u573A\u5DE1\u89C6\u3002\u67E5\u627E\u51FA\u7684\u6545\u969C\u7F3A\u9677\uFF0C\u8FDB\u884C\u76F8\u5173\u5904\u7406\u3002\r\n\u5907\u6CE8\uFF1A\u5DE1\u89C6\u5DE5\u4F5C\u5DE5\u4F5C\u7968\u9ED8\u8BA4\u5DF2\u5F00\u597D\u5E76\u8BB8\u53EF\u3001\u5DE5\u4F5C\u8FC7\u7A0B\u4E2D\u6240\u9700\u63A5\u5730\u7EBF\u5DF2\u88C5\u8BBE\u3002"
--- !u!224 &1550143346451741042
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5090827398298492658}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.49219194, y: 0.47440186, z: 0.47440186}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7550337382994350724}
-  - {fileID: 9032816339889289429}
-  m_Father: {fileID: 3896808385014992809}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 14, y: -0.00018310547}
-  m_SizeDelta: {x: 1980.9, y: 1196.6}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1946602691223842720
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7550337382994350724}
-  - component: {fileID: 3830487832359969024}
-  - component: {fileID: 3569835438019945444}
-  m_Layer: 5
-  m_Name: RWText2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!1 &2441307748079225935
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 689819641852632246}
-  - component: {fileID: 40495114356425204}
-  - component: {fileID: 783179824089474350}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!1 &3272317243322115356
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6854616751598957721}
-  - component: {fileID: 4323092506911143061}
-  - component: {fileID: 3879668429248268919}
-  m_Layer: 5
-  m_Name: bg2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!114 &3569835438019945444
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1946602691223842720}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.78039217}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 949e126217638b34cb2d60202806aa32, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &3678484447050587329
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5256109648177090218}
-  m_CullTransparentMesh: 1
--- !u!222 &3830487832359969024
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1946602691223842720}
-  m_CullTransparentMesh: 1
--- !u!114 &3879668429248268919
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3272317243322115356}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: d11680c8118eaf74fb4731e262f8d854, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3896808385014992808
 GameObject:
  m_ObjectHideFlags: 0
@ -2442,12 +2169,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 8245640972432680989}
-  - {fileID: 8503746945508930936}
-  - {fileID: 6854616751598957721}
  - {fileID: 1042248687}
-  - {fileID: 1550143346451741042}
-  - {fileID: 689819641852632246}
  m_Father: {fileID: 1453251948}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2513,325 +2235,6 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 4f676a6bb0280f142a7b2a98379b8fc7, type: 3}
--- !u!222 &4323092506911143061
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3272317243322115356}
-  m_CullTransparentMesh: 1
--- !u!222 &4459188950332457817
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 669766700617993297}
-  m_CullTransparentMesh: 1
--- !u!114 &4865361059705582055
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5256109648177090218}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c74359159937aa949b852f62af711ac5, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &5005876475590466204
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5090827398298492658}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.19607843}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!1 &5090827398298492658
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1550143346451741042}
-  - component: {fileID: 8409965097830473489}
-  - component: {fileID: 5005876475590466204}
-  m_Layer: 5
-  m_Name: RWText
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!1 &5256109648177090218
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 9032816339889289429}
-  - component: {fileID: 3678484447050587329}
-  - component: {fileID: 4865361059705582055}
-  - component: {fileID: 7502760747128527674}
-  m_Layer: 5
-  m_Name: QUButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!222 &6050573552887945181
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9029326305111261340}
-  m_CullTransparentMesh: 1
--- !u!224 &6346542558084323096
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9029326305111261340}
-  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: 7550337382994350724}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 2.5903, y: -3.2845}
-  m_SizeDelta: {x: 1024.8, y: 552.1545}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &6531847754770110265
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 264846937380550309}
-  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: 7550337382994350724}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -14, y: 367}
-  m_SizeDelta: {x: 1087, y: 122}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6684204543470345897
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 264846937380550309}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e5b8a0aa0e860804fbfdf8997503823d, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!224 &6854616751598957721
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3272317243322115356}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.45, y: 0.45, z: 0.45}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3896808385014992809}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 30, y: 2}
-  m_SizeDelta: {x: 750, y: 1730}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7485176376493527017
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 669766700617993297}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 51d99fc0623f8d442b904494f45946cd, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!114 &7502760747128527674
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5256109648177090218}
-  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: 4865361059705582055}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!224 &7550337382994350724
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1946602691223842720}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.0317278, y: 2.1079175, z: 2.1079175}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6531847754770110265}
-  - {fileID: 6346542558084323096}
-  m_Father: {fileID: 1550143346451741042}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -416.50165, y: -65.345}
-  m_SizeDelta: {x: 1059, y: 585}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7650852213641946357
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9029326305111261340}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 41a6ccb45404ead45a8ec03025263a84, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &7854355846015354935
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2897,142 +2300,3 @@ PrefabInstance:
      objectReference: {fileID: 1593461259}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 10ddc8412fef8dc44b3b6c9230595e09, type: 3}
--- !u!224 &8245640972432680989
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 669766700617993297}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3896808385014992809}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &8245640972432680990
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 669766700617993297}
-  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: 7485176376493527017}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
--- !u!222 &8386231987470631845
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1285323917183940655}
-  m_CullTransparentMesh: 1
--- !u!222 &8409965097830473489
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5090827398298492658}
-  m_CullTransparentMesh: 1
--- !u!224 &8503746945508930936
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1285323917183940655}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3896808385014992809}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9029326305111261340
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6346542558084323096}
-  - component: {fileID: 6050573552887945181}
-  - component: {fileID: 1464913868116621290}
-  - component: {fileID: 7650852213641946357}
-  m_Layer: 5
-  m_Name: Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!224 &9032816339889289429
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5256109648177090218}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2.0317278, y: 2.1079175, z: 2.1079175}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1550143346451741042}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -377.90143, y: -777.82117}
-  m_SizeDelta: {x: 206, y: 52}
-  m_Pivot: {x: 0.5, y: 0.5}
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/农家乐.unity
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f7bb2142ac546aa4090fd94b023d7894
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs
@ -0,0 +1,48 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Unity.VisualScripting;
+using UnityEngine;
+
+public class GameManager : MonoBehaviour
+{
+    public static GameManager ins;
+    public CameraManager CameraManager;
+    List<GameObject> tools;
+    [SerializeField] GameObject g1;
+    char[] g2 = new char[7] {'(','C','l','o','n','e',')' };
+    public void Awake()
+    {
+        if (ins!=null)
+        {
+            Destroy(ins);
+            return;
+        }
+        ins = this;
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        ToolsShow(g1);
+    }
+    /// <summary>
+    /// ¹¤¾ßÉú³É·½·¨
+    /// </summary>
+    public void ToolsShow(GameObject tools)
+    {
+        GameObject temp = Instantiate(tools);
+        string name = Filter(temp.name,g2);
+        Debug.Log(name);
+        switch (temp.name)
+        {
+            default:
+                break;
+        }
+    }
+
+    public string Filter(string str, char[] charsToRemove)
+    {
+        return String.Concat(str.Split(charsToRemove.ToArray()));
+    }
+}
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/GameManager/GameManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 72a1134478d9f7647812f295f1989d7d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/KDLCamera/CameraManager.cs
@ -7,18 +7,20 @@ using TMPro;
 public class CameraManager : MonoBehaviour
 {
    [SerializeField] Button Btn;
-    Transform trans;
+    [SerializeField]Transform trans;
    [SerializeField] Vector3 tempPos;
    Quaternion RotePos;
    TextMeshProUGUI text;
-    int sum = 2;//点击的数量
-    // Start is called before the first frame update
-    private void Start()
+    /// <summary>
+    /// 调用俯瞰赋值
+    /// </summary>
+    /// <param name="to"></param>
+    public void BtnOnClick(Toggle to)
    {
        text = Btn.GetComponentInChildren<TextMeshProUGUI>();
-        Btn.onClick.AddListener(() =>
+        to.onValueChanged.AddListener((x) =>
        {
-            if (sum%2==0)
+            if (x)
            {
                OverLook();
                text.text = "屎械篇夕";
@ -28,9 +30,7 @@ public class CameraManager : MonoBehaviour
                ReturnLook();
                text.text = "県遨夕";
            }
-            sum++;
        });
-        trans = GameObject.Find("overlook").transform;
        tempPos = transform.position;
        RotePos = transform.rotation;
    }
--- a/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs
+++ b/Electrical_inspectionCompetitionSystem/Assets/Script/Playercontrol/door_control.cs
@ -16,16 +16,11 @@ public class door_control : MonoBehaviour
    // Start is called before the first frame update
    void Start()
    {
-        EventTriggerListener.Get(transform.gameObject).onClick_Data += Onclick;
+        //EventTriggerListener.Get(transform.gameObject).onClick_Data += Onclick;
    }
-    void Onclick(GameObject go,PointerEventData e) {
-        //if (验电笔.activeSelf == true)
-        //    return;
-        if(e.button != (PointerEventData.InputButton)mouseButton)
-            return;
-
-
-       // 是否开门 = !是否开门;
+    private void OnMouseDown()
+    {
+        // 是否开门 = !是否开门;
        if (启用交互 == true)
        {//sssssssss
            是否开门 = !是否开门;
@ -44,14 +39,5 @@ public class door_control : MonoBehaviour

            }
        }
-        return;
-
-
-
-    }
-    // Update is called once per frame
-    void Update()
-    {
-        
    }
 }
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/Close.png
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/Close.png
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/Close.png.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/Close.png.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 853a6d15ff282ea48bf84fa6bb9c1d7a
+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: 
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/mobile.jpg
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/mobile.jpg
--- a/Electrical_inspectionCompetitionSystem/Assets/Textures/mobile.jpg.meta
+++ b/Electrical_inspectionCompetitionSystem/Assets/Textures/mobile.jpg.meta
@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 957a139682b782b49ac790ca8336e9d0
+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: