From 27c356ba28214e13732c399444a8ebc78eddb208 Mon Sep 17 00:00:00 2001
From: liuyu <272912176@qq.com>
Date: Fri, 6 Sep 2024 08:18:31 +0800
Subject: [PATCH] 111

---
 .../Scripts/Project/Manager/ReconnectMgr.cs   |  9 ++-
 Assets/StreamingAssets/realtimeStat.json      | 58 +++++++++----------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/Assets/Scripts/Project/Manager/ReconnectMgr.cs b/Assets/Scripts/Project/Manager/ReconnectMgr.cs
index c175a63..459cff5 100644
--- a/Assets/Scripts/Project/Manager/ReconnectMgr.cs
+++ b/Assets/Scripts/Project/Manager/ReconnectMgr.cs
@@ -204,9 +204,12 @@ public class ReconnectMgr : SingletonMono<ReconnectMgr>
                     if (item.triggerName == ret.triggerName)
                     {
                         item.gameObject.SetActive(true);
-                        item.transform.localPosition = ret.selfPosInScene;
-                        item.transform.localEulerAngles = ret.selfRotInScene;
-                        item.LoadCurrentTriggerStat(ret.triggerInfo);
+                        if (item.gameObject.GetComponent<Tool_SelectComponent>() == null)
+                        {
+                            item.transform.localPosition = ret.selfPosInScene;
+                            item.transform.localEulerAngles = ret.selfRotInScene;
+                            item.LoadCurrentTriggerStat(ret.triggerInfo);
+                        }
                         break;
                     }
                 }
diff --git a/Assets/StreamingAssets/realtimeStat.json b/Assets/StreamingAssets/realtimeStat.json
index 4014236..8cd4f18 100644
--- a/Assets/StreamingAssets/realtimeStat.json
+++ b/Assets/StreamingAssets/realtimeStat.json
@@ -112,10 +112,34 @@
       "isDone": false
     }
   ],
-  "allToolAndMaterial": [],
+  "allToolAndMaterial": [
+    "剥线钳",
+    "验电笔"
+  ],
   "allWear": [],
   "sceneName": "04_ToolMaterialScene",
-  "currentSceneTools": [],
+  "currentSceneTools": [
+    {
+      "toolId": 5002,
+      "triggerID": 5002,
+      "toolName": "剥线钳",
+      "selfPosInToolRoom": {
+        "x": -3.1648,
+        "y": 0.217400074,
+        "z": -0.189
+      }
+    },
+    {
+      "toolId": 5004,
+      "triggerID": 5004,
+      "toolName": "验电笔",
+      "selfPosInToolRoom": {
+        "x": -3.21036649,
+        "y": 1.1167,
+        "z": -0.173
+      }
+    }
+  ],
   "currentSceneTriggers": [
     {
       "triggerID": 0,
@@ -207,36 +231,6 @@
       },
       "triggerInfo": ""
     },
-    {
-      "triggerID": 0,
-      "triggerName": "验电笔",
-      "selfPosInScene": {
-        "x": -3.21036649,
-        "y": 1.1167,
-        "z": -0.173
-      },
-      "selfRotInScene": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "triggerInfo": ""
-    },
-    {
-      "triggerID": 0,
-      "triggerName": "",
-      "selfPosInScene": {
-        "x": -3.1648,
-        "y": 0.217400074,
-        "z": -0.189
-      },
-      "selfRotInScene": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-      },
-      "triggerInfo": ""
-    },
     {
       "triggerID": 5012,
       "triggerName": "镜子",