From 6002315ece49f73532229c6dc2be5df5ec28d3fa Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 14 Sep 2023 09:54:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=85=B7=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tools => Resources/New/Models}/验电笔.prefab    |  12 ++++++------
 .../New/Models}/验电笔.prefab.meta                  |   0
 .../ToolIcon => Resources/New/UI}/验电笔.png        | Bin
 .../ToolIcon => Resources/New/UI}/验电笔.png.meta   |   0
 .../Assets/Scenes/工具间场景.unity                  |   4 ----
 5 files changed, 6 insertions(+), 10 deletions(-)
 rename Electrical_inspectionCompetitionSystem/Assets/{Prefab/Tools => Resources/New/Models}/验电笔.prefab (99%)
 rename Electrical_inspectionCompetitionSystem/Assets/{Prefab/Tools => Resources/New/Models}/验电笔.prefab.meta (100%)
 rename Electrical_inspectionCompetitionSystem/Assets/{MainUI/Adam/用电竞赛切图/ToolIcon => Resources/New/UI}/验电笔.png (100%)
 rename Electrical_inspectionCompetitionSystem/Assets/{MainUI/Adam/用电竞赛切图/ToolIcon => Resources/New/UI}/验电笔.png.meta (100%)

diff --git a/Electrical_inspectionCompetitionSystem/Assets/Prefab/Tools/验电笔.prefab b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab
similarity index 99%
rename from Electrical_inspectionCompetitionSystem/Assets/Prefab/Tools/验电笔.prefab
rename to Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab
index 75ea4c9b..f2ab5577 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Prefab/Tools/验电笔.prefab
+++ b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab
@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 1042915213259079038}
   - component: {fileID: 1042915213259079036}
   - component: {fileID: 1042915213259079039}
-  m_Layer: 11
+  m_Layer: 0
   m_Name: Cube
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -93,7 +93,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4228206943469040965}
   - component: {fileID: 4228206943469040964}
-  m_Layer: 11
+  m_Layer: 0
   m_Name: Audio Source
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -225,7 +225,7 @@ GameObject:
   - component: {fileID: 4228206944499231263}
   - component: {fileID: 6545336454578547337}
   - component: {fileID: 3220441723494787463}
-  m_Layer: 11
+  m_Layer: 0
   m_Name: "\u9A8C\u7535\u7B14"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -399,7 +399,7 @@ GameObject:
   - component: {fileID: 4228206944798740710}
   - component: {fileID: 4228206944798740709}
   - component: {fileID: 4228206944798740708}
-  m_Layer: 11
+  m_Layer: 0
   m_Name: "\u7B14\u5934"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -521,7 +521,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_IsActive
@@ -603,7 +603,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_Layer
-      value: 11
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: ebabe5e4da57b8f4a8dd162633f5ccab, type: 3}
       propertyPath: m_IsActive
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Prefab/Tools/验电笔.prefab.meta b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab.meta
similarity index 100%
rename from Electrical_inspectionCompetitionSystem/Assets/Prefab/Tools/验电笔.prefab.meta
rename to Electrical_inspectionCompetitionSystem/Assets/Resources/New/Models/验电笔.prefab.meta
diff --git a/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/UI/验电笔.png
similarity index 100%
rename from Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png
rename to Electrical_inspectionCompetitionSystem/Assets/Resources/New/UI/验电笔.png
diff --git a/Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png.meta b/Electrical_inspectionCompetitionSystem/Assets/Resources/New/UI/验电笔.png.meta
similarity index 100%
rename from Electrical_inspectionCompetitionSystem/Assets/MainUI/Adam/用电竞赛切图/ToolIcon/验电笔.png.meta
rename to Electrical_inspectionCompetitionSystem/Assets/Resources/New/UI/验电笔.png.meta
diff --git a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
index ac65f5c2..98fa729e 100644
--- a/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
+++ b/Electrical_inspectionCompetitionSystem/Assets/Scenes/工具间场景.unity
@@ -3446,10 +3446,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: "\u9A8C\u7535\u7B14"
       objectReference: {fileID: 0}
-    - target: {fileID: 4228206944499231249, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4ddb83a1ed2bdd343ae14b12ba447457, type: 3}
 --- !u!4 &561617781 stripped