diff --git a/SXElectricalInspection/Assets/Adam/Scripts/GoToSceneController.cs b/SXElectricalInspection/Assets/Adam/Scripts/GoToSceneController.cs
index 19b45753..b28811d4 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/GoToSceneController.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/GoToSceneController.cs
@@ -35,6 +35,8 @@ namespace Adam
                 UIManager.Instance.toolsItemManager.recoverBtn.onClick?.Invoke();
             }
             UIManager.Instance.bottomCotroller.BirdEyeView.isOn = false;
+            UIManager.Instance.bottomCotroller.updownLadder.isOn = false;
+            UIManager.Instance.bottomCotroller.updownLadder.gameObject.SetActive(false);
             SceneLoad.Instance.isOnece = true;
             SceneLoad.Instance.MaskLoadInfoPanel();
             //ExamusersController.Instance.Init();
diff --git a/SXElectricalInspection/Assets/Adam/Scripts/LoginController.cs b/SXElectricalInspection/Assets/Adam/Scripts/LoginController.cs
index 15d78161..675569a3 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/LoginController.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/LoginController.cs
@@ -59,11 +59,12 @@ public class LoginController : MonoBehaviour
         string[] tempInfo = info.Split("//;");
         string[] currentModelInfo = tempInfo[1].Split(";");
         GlobalFlag.systemUserId = currentModelInfo[2];
-        GlobalFlag.userName = currentModelInfo[3];
-        //foreach (var item in currentModelInfo)
-        //{
-        //    Debug.Log(item);
-        //}
+        GlobalFlag.userName = currentModelInfo[2];
+        UIManager.Instance.time.SetTime(int.Parse(currentModelInfo[4]));
+        foreach (var item in currentModelInfo)
+        {
+            Debug.Log(item);
+        }
     }
 
     public void OnLogin()
diff --git a/SXElectricalInspection/Assets/Adam/Scripts/ToolsItemManager.cs b/SXElectricalInspection/Assets/Adam/Scripts/ToolsItemManager.cs
index cdd2b3a5..8eb0a7d7 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/ToolsItemManager.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/ToolsItemManager.cs
@@ -121,7 +121,13 @@ public class ToolsItemManager : MonoSingleton<ToolsItemManager>
     public void RecoverCurrentInstantiateTool(GameObject tool)
     {
         if (tool != null)
+        {
+            if (tool.name == "工作证(Clone)")
+            {
+                GameManager.Instance.npcwayPoints.StartMove();
+            }
             Destroy(tool);
+        }
         bottomToolToggle.interactable = true;
         recoverBtn.gameObject.SetActive(false);
     }
diff --git a/SXElectricalInspection/Assets/Adam/Scripts/UIManager.cs b/SXElectricalInspection/Assets/Adam/Scripts/UIManager.cs
index 05b75a6c..c41ec24d 100644
--- a/SXElectricalInspection/Assets/Adam/Scripts/UIManager.cs
+++ b/SXElectricalInspection/Assets/Adam/Scripts/UIManager.cs
@@ -42,6 +42,7 @@ public class UIManager : MonoSingleton<UIManager>
         string json = FileUtil.ReadFromLocal("Message.json");
         messageData = JsonConvert.DeserializeObject<MessageData>(json);
         ExamusersController.Instance.Init();
+
     }
     // Use this for initialization
     private void Start()
diff --git a/SXElectricalInspection/Assets/GameAssets/Prefebs/NPC.prefab b/SXElectricalInspection/Assets/GameAssets/Prefebs/NPC.prefab
index 65039e72..f64fdc23 100644
--- a/SXElectricalInspection/Assets/GameAssets/Prefebs/NPC.prefab
+++ b/SXElectricalInspection/Assets/GameAssets/Prefebs/NPC.prefab
@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 1530819393981207668}
   m_Layer: 0
   m_Name: NPC
-  m_TagString: Untagged
+  m_TagString: NPC
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -71,7 +71,6 @@ MonoBehaviour:
   isMove: 0
   isOnce: 0
   isLooked: 1
-  customTip: {fileID: 0}
 --- !u!1 &1873490784713911015
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/SXElectricalInspection/Assets/GameAssets/Prefebs/OnCanvas.prefab b/SXElectricalInspection/Assets/GameAssets/Prefebs/OnCanvas.prefab
index 47637538..916e68c5 100644
--- a/SXElectricalInspection/Assets/GameAssets/Prefebs/OnCanvas.prefab
+++ b/SXElectricalInspection/Assets/GameAssets/Prefebs/OnCanvas.prefab
@@ -14,12 +14,12 @@ GameObject:
   - component: {fileID: 8978250623430911335}
   - component: {fileID: 8978250623430911352}
   m_Layer: 5
-  m_Name: Button
+  m_Name: "\u6536\u56DE"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8978250623430911332
 RectTransform:
   m_ObjectHideFlags: 0
diff --git a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs
index b39b05c5..5ee6d0aa 100644
--- a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs
+++ b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs
@@ -14,30 +14,33 @@ public class Multimeter : MonoBehaviour
     public bool isBlack;
     public string VV;
     public bool isok = false;
+    public GameObject huishouBtn;
 
     public void Init()
     {
         activation = ClampAmmetersManager.Instance.Init(name);
+        huishouBtn = GameManager.Instance.MultimeterIm.gameObject;
+        huishouBtn.SetActive(false);
     }
 
     private void OnMouseDown()
     {
         if (GameManager.Instance.BlackWanYon != null && isBlack)
         {
+            huishouBtn.SetActive(true);
             GameManager.Instance.BlackWanYon.transform.parent = transform;
             GameManager.Instance.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.Instance.BlackWanYon.transform.DOScale(new Vector3(200, 200, 200), 0.25f);
             GameManager.Instance.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
             GameManager.Instance.BlackWanYon.layer = 0;
-            GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
             UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(false);
             GameManager.Instance.redok = true;
+            GameManager.Instance.DianFuIm.gameObject.SetActive(true);
             if (GameManager.Instance.redok)
             {
                 if (GameManager.Instance.WanStopValve.currentValue >= 2)
                 {
-                    GameManager.Instance.DianFuIm.gameObject.SetActive(true);
-                    GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
+                    huishouBtn.SetActive(true);
                     GameManager.Instance.show(GameManager.Instance.redData + VV);
                 }
                 else
@@ -48,20 +51,21 @@ public class Multimeter : MonoBehaviour
         }
         if (GameManager.Instance.RedWanYon != null && !isBlack)
         {
+            huishouBtn.SetActive(true);
             GameManager.Instance.RedWanYon.transform.parent = transform;
             GameManager.Instance.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
             GameManager.Instance.RedWanYon.transform.DOScale(new Vector3(200, 200, 200), 0.25f);
             GameManager.Instance.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f, 0.08f, 0.11f), 0.25f);
             GameManager.Instance.RedWanYon.layer = 0;
             UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(false);
+            GameManager.Instance.DianFuIm.gameObject.SetActive(true);
             if (GameManager.Instance.redok)
             {
                 if (GameManager.Instance.WanStopValve.currentValue >= 2)
                 {
-                    GameManager.Instance.DianFuIm.gameObject.SetActive(true);
                     GameManager.Instance.DianFuTex.text = activation;
 
-                    GameManager.Instance.MultimeterIm.gameObject.SetActive(true);
+                    huishouBtn.SetActive(true);
                     GameManager.Instance.show(activation + VV);
                 }
                 else
diff --git a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs
index 1d13240a..97cfcd82 100644
--- a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs
+++ b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs
@@ -18,14 +18,13 @@ public class MultimeterRecovery : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-
         btn = GetComponent<Button>();
         btn.onClick.AddListener(() =>
         {
             //GameManager.Instance.DianFuIm.gameObject.SetActive(true);
             //GameManager.Instance.DianFuTex.text = Multimeter + MultimeterV;
             trans = GameManager.Instance.temp.transform;
-            if (GameManager.Instance.RedWanYon)
+            if (GameManager.Instance.RedWanYon!=null&& GameManager.Instance.RedWanYon)
             {
                 RedTrans = GameManager.Instance.RedWanYon.transform;
                 RedTrans.parent = trans;
@@ -35,7 +34,7 @@ public class MultimeterRecovery : MonoBehaviour
                 RedTrans.transform.DOLocalMove(Redpos, 0.25f);
                 RedTrans.gameObject.layer = 7;
             }
-            if (GameManager.Instance.BlackWanYon)
+            if (GameManager.Instance.BlackWanYon != null && GameManager.Instance.BlackWanYon)
             {
                 BlackTrans = GameManager.Instance.BlackWanYon.transform;
                 BlackTrans.parent = trans;
@@ -49,6 +48,6 @@ public class MultimeterRecovery : MonoBehaviour
             GameManager.Instance.show("0");
             UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
         });
-        btn.gameObject.SetActive(false);
+        //btn.gameObject.SetActive(false);
     }
 }
diff --git a/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs b/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs
index 7e9e5b6d..61208bd7 100644
--- a/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs
+++ b/SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs
@@ -54,6 +54,7 @@ public class GameManager : MonoBehaviour
     public LadderCtr ladderCtr;
     private Vector3 lastPlayerPos = new Vector3();
     private Vector3 lastPlayereugle = new Vector3();
+    public NPCWaypoints npcwayPoints;
     public void Awake()
     {
         if (Instance != null)
@@ -68,6 +69,7 @@ public class GameManager : MonoBehaviour
         {
             //init();
         }
+        npcwayPoints = GameObject.FindGameObjectWithTag("NPC").GetComponent<NPCWaypoints>();
     }
     // Start is called before the first frame update
     private void Start()
diff --git a/SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs b/SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs
index a742a2e7..e1759ec4 100644
--- a/SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs
+++ b/SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs
@@ -34,7 +34,7 @@ public class BoxPengZhuang : MonoBehaviour
             {
                 g1.gameObject.SetActive(true);
                 g1.init(dialogue);
-                gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
+                //gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
                 gameObject.SetActive(false);
                 //if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
                 //{
diff --git a/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计用户.unity b/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计.unity
similarity index 99%
rename from SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计用户.unity
rename to SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计.unity
index e64a1714..efaa6aeb 100644
--- a/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计用户.unity
+++ b/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计.unity
@@ -2168,6 +2168,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 145989168365683697, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 145989168690554921, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_BA2"
@@ -2184,6 +2188,18 @@ PrefabInstance:
       propertyPath: selChildName
       value: "\u7528\u7535_BA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 145989169426372346, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989169541319115, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989170052383509, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 145989170102714932, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_AA2"
@@ -2252,10 +2268,34 @@ PrefabInstance:
       propertyPath: m_StaticEditorFlags
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6897479074467956357, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
     - target: {fileID: 7058093995138870524, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_AA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 7152164904769191792, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7567031269211186467, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7687811932894201751, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8756267885969503407, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
     - target: {fileID: 9223058999395023169, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_CA2"
diff --git a/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计用户.unity.meta b/SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计.unity.meta
similarity index 100%
rename from SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计用户.unity.meta
rename to SXElectricalInspection/Assets/Scenes/室内型高供低计/室内型高供低计.unity.meta
diff --git a/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity b/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity
index d482fda2..ba56f2d5 100644
--- a/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity
+++ b/SXElectricalInspection/Assets/Scenes/室内型高供高计/室内型高供高计.unity
@@ -3636,6 +3636,38 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 145989168365683697, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989168690554921, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989169241954026, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989169252765999, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989169426372346, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989169541319115, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989170052383509, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 145989170102714932, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 3298272072167696729, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
       propertyPath: m_Name
       value: "\u914D\u7535\u623F"
@@ -3684,6 +3716,38 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6897479074467956357, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7058093995138870524, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7152164904769191792, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7567031269211186467, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7687811932894201751, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8149241991452967759, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8756267885969503407, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 9223058999395023169, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: cab6945acdf0f7f4f90d17aa35568392, type: 3}
 --- !u!20 &1020671387576034506 stripped
@@ -3732,7 +3796,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.19
+      value: -0.25
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.z
diff --git a/SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/室外型低压公配变.unity b/SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/室外型低压公配变.unity
index 29f091eb..e1ed6260 100644
--- a/SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/室外型低压公配变.unity
+++ b/SXElectricalInspection/Assets/Scenes/室外型低压公配变用户/室外型低压公配变.unity
@@ -866,90 +866,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3134614379211091591, guid: 58ec5acc8fa9acf46bdfc5044a0ba38e, type: 3}
   m_PrefabInstance: {fileID: 13045365}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &13201879
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 13201880}
-  - component: {fileID: 13201882}
-  - component: {fileID: 13201881}
-  m_Layer: 0
-  m_Name: CrosshairAndStamina
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &13201880
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 13201879}
-  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:
-  - {fileID: 138985442}
-  - {fileID: 264494912}
-  m_Father: {fileID: 70695017}
-  m_RootOrder: 0
-  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 &13201881
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 13201879}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 1080, y: 720}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &13201882
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 13201879}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 70695011}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 100
-  m_TargetDisplay: 0
 --- !u!1001 &16705142
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2001,82 +1917,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 24841190}
   m_Mesh: {fileID: -705494652468558242, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &26393547
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 26393548}
-  - component: {fileID: 26393550}
-  - component: {fileID: 26393549}
-  m_Layer: 0
-  m_Name: StaminaBG
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &26393548
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 26393547}
-  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: 264494912}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 3, y: -182.99066}
-  m_SizeDelta: {x: 300, y: 10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &26393549
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 26393547}
-  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: 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: 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!222 &26393550
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 26393547}
-  m_CullTransparentMesh: 0
 --- !u!1 &27748674
 GameObject:
   m_ObjectHideFlags: 0
@@ -3916,6 +3756,89 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 400000, guid: 5867990de5f59415ebd61940a40606b9, type: 3}
   m_PrefabInstance: {fileID: 56941008}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &57346094
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4730729749707939078, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_Name
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -8.338
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.891
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 346.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.054675154
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.9985042
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 173.732
+      objectReference: {fileID: 0}
+    - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+--- !u!1 &57346095 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4730729749707939078, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+  m_PrefabInstance: {fileID: 57346094}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &57346096 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4730729749707939084, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+  m_PrefabInstance: {fileID: 57346094}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 57346095}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d90ba6530d9bfda47abb4610956b2f44, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &57346097 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+  m_PrefabInstance: {fileID: 57346094}
+  m_PrefabAsset: {fileID: 0}
+--- !u!20 &57346098 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 6488708668114574007, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
+  m_PrefabInstance: {fileID: 57346094}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &59428975
 GameObject:
   m_ObjectHideFlags: 0
@@ -4591,260 +4514,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 69821958}
   m_Mesh: {fileID: 6990637993052443143, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &70695010
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 70695017}
-  - component: {fileID: 70695011}
-  - component: {fileID: 70695016}
-  - component: {fileID: 70695015}
-  - component: {fileID: 70695014}
-  - component: {fileID: 70695013}
-  - component: {fileID: 70695012}
-  m_Layer: 0
-  m_Name: PlayerCamera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!20 &70695011
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.01
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 1
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 95
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 0
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!114 &70695012
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fea919cafdda7614487598845e801edb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  SCShader: {fileID: 4800000, guid: a2e9a144ba3d622499bd85da26b4e9fe, type: 3}
-  Size: 10
---- !u!114 &70695013
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  volumeTrigger: {fileID: 70695017}
-  volumeLayer:
-    serializedVersion: 2
-    m_Bits: 8
-  stopNaNPropagation: 1
-  finalBlitToCameraTarget: 0
-  antialiasingMode: 2
-  temporalAntialiasing:
-    jitterSpread: 0.75
-    sharpness: 0.25
-    stationaryBlending: 0.95
-    motionBlending: 0.85
-  subpixelMorphologicalAntialiasing:
-    quality: 2
-  fastApproximateAntialiasing:
-    fastMode: 0
-    keepAlpha: 0
-  fog:
-    enabled: 1
-    excludeSkybox: 1
-  debugLayer:
-    lightMeter:
-      width: 512
-      height: 256
-      showCurves: 1
-    histogram:
-      width: 512
-      height: 256
-      channel: 3
-    waveform:
-      exposure: 0.12
-      height: 256
-    vectorscope:
-      size: 256
-      exposure: 0.12
-    overlaySettings:
-      linearDepth: 0
-      motionColorIntensity: 4
-      motionGridSize: 64
-      colorBlindnessType: 0
-      colorBlindnessStrength: 1
-  m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 0
-  m_ShowCustomSorter: 1
-  breakBeforeColorGrading: 0
-  m_BeforeTransparentBundles: []
-  m_BeforeStackBundles: []
-  m_AfterStackBundles: []
---- !u!124 &70695014
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 1
---- !u!114 &70695015
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _fillAlpha: 0
-  _downsampleFactor: 4
-  _iterations: 2
-  _blurMinSpread: 0.65
-  _blurSpread: 0.25
-  _blurIntensity: 0.3
-  _blurDirections: 0
-  _blitter: {fileID: 0}
-  _antiAliasing: 0
-  _presets:
-  - _name: Default
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Wide
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 4
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Strong
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.5
-    _blurSpread: 0.15
-    _blurIntensity: 0.325
-    _blurDirections: 0
-  - _name: Speed
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 1
-    _blurMinSpread: 0.75
-    _blurSpread: 0
-    _blurIntensity: 0.35
-    _blurDirections: 0
-  - _name: Quality
-    _fillAlpha: 0
-    _downsampleFactor: 2
-    _iterations: 3
-    _blurMinSpread: 0.5
-    _blurSpread: 0.5
-    _blurIntensity: 0.28
-    _blurDirections: 0
-  - _name: Solid 1px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 1
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
-  - _name: Solid 2px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 2
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
---- !u!81 &70695016
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_Enabled: 1
---- !u!4 &70695017
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70695010}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.123}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 13201880}
-  - {fileID: 304264652}
-  - {fileID: 683983726}
-  - {fileID: 946645815}
-  - {fileID: 153675738}
-  - {fileID: 1004550018}
-  m_Father: {fileID: 314597122}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &71610064
 GameObject:
   m_ObjectHideFlags: 0
@@ -6177,89 +5846,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 94709772}
   m_Mesh: {fileID: 8183674929095204631, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &96125292
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 96125293}
-  - component: {fileID: 96125295}
-  - component: {fileID: 96125294}
-  m_Layer: 0
-  m_Name: Sphere
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &96125293
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 96125292}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 57.3, z: 0}
-  m_LocalScale: {x: 2.2007926, y: -0.015401587, z: 2.2007926}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 626193697}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &96125294
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 96125292}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 9221b1c63c93a1142a27ea79ce1ca09c, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &96125295
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 96125292}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &99084142
 GameObject:
   m_ObjectHideFlags: 0
@@ -8198,82 +7784,6 @@ Transform:
   m_Father: {fileID: 1530814524}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &138985441
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 138985442}
-  - component: {fileID: 138985444}
-  - component: {fileID: 138985443}
-  m_Layer: 0
-  m_Name: Reticle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &138985442
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 138985441}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 13201880}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 50, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &138985443
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 138985441}
-  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: 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!222 &138985444
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 138985441}
-  m_CullTransparentMesh: 0
 --- !u!1 &139334498
 GameObject:
   m_ObjectHideFlags: 0
@@ -9164,37 +8674,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 151606612}
   m_Mesh: {fileID: 7955876423500996096, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &153675737
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 153675738}
-  m_Layer: 0
-  m_Name: Localwatch
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &153675738
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 153675737}
-  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 0.035, y: 0, z: 1.054}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 70695017}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &153810086
 GameObject:
   m_ObjectHideFlags: 0
@@ -13270,7 +12749,7 @@ Transform:
   - {fileID: 1752107305}
   - {fileID: 1449686961}
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &259519081
 GameObject:
@@ -13783,57 +13262,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 263460395}
   m_Mesh: {fileID: -6497778524777914650, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &264494911
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 264494912}
-  - component: {fileID: 264494913}
-  m_Layer: 0
-  m_Name: SprintBar
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &264494912
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 264494911}
-  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:
-  - {fileID: 26393548}
-  - {fileID: 1559924346}
-  m_Father: {fileID: 13201880}
-  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: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!225 &264494913
-CanvasGroup:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 264494911}
-  m_Enabled: 1
-  m_Alpha: 1
-  m_Interactable: 1
-  m_BlocksRaycasts: 1
-  m_IgnoreParentGroups: 0
 --- !u!1001 &265925230
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -15425,102 +14853,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 303429969}
   m_Mesh: {fileID: -547980126899626790, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &304264651
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 304264652}
-  - component: {fileID: 304264654}
-  - component: {fileID: 304264653}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &304264652
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 304264651}
-  m_LocalRotation: {x: -0, y: -0, z: -0.0000000018626451, w: 1}
-  m_LocalPosition: {x: 0, y: -0.00000011920929, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 70695017}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &304264653
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 304264651}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 38fa8b9aa481f4b499be7c33ac6bef15, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  type: 0
-  threshold: 0.5
-  hotIntensity: 4
-  coldIntensity: 5
-  coldColor: {r: 0.20392157, g: 0, b: 0.8235294, a: 1}
-  midColor: {r: 0.16470589, g: 0, b: 0.6784314, a: 1}
-  hotColor: {r: 0.42352942, g: 0.16862746, b: 0.41568628, a: 1}
-  typeColorValue: {r: 0.13333334, g: 0.2, b: 0.6, a: 1}
---- !u!20 &304264654
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 304264651}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 2
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.01
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4095
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 8400000, guid: 7c20447d4d681ac42bb70616ecf92818, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &304492715
 GameObject:
   m_ObjectHideFlags: 0
@@ -15994,38 +15326,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 313639146}
   m_Mesh: {fileID: 3394191257018411529, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &314597121
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 314597122}
-  m_Layer: 0
-  m_Name: Joint
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &314597122
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 314597121}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.75, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 70695017}
-  m_Father: {fileID: 626193697}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &314913759
 GameObject:
   m_ObjectHideFlags: 0
@@ -17331,81 +16631,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 344713381}
   m_Mesh: {fileID: -7277191554988898878, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &345104102
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 345104103}
-  - component: {fileID: 345104104}
-  m_Layer: 0
-  m_Name: mapCamera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &345104103
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 345104102}
-  m_LocalRotation: {x: 0.7062015, y: 0.035770085, z: -0.035770085, w: 0.7062015}
-  m_LocalPosition: {x: -1, y: 110.2, z: 0.4}
-  m_LocalScale: {x: 1, y: 1, z: 1.25}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 626193697}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: -5.799}
---- !u!20 &345104104
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 345104102}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 3
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 100
-  field of view: 60
-  orthographic: 1
-  orthographic size: 18.67583
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 2147483647
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 8400000, guid: d700b26cd5499064fb24562a9af02546, type: 2}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &345695365
 GameObject:
   m_ObjectHideFlags: 0
@@ -25914,7 +25139,7 @@ Transform:
   - {fileID: 657686677}
   - {fileID: 2025001678}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &489600455
 GameObject:
@@ -30538,6 +29763,17 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 580757444}
   m_Mesh: {fileID: -7976988083008274938, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
+--- !u!114 &581992823 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 3494590144457629244, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+  m_PrefabInstance: {fileID: 1914722633}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 869b6fed6d9e4c949bc62d4e2f10ac2d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &582691754
 GameObject:
   m_ObjectHideFlags: 0
@@ -32807,221 +32043,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 625958972}
   m_Mesh: {fileID: -1260187282764463340, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &626193689
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 626193697}
-  - component: {fileID: 626193696}
-  - component: {fileID: 626193695}
-  - component: {fileID: 626193694}
-  - component: {fileID: 626193693}
-  - component: {fileID: 626193692}
-  - component: {fileID: 626193691}
-  - component: {fileID: 626193690}
-  m_Layer: 0
-  m_Name: Player (1)
-  m_TagString: Player
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &626193690
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 03962d1a310647749949f007b0d3edb7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  playerCamera: {fileID: 70695011}
---- !u!54 &626193691
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 112
-  m_CollisionDetection: 0
---- !u!95 &626193692
-Animator:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 70998b1698ee4ac40871505728a441d6, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &626193693
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d90ba6530d9bfda47abb4610956b2f44, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rb: {fileID: 0}
-  playerCamera: {fileID: 70695011}
-  fov: 60
-  invertCamera: 0
-  cameraCanMove: 1
-  mouseSensitivity: 2
-  maxLookAngle: 50
-  lockCursor: 0
-  crosshair: 0
-  crosshairImage: {fileID: 21300000, guid: be4ce60e2c9768c44b9b10b9c5258045, type: 3}
-  crosshairColor: {r: 1, g: 1, b: 1, a: 1}
-  yaw: 0
-  pitch: 0
-  enableZoom: 0
-  holdToZoom: 1
-  zoomKey: 114
-  zoomFOV: 20
-  zoomStepTime: 5
-  playerCanMove: 1
-  stopForce: 1
-  walkSpeed: 5
-  maxVelocityChange: 10
-  enableSprint: 0
-  unlimitedSprint: 1
-  enableSprintZoom: 0
-  sprintKey: 0
-  sprintSpeed: 7
-  sprintDuration: 5
-  sprintCooldown: 0.5
-  sprintFOV: 80
-  sprintFOVStepTime: 10
-  useSprintBar: 1
-  hideBarWhenFull: 1
-  sprintBarBG: {fileID: 26393549}
-  sprintBar: {fileID: 1559924347}
-  sprintBarWidthPercent: 0.3
-  sprintBarHeightPercent: 0.02
-  enableJump: 0
-  jumpKey: 32
-  jumpPower: 5
-  enableCrouch: 0
-  holdToCrouch: 1
-  crouchKey: 306
-  speedReduction: 0.5
-  isCrouched: 0
-  enableHeadBob: 0
-  joint: {fileID: 314597122}
-  bobSpeed: 10
-  bobAmount: {x: 0, y: 0.1, z: 0}
---- !u!136 &626193694
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.3
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &626193695
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  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!33 &626193696
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &626193697
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 626193689}
-  m_LocalRotation: {x: 0.0063704625, y: -0.6792101, z: -0.005911192, w: -0.73389244}
-  m_LocalPosition: {x: -22.484453, y: 1.6443559, z: 346.273}
-  m_LocalScale: {x: 1, y: 0.8000001, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 96125293}
-  - {fileID: 345104103}
-  - {fileID: 314597122}
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 83.982, z: 0}
 --- !u!1 &626512377
 GameObject:
   m_ObjectHideFlags: 0
@@ -34923,7 +33944,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 5391b23b2fb025b4286206a40eb2f92e, type: 3}
       propertyPath: m_RootOrder
-      value: 15
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 5391b23b2fb025b4286206a40eb2f92e, type: 3}
       propertyPath: m_LocalPosition.x
@@ -37106,160 +36127,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 400000, guid: 5867990de5f59415ebd61940a40606b9, type: 3}
   m_PrefabInstance: {fileID: 683738650}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &683983725
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 683983726}
-  - component: {fileID: 683983728}
-  - component: {fileID: 683983727}
-  m_Layer: 0
-  m_Name: UICamera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &683983726
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 683983725}
-  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: 70695017}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &683983727
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 683983725}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _fillAlpha: 0
-  _downsampleFactor: 4
-  _iterations: 2
-  _blurMinSpread: 0.65
-  _blurSpread: 0.25
-  _blurIntensity: 0.3
-  _blurDirections: 0
-  _blitter: {fileID: 0}
-  _antiAliasing: 0
-  _presets:
-  - _name: Default
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Wide
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 4
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Strong
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.5
-    _blurSpread: 0.15
-    _blurIntensity: 0.325
-    _blurDirections: 0
-  - _name: Speed
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 1
-    _blurMinSpread: 0.75
-    _blurSpread: 0
-    _blurIntensity: 0.35
-    _blurDirections: 0
-  - _name: Quality
-    _fillAlpha: 0
-    _downsampleFactor: 2
-    _iterations: 3
-    _blurMinSpread: 0.5
-    _blurSpread: 0.5
-    _blurIntensity: 0.28
-    _blurDirections: 0
-  - _name: Solid 1px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 1
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
-  - _name: Solid 2px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 2
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
---- !u!20 &683983728
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 683983725}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 3
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.01
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 3
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 160
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &684166085
 GameObject:
   m_ObjectHideFlags: 0
@@ -41828,7 +40695,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 1
-  m_Camera: {fileID: 683983728}
+  m_Camera: {fileID: 0}
   m_PlaneDistance: 1
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -50943,191 +49810,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 946393762}
   m_Mesh: {fileID: 7028726235457758043, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
---- !u!1 &946645814
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 946645815}
-  - component: {fileID: 946645819}
-  - component: {fileID: 946645818}
-  - component: {fileID: 946645817}
-  - component: {fileID: 946645816}
-  m_Layer: 0
-  m_Name: toolsCamera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &946645815
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 946645814}
-  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: 70695017}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &946645816
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 946645814}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EventMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_MaxRayIntersections: 0
---- !u!114 &946645817
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 946645814}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 18b8e8515ba9d3c42bd88a47ea00d5be, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maincamera: {fileID: 70695011}
---- !u!114 &946645818
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 946645814}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8b765e0b5af3bcf4a9deb5895e477da8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _fillAlpha: 0
-  _downsampleFactor: 4
-  _iterations: 2
-  _blurMinSpread: 0.65
-  _blurSpread: 0.25
-  _blurIntensity: 0.3
-  _blurDirections: 0
-  _blitter: {fileID: 0}
-  _antiAliasing: 0
-  _presets:
-  - _name: Default
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Wide
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 4
-    _blurMinSpread: 0.65
-    _blurSpread: 0.25
-    _blurIntensity: 0.3
-    _blurDirections: 0
-  - _name: Strong
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 2
-    _blurMinSpread: 0.5
-    _blurSpread: 0.15
-    _blurIntensity: 0.325
-    _blurDirections: 0
-  - _name: Speed
-    _fillAlpha: 0
-    _downsampleFactor: 4
-    _iterations: 1
-    _blurMinSpread: 0.75
-    _blurSpread: 0
-    _blurIntensity: 0.35
-    _blurDirections: 0
-  - _name: Quality
-    _fillAlpha: 0
-    _downsampleFactor: 2
-    _iterations: 3
-    _blurMinSpread: 0.5
-    _blurSpread: 0.5
-    _blurIntensity: 0.28
-    _blurDirections: 0
-  - _name: Solid 1px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 1
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
-  - _name: Solid 2px
-    _fillAlpha: 0
-    _downsampleFactor: 1
-    _iterations: 2
-    _blurMinSpread: 1
-    _blurSpread: 0
-    _blurIntensity: 1
-    _blurDirections: 2
---- !u!20 &946645819
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 946645814}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 3
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.01
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 2
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 10368
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
 --- !u!1 &947788746
 GameObject:
   m_ObjectHideFlags: 0
@@ -55107,37 +53789,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1003913832}
   m_Mesh: {fileID: -3207871419261507583, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &1004550017
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1004550018}
-  m_Layer: 0
-  m_Name: Tools
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1004550018
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1004550017}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.7}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 70695017}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1005238178
 GameObject:
   m_ObjectHideFlags: 0
@@ -61918,6 +60569,89 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1138490608}
   m_Mesh: {fileID: 5217862126223145797, guid: 390104c5b81be974fb6a3bb9ba237943, type: 3}
+--- !u!1 &1139379417
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1139379418}
+  - component: {fileID: 1139379420}
+  - component: {fileID: 1139379419}
+  m_Layer: 0
+  m_Name: Point (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1139379418
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1139379417}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 9.15, y: -0.031, z: -13.777}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1874416179}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1139379419
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1139379417}
+  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!33 &1139379420
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1139379417}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1139616625
 GameObject:
   m_ObjectHideFlags: 0
@@ -64636,9 +63370,13 @@ PrefabInstance:
       propertyPath: m_Name
       value: CameraManager
       objectReference: {fileID: 0}
+    - target: {fileID: 2671802278030579038, guid: 4752b7ce9df9a844a988998eb3e34d4c, type: 3}
+      propertyPath: trans
+      value: 
+      objectReference: {fileID: 57346097}
     - target: {fileID: 2671802278030579039, guid: 4752b7ce9df9a844a988998eb3e34d4c, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 2671802278030579039, guid: 4752b7ce9df9a844a988998eb3e34d4c, type: 3}
       propertyPath: m_LocalPosition.x
@@ -64843,7 +63581,7 @@ PrefabInstance:
     - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: Player
       value: 
-      objectReference: {fileID: 626193689}
+      objectReference: {fileID: 57346095}
     - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: HuiFuim
       value: 
@@ -64855,7 +63593,7 @@ PrefabInstance:
     - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: toolsCam
       value: 
-      objectReference: {fileID: 946645819}
+      objectReference: {fileID: 57346098}
     - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: DianFuTex
       value: 
@@ -64883,14 +63621,22 @@ PrefabInstance:
     - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: FirstPersonController
       value: 
-      objectReference: {fileID: 626193693}
+      objectReference: {fileID: 57346096}
+    - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
+      propertyPath: interactive.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3497283653043674448, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
+      propertyPath: interactive.Array.data[0]
+      value: 
+      objectReference: {fileID: 1752107306}
     - target: {fileID: 3497283653043674449, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: m_Name
       value: GameManager (1)
       objectReference: {fileID: 0}
     - target: {fileID: 3497283653043674451, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 3497283653043674451, guid: ae8abf8c4406dc749837eda21c6b1c60, type: 3}
       propertyPath: m_LocalPosition.x
@@ -67122,7 +65868,7 @@ Transform:
   - {fileID: 1740131698}
   - {fileID: 425749015}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1218036498
 PrefabInstance:
@@ -71171,6 +69917,89 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1303676123}
   m_Mesh: {fileID: -458862213065122815, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
+--- !u!1 &1306814983
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1306814984}
+  - component: {fileID: 1306814986}
+  - component: {fileID: 1306814985}
+  m_Layer: 0
+  m_Name: Point (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1306814984
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1306814983}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.62, y: -0.031, z: -7.62}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1874416179}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1306814985
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1306814983}
+  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!33 &1306814986
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1306814983}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1309202766
 GameObject:
   m_ObjectHideFlags: 0
@@ -87155,82 +85984,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1559792740}
   m_Mesh: {fileID: 2653405120073699643, guid: f0d39a02f6856e347a9d428d34dae52c, type: 3}
---- !u!1 &1559924345
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1559924346}
-  - component: {fileID: 1559924348}
-  - component: {fileID: 1559924347}
-  m_Layer: 0
-  m_Name: Stamina
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1559924346
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1559924345}
-  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: 264494912}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 3, y: -182.99066}
-  m_SizeDelta: {x: 300, y: 10}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1559924347
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1559924345}
-  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: 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!222 &1559924348
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1559924345}
-  m_CullTransparentMesh: 0
 --- !u!1 &1562000408
 GameObject:
   m_ObjectHideFlags: 0
@@ -87327,11 +86080,35 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: waypoints.Array.size
-      value: 0
+      value: 5
       objectReference: {fileID: 0}
+    - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: waypoints.Array.data[0]
+      value: 
+      objectReference: {fileID: 1874416182}
+    - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: waypoints.Array.data[1]
+      value: 
+      objectReference: {fileID: 1874416181}
+    - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: waypoints.Array.data[2]
+      value: 
+      objectReference: {fileID: 1874416180}
+    - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: waypoints.Array.data[3]
+      value: 
+      objectReference: {fileID: 1306814984}
+    - target: {fileID: 1530819393981207668, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: waypoints.Array.data[4]
+      value: 
+      objectReference: {fileID: 1139379418}
+    - target: {fileID: 1873490784713911017, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: g1
+      value: 
+      objectReference: {fileID: 581992823}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.x
@@ -87339,7 +86116,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.177
+      value: 0.102
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.z
@@ -87376,7 +86153,11 @@ PrefabInstance:
     - target: {fileID: 8036840173969310372, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: game
       value: 
-      objectReference: {fileID: 626193697}
+      objectReference: {fileID: 57346097}
+    - target: {fileID: 8036840173969310372, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: dialogue
+      value: 
+      objectReference: {fileID: 581992823}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
 --- !u!1 &1563087995 stripped
@@ -96776,10 +95557,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3191021980637115612, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 4358485102403047296, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
       propertyPath: m_Name
       value: "\u5355\u76F8_\u65E0\u4E92\u611F\u5668_\u65E0\u5149\u4F0F"
       objectReference: {fileID: 0}
+    - target: {fileID: 5762707488701844170, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5922985591427733427, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 6996244979491317297, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
 --- !u!4 &1752107305 stripped
@@ -96787,6 +95584,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1281350692733807052, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
   m_PrefabInstance: {fileID: 1752107304}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1752107306 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6340578653018048517, guid: 0e90fa63ba3e56749b502a9a4e00b64f, type: 3}
+  m_PrefabInstance: {fileID: 1752107304}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1752817322
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -103725,6 +102527,107 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1870847376}
   m_Mesh: {fileID: 8877846732087430699, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
+--- !u!1001 &1874416178
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 7960679610476500940, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679610476500940, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.77
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611115337252, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.88
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611115337252, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105292, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_Name
+      value: WayPoints
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -9.11
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.148
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 323.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611492082760, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 8.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7960679611492082760, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -4.24
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+--- !u!4 &1874416179 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7960679611374105293, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+  m_PrefabInstance: {fileID: 1874416178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1874416180 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7960679611492082760, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+  m_PrefabInstance: {fileID: 1874416178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1874416181 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7960679611115337252, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+  m_PrefabInstance: {fileID: 1874416178}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1874416182 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7960679610476500940, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+  m_PrefabInstance: {fileID: 1874416178}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1874457002
 GameObject:
   m_ObjectHideFlags: 0
@@ -105984,6 +104887,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8978250623430911333, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8978250623430911352, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+      propertyPath: trans
+      value: 
+      objectReference: {fileID: 57346097}
     - target: {fileID: 8978250624421430162, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
       propertyPath: m_Name
       value: OnCanvas
@@ -105998,7 +104909,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8978250624421430166, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
       propertyPath: m_RootOrder
-      value: 13
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 8978250624421430166, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
       propertyPath: m_AnchorMax.x
diff --git a/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity b/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计.unity
similarity index 99%
rename from SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity
rename to SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计.unity
index 12924a3f..2d87232f 100644
--- a/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity
+++ b/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计.unity
@@ -4312,11 +4312,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -4.139
+      value: -4.069
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -10.09
+      value: -12.197
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalRotation.w
diff --git a/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity.meta b/SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计.unity.meta
similarity index 100%
rename from SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计用户.unity.meta
rename to SXElectricalInspection/Assets/Scenes/室外型高供低计/室外型高供低计.unity.meta
diff --git a/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计用户.unity b/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计.unity
similarity index 99%
rename from SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计用户.unity
rename to SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计.unity
index 6b493e52..868429b7 100644
--- a/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计用户.unity
+++ b/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计.unity
@@ -17137,7 +17137,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 58.37
+      value: 58.532
       objectReference: {fileID: 0}
     - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
       propertyPath: m_LocalPosition.y
@@ -17145,7 +17145,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 338.41
+      value: 337.252
       objectReference: {fileID: 0}
     - target: {fileID: 4730729749707939082, guid: fd7bf7d1951db7d45837e40450a11ddc, type: 3}
       propertyPath: m_LocalRotation.w
@@ -59578,21 +59578,25 @@ PrefabInstance:
       propertyPath: waypoints.Array.data[3]
       value: 
       objectReference: {fileID: 992012207}
+    - target: {fileID: 1873490784713911017, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
+      propertyPath: g1
+      value: 
+      objectReference: {fileID: 850703931}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_RootOrder
       value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 58.568
+      value: 58.569
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.181
+      value: 0.093
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 341.929
+      value: 342.238
       objectReference: {fileID: 0}
     - target: {fileID: 2194731364714483401, guid: 6e9427575a5fea94ead87af117effe45, type: 3}
       propertyPath: m_LocalRotation.w
@@ -68852,7 +68856,7 @@ MeshRenderer:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 992012206}
-  m_Enabled: 1
+  m_Enabled: 0
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -83656,6 +83660,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: -2.093
       objectReference: {fileID: 0}
+    - target: {fileID: 7960679610476500941, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7960679611115337252, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
       propertyPath: m_LocalPosition.x
       value: -3.116
@@ -83664,6 +83672,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: -1.149
       objectReference: {fileID: 0}
+    - target: {fileID: 7960679611115337253, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7960679611374105292, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
       propertyPath: m_Name
       value: WayPoints
@@ -83720,6 +83732,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0.895
       objectReference: {fileID: 0}
+    - target: {fileID: 7960679611492082761, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 86c36a10c719f1b4f9db8f97740f860d, type: 3}
 --- !u!4 &1173306830 stripped
@@ -103048,6 +103064,14 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8978250623430911333, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+      propertyPath: m_Name
+      value: "\u6536\u56DE"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8978250623430911333, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8978250624421430162, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
       propertyPath: m_Name
       value: OnCanvas
@@ -103136,6 +103160,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8978250625156820819, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b3f4df6faf51bac478652e7e0aa2b512, type: 3}
 --- !u!1 &1454996775 stripped
@@ -152440,6 +152468,22 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5114093391544486368, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5114093392494344435, guid: 91e6058f02f8745459cf701dc320fd82, type: 3}
       propertyPath: m_Name
       value: ladderPos
@@ -155145,6 +155189,18 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u7535\u7EBF\u6746-\u9AD8\u538B"
       objectReference: {fileID: 0}
+    - target: {fileID: 720621513189304380, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 805963651716084125, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 1414724816123219656, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 1449621618336171357, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_AA2"
@@ -155153,18 +155209,78 @@ PrefabInstance:
       propertyPath: selChildName
       value: "\u7528\u7535_BA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 1845557385194524801, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 1861846161457238796, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 2190010506225839555, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_CA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 2198314697449573446, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2395303408719195498, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2581534194450743039, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3279334675836538692, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3430818456542731002, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3526413907430538486, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4570084968712821754, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 4673424770303825621, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: g1
+      value: 
+      objectReference: {fileID: 716420606400251999}
+    - target: {fileID: 4673424770303825621, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA3"
+      objectReference: {fileID: 0}
     - target: {fileID: 4797098137339101998, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_CA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 5139717895155241705, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5299068766435687800, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5443605320128449044, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 5837186607582808079, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
       propertyPath: selChildName
       value: "\u7528\u7535_BA2"
       objectReference: {fileID: 0}
+    - target: {fileID: 5846001382694744571, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
     - target: {fileID: 5893981508350512868, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -155213,6 +155329,26 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5948804343269878323, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7054410357581551140, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7345326101414089909, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_BA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 7791014022139435227, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_AA2"
+      objectReference: {fileID: 0}
+    - target: {fileID: 8613767990833624184, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+      propertyPath: selChildName
+      value: "\u7528\u7535_CA2"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
 --- !u!1 &716420606400251998 stripped
@@ -155220,6 +155356,11 @@ GameObject:
   m_CorrespondingSourceObject: {fileID: 5893981508350512868, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
   m_PrefabInstance: {fileID: 716420606400251997}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &716420606400251999 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2702006292506422886, guid: 5486bdd875634a341a7ee9d5e50a7c61, type: 3}
+  m_PrefabInstance: {fileID: 716420606400251997}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &716729920141992819
 Transform:
   m_ObjectHideFlags: 0
diff --git a/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计用户.unity.meta b/SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计.unity.meta
similarity index 100%
rename from SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计用户.unity.meta
rename to SXElectricalInspection/Assets/Scenes/室外型高供高计/室外型高供高计.unity.meta
diff --git a/SXElectricalInspection/Assets/Scenes/工具间场景.unity b/SXElectricalInspection/Assets/Scenes/工具间场景.unity
index 14076a30..f5f1e49f 100644
--- a/SXElectricalInspection/Assets/Scenes/工具间场景.unity
+++ b/SXElectricalInspection/Assets/Scenes/工具间场景.unity
@@ -18650,7 +18650,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_TargetDisplay: 0
 --- !u!114 &851677357
 MonoBehaviour:
diff --git a/SXElectricalInspection/Assets/Script/Timers.cs b/SXElectricalInspection/Assets/Script/Timers.cs
index e48a1a0c..fbafeb3f 100644
--- a/SXElectricalInspection/Assets/Script/Timers.cs
+++ b/SXElectricalInspection/Assets/Script/Timers.cs
@@ -16,12 +16,16 @@ public class Timers : MonoBehaviour
     public UnityEvent timeOver;
 
     // Start �����ڽű�����ʱ���У����ڳ�ʼ����ʱ��
-    void Start()
+    public void SetTime(int _time)
     {
-        StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/Timer.config"));
+        //StartCoroutine(LoadJSON(Application.streamingAssetsPath + "/Timer.config"));
+        limitTime = _time * 60;
         guiTimer.text = StringHelper.GetCountDownStr((int)countTime);
     }
 
+
+
+
     // ���м�ʱ��
     public void RunTimer()
     {
@@ -57,7 +61,7 @@ public class Timers : MonoBehaviour
         if (countTime < limitTime)
         {
             countTime += Time.deltaTime;
-            guiTimer.text = "����ʱ�䣺"+StringHelper.GetCountDownStr((int)countTime);
+            guiTimer.text = "����ʱ�䣺" + StringHelper.GetCountDownStr((int)countTime);
         }
         else
         {
diff --git a/SXElectricalInspection/Assets/StreamingAssets/Message.json b/SXElectricalInspection/Assets/StreamingAssets/Message.json
index 7097f3fb..a7fb94fb 100644
--- a/SXElectricalInspection/Assets/StreamingAssets/Message.json
+++ b/SXElectricalInspection/Assets/StreamingAssets/Message.json
@@ -1,5 +1,5 @@
 {
-  "scenename": "室外型高供高计",
+  "scenename": "室外型高供低计",
   "questbooks": "任务书",
   "userinformation": "用户基本信息",
   "userList": [
diff --git a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
index 535974a3..310c7e7f 100644
--- a/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
+++ b/SXElectricalInspection/Assets/StreamingAssets/build_info.txt
@@ -1 +1 @@
-Build from DESKTOP-G8EB9JK at 2024/6/11 17:17:31
\ No newline at end of file
+Build from ADAM at 2024/6/12 19:52:01
\ No newline at end of file
diff --git a/SXElectricalInspection/Assets/StreamingAssets/info.ini b/SXElectricalInspection/Assets/StreamingAssets/info.ini
index d4d2dd36..457d3077 100644
--- a/SXElectricalInspection/Assets/StreamingAssets/info.ini
+++ b/SXElectricalInspection/Assets/StreamingAssets/info.ini
@@ -1 +1 @@
-2024-05-15 17:17:01#'sxfz://;1(0:练习，1:考试);6（试卷id/练习id）;581（用户信息userId）;1（实训分类id）;90(考试时长);/'|
\ No newline at end of file
+2024-05-15 17:17:01#'sxfz://;1;6;581;1;90;/'|
\ No newline at end of file
diff --git a/SXElectricalInspection/ProjectSettings/EditorBuildSettings.asset b/SXElectricalInspection/ProjectSettings/EditorBuildSettings.asset
index 8fd36a9c..bdd13b8b 100644
--- a/SXElectricalInspection/ProjectSettings/EditorBuildSettings.asset
+++ b/SXElectricalInspection/ProjectSettings/EditorBuildSettings.asset
@@ -15,7 +15,7 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u5DE5\u5177\u95F4\u573A\u666F.unity"
     guid: 9c3f2fccc37312b468a01a18ac50fcd9
   - enabled: 1
-    path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1\u7528\u6237.unity"
+    path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u4F4E\u8BA1.unity"
     guid: b9e12f554e1070f419af46ba6716ac76
   - enabled: 1
     path: "Assets/Scenes/\u5BA4\u5185\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5185\u578B\u9AD8\u4F9B\u9AD8\u8BA1.unity"
@@ -24,9 +24,9 @@ EditorBuildSettings:
     path: "Assets/Scenes/\u5BA4\u5916\u578B\u4F4E\u538B\u516C\u914D\u53D8\u7528\u6237/\u5BA4\u5916\u578B\u4F4E\u538B\u516C\u914D\u53D8.unity"
     guid: 87fc4562e9d0bff4b8dcb5b8005bd4b1
   - enabled: 1
-    path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1\u7528\u6237.unity"
+    path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u9AD8\u8BA1.unity"
     guid: f9f28607361ada64e92ffcb6097957b3
   - enabled: 1
-    path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1\u7528\u6237.unity"
+    path: "Assets/Scenes/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1/\u5BA4\u5916\u578B\u9AD8\u4F9B\u4F4E\u8BA1.unity"
     guid: 68718b0a532bef14ab2a5a212be4c8a3
   m_configObjects: {}
diff --git a/SXElectricalInspection/ProjectSettings/TagManager.asset b/SXElectricalInspection/ProjectSettings/TagManager.asset
index 8f1e1f2e..575a94c4 100644
--- a/SXElectricalInspection/ProjectSettings/TagManager.asset
+++ b/SXElectricalInspection/ProjectSettings/TagManager.asset
@@ -16,6 +16,7 @@ TagManager:
   - FuAnBiao
   - AllTools
   - UICamera
+  - NPC
   layers:
   - Default
   - TransparentFX