From a4d96b05787c79f322a1e83b7ad39be0b84d88d9 Mon Sep 17 00:00:00 2001
From: yzx <ifeijia@qq.com>
Date: Tue, 4 Jun 2024 16:18:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assembly-CSharp-Editor.csproj             |   7 ++
 .../Assembly-CSharp.csproj                    |   4 +
 .../Assets/Framework/GameLauncher.cs          |   2 +
 .../Assets/Scenes/工具间Scenes/工具间.unity   |  52 ++++----
 .../CharacterEquipBtOnClick.cs                |  24 +++-
 .../CharacterEquipWindowManager.cs            |   3 +
 .../Assets/Scripts/DataConfigManager.cs       | 119 ++++++++++++++++++
 .../Assets/Scripts/DataConfigManager.cs.meta  |   3 +
 .../ToolsPack/ToolsPackGameObjectComponent.cs |   1 +
 .../Scripts/ToolsPack/ToolsPackManager.cs     |   6 +-
 .../ToolsPackWindowItemBtComponent.cs         |   2 +
 .../ToolsPack/ToolsPackWindowManager.cs       |  24 +++-
 .../Assets/StreamingAssets/DataConfig.meta    |   8 ++
 .../DataConfig/ToolsPackData.json             |  21 ++++
 .../DataConfig/ToolsPackData.json.meta        |   7 ++
 .../SXElectricityInformationAcquisition.sln   |   8 +-
 16 files changed, 253 insertions(+), 38 deletions(-)
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs
 create mode 100644 SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs.meta
 create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig.meta
 create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json
 create mode 100644 SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json.meta

diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
index 950aaa92..43f3a127 100644
--- a/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
+++ b/SXElectricityInformationAcquisition/Assembly-CSharp-Editor.csproj
@@ -45,7 +45,14 @@
     <Analyzer Include="E:\Program Files\Unity 2022.3.22f1\Editor\Data\Tools\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Assets\HighlightPlus\Editor\HighlightProfileEditor.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\HighlightManagerEditor.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\HighlightSeeThroughOccluderEditor.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\HighlightEffectEditor.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\TransparentWithDepth.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\VRCheck.cs" />
     <Compile Include="Assets\Model\Fantastic City Generator\DayNight\Editor\DayNightEditor.cs" />
+    <Compile Include="Assets\HighlightPlus\Editor\HighlightTriggerEditor.cs" />
     <Reference Include="UnityEngine">
       <HintPath>E:\Program Files\Unity 2022.3.22f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll</HintPath>
     </Reference>
diff --git a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
index 2e400400..737bb167 100644
--- a/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
+++ b/SXElectricityInformationAcquisition/Assembly-CSharp.csproj
@@ -67,8 +67,10 @@
     <Compile Include="Assets\HighlightPlus\Scripts\InputProxy.cs" />
     <Compile Include="Assets\Scripts\ToolsPack\ToolsPackWindowItemBtComponent.cs" />
     <Compile Include="Assets\Model\Fantastic City Generator\DayNight\ShiftAtRuntime.cs" />
+    <Compile Include="Assets\Scripts\CharacterEquipWindow\CharacterEquipBtOnClick.cs" />
     <Compile Include="Assets\Model\Fantastic City Generator\Traffic System\DataSpawn.cs" />
     <Compile Include="Assets\HighlightPlus\Scripts\HighlightSeeThroughOccluder.cs" />
+    <Compile Include="Assets\Scripts\DataConfigManager.cs" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightOverlay.shader" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightOccluder.shader" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\CustomVertexTransform.cginc" />
@@ -89,9 +91,11 @@
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightSolidColor.shader" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightComposeGlow.shader" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightAddDepthClip.shader" />
+    <None Include="Assets\StreamingAssets\DataConfig\ToolsPackData.json" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightComposeOutline.shader" />
     <None Include="Assets\HighlightPlus\Resources\HighlightPlus\HighlightOutline.shader" />
     <None Include="Assets\Framework\ThirdParty\NaughtyAttributes\package.json" />
+    <None Include="Assets\Shader\PBR Material Double.shader" />
     <Reference Include="UnityEngine">
       <HintPath>E:\Program Files\Unity 2022.3.22f1\Editor\Data\Managed\UnityEngine\UnityEngine.dll</HintPath>
     </Reference>
diff --git a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
index 6b90be89..acfb96e4 100644
--- a/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
+++ b/SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs
@@ -64,6 +64,8 @@ public class GameLauncher : MonoBehaviour
         MotionEngine.CreateModule<ToolsPackManager>();
         //����װ��
         MotionEngine.CreateModule<CharacterEquipWindowManager>();
+        //���������ļ�
+        MotionEngine.CreateModule<DataConfigManager>();
     }
 
     private void HandleMotionFrameworkLog(ELogLevel logLevel, string log)
diff --git a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
index 86e62b8c..6da47071 100644
--- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+  m_IndirectSpecularColor: {r: 0.1802841, g: 0.22571436, b: 0.30692357, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -294,7 +294,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &246443825
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2817,37 +2817,16 @@ GameObject:
   - component: {fileID: 2108215486}
   - component: {fileID: 2108215485}
   - component: {fileID: 2108215484}
-  - component: {fileID: 2108215483}
+  - component: {fileID: 2108215489}
   - component: {fileID: 2108215488}
   - component: {fileID: 2108215487}
   m_Layer: 0
-  m_Name: "\u4E07\u7528\u8868"
+  m_Name: "\u96C6\u4E2D\u5668"
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!65 &2108215483
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2108215482}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &2108215484
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -2907,7 +2886,7 @@ Transform:
   m_GameObject: {fileID: 2108215482}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.14, y: 0.73, z: -2.95}
+  m_LocalPosition: {x: 1.235, y: 0.73, z: -2.95}
   m_LocalScale: {x: 0.3636, y: 0.3636, z: 0.3636}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3093,6 +3072,27 @@ MonoBehaviour:
   hitFxFadeOutDuration: 0.25
   hitFxColor: {r: 1, g: 1, b: 1, a: 1}
   hitFxRadius: 0.5
+--- !u!65 &2108215489
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2108215482}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8696923547104612602
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
index 23197362..1e94fbb9 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipBtOnClick.cs
@@ -1,9 +1,29 @@
-using UnityEngine;
+using System;
+using MotionFramework;
+using UnityEngine;
+using UnityEngine.UI;
 
 namespace DefaultNamespace
 {
     public class CharacterEquipBtOnClick : MonoBehaviour
     {
-        
+        private bool isChange = false;
+
+        public void Start()
+        {
+            this.GetComponent<Button>().onClick.AddListener(delegate
+            {
+                if (isChange)
+                {
+                    isChange = false;
+                }
+                else
+                {
+                    isChange = true;
+                }
+
+                MotionEngine.GetModule<CharacterEquipWindowManager>().ChangeEquip(this.name, isChange);
+            });
+        }
     }
 }
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs
index 85815783..311eb794 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/CharacterEquipWindow/CharacterEquipWindowManager.cs
@@ -31,14 +31,17 @@ namespace DefaultNamespace
 
         public void OnUpdate()
         {
+            
         }
 
         public void OnDestroy()
         {
+            
         }
 
         public void OnGUI()
         {
+            
         }
 
         public void ChangeEquip(string equipName, bool isChange)
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs
new file mode 100644
index 00000000..6fba0dae
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs
@@ -0,0 +1,119 @@
+using System.Collections.Generic;
+using System.IO;
+using MotionFramework;
+using Newtonsoft.Json.Linq;
+using UnityEngine;
+
+namespace DefaultNamespace
+{
+    public class DataConfigManager : ModuleSingleton<DataConfigManager>, IModule
+    {
+        private Dictionary<string, List<string>> toolsPackDict;
+
+
+        public void OnCreate(object createParam)
+        {
+            LoadConfig();
+        }
+
+        public void OnUpdate()
+        {
+        }
+
+        public void OnDestroy()
+        {
+        }
+
+        public void OnGUI()
+        {
+            
+        }
+
+        public List<string> GetToolsPackData(string toolsName)
+        {
+            foreach (var v in toolsPackDict)
+            {
+                if (v.Key == toolsName)
+                {
+                    if (v.Value.Count > 0)
+                    {
+                        return v.Value;
+                    }
+                    else
+                    {
+                        return null;
+                    }
+                }
+            }
+            return null;
+        }
+
+
+
+        private void LoadConfig()
+        {
+            string path = Application.streamingAssetsPath + "/DataConfig/ToolsPackData.json";
+            if (File.Exists(path))
+            {
+                string jsonContent = File.ReadAllText(path);
+                JObject jsonObj = JObject.Parse(jsonContent);
+
+                toolsPackDict = new Dictionary<string, List<string>>();
+
+                var tools = jsonObj["tools"] as JObject;
+                if (tools != null)
+                {
+                    ParseTools(tools["models"] as JArray);
+                }
+
+                // Debug.Log("工具和子项:");
+                // foreach (var item in toolsDict)
+                // {
+                //     Debug.Log($"{item.Key}:");
+                //     foreach (var subItem in item.Value)
+                //     {
+                //         Debug.Log($"  - {subItem}");
+                //     }
+                // }
+            }
+            else
+            {
+            }
+        }
+
+        void ParseTools(JArray models)
+        {
+            foreach (var model in models)
+            {
+                if (model is JValue)
+                {
+                    string modelName = model.ToString();
+                    if (!toolsPackDict.ContainsKey(modelName))
+                    {
+                        toolsPackDict[modelName] = new List<string>();
+                    }
+                }
+                else if (model is JObject subTool)
+                {
+                    string subToolName = subTool["name"].ToString();
+                    var subItems = subTool["models"] ?? subTool["items"];
+                    List<string> subItemList = new List<string>();
+                    if (subItems is JArray subArray)
+                    {
+                        foreach (var subItem in subArray)
+                        {
+                            subItemList.Add(subItem.ToString());
+                        }
+                    }
+
+                    toolsPackDict[subToolName] = subItemList;
+                    if (subItems is JArray)
+                    {
+                        continue;
+                    }
+                    ParseTools(subItems as JArray); // 递归解析子对象
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs.meta b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs.meta
new file mode 100644
index 00000000..8c22136d
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/DataConfigManager.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0db1b1ab020c45c48e2d018291287430
+timeCreated: 1717487105
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
index ce94499c..31cffe87 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs
@@ -1,4 +1,5 @@
 using System;
+using DefaultNamespace;
 using HighlightPlus;
 using MotionFramework;
 using UnityEngine;
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
index 82da033e..906c92f3 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackManager.cs
@@ -1,7 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using MotionFramework;
 using MotionFramework.Scripts.Runtime.Engine.Engine.Network.WebRequest;
+using Newtonsoft.Json.Linq;
 using UnityEngine;
 
 public enum ToolsPackScene
@@ -15,9 +17,10 @@ public enum ToolsPackScene
 /// </summary>
 public  class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
 {   
+    
     private Dictionary<string, GameObject> _toolsPack;
     private Dictionary<string, Texture2D> _toolsPackWindowBtImage; //工具窗口下的按钮图集
-    private GameObject _toolsPackWindow;
+    private GameObject _toolsPackWindow;   
     private GameObject _toolsPackWindowBt;
     private Transform _canvas;
     
@@ -161,4 +164,5 @@ public  class ToolsPackManager : ModuleSingleton<ToolsPackManager>, IModule
     {
         _toolsPackScene = toolsPackScene;
     }
+   
 }
\ No newline at end of file
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
index 3c29ab2e..2960f97c 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs
@@ -16,6 +16,8 @@ namespace ToolsPack
         {
             closeBt.GetComponent<Button>().onClick.AddListener(delegate
             {
+                (string str, GameObject toolsGame) = MotionEngine.GetModule<ToolsPackManager>().GetToolsPack(this.name);
+                toolsGame.SetActive(true);
                 MotionEngine.GetModule<ToolsPackManager>().DeleteToolsPack(this.name);
                 Destroy(this.gameObject);
             });
diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
index 27379eeb..a0596523 100644
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using DefaultNamespace;
 using MotionFramework;
 using UnityEngine;
 using UnityEngine.Serialization;
@@ -12,9 +13,9 @@ namespace ToolsPack
     public class ToolsPackWindowManager : MonoBehaviour
     {
         private List<string> _toolsNames;
-        
+
         [SerializeField] private Transform content;
-        
+
         public void OnEnable()
         {
             int count = content.childCount;
@@ -29,9 +30,22 @@ namespace ToolsPack
             GameObject bt = MotionEngine.GetModule<ToolsPackManager>().GetToolsPackWindowBt();
             foreach (var v in _toolsNames)
             {
-                ToolsPackWindowItemBtComponent btComponent= Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
-                btComponent.name = v;
-                btComponent.Init(v);
+                List<string> li = MotionEngine.GetModule<DataConfigManager>().GetToolsPackData(v);
+                if (li == null)
+                {
+                    ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                    btComponent.name = v;
+                    btComponent.Init(v);
+                }
+                else
+                {
+                    foreach (var to in li)
+                    {
+                        ToolsPackWindowItemBtComponent btComponent = Instantiate(bt, content, false).GetComponent<ToolsPackWindowItemBtComponent>();
+                        btComponent.name = to;
+                        btComponent.Init(to);
+                    }
+                }
             }
         }
     }
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig.meta b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig.meta
new file mode 100644
index 00000000..84eacef4
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd0accf636c2ebd449947a94fc2cbab9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json
new file mode 100644
index 00000000..863f4baa
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json
@@ -0,0 +1,21 @@
+{
+  "tools": {
+    "name": "工具箱",
+    "models": [
+      "绝缘螺丝刀",
+      "老虎钳",
+      "绝缘胶带",
+      "验电笔",
+      "工作票",
+      "盒装螺丝",
+      "盒装封印",
+      {
+        "name": "集中器",
+        "models": [
+          "集中器无盖模型",
+          "集中器盖子模型"
+        ]
+      }
+    ]
+  }
+}
diff --git a/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json.meta b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json.meta
new file mode 100644
index 00000000..68fc9224
--- /dev/null
+++ b/SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/ToolsPackData.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79997ac69d478744aa563a33581aa3c5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln
index 25eabc6a..2ed176b7 100644
--- a/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln
+++ b/SXElectricityInformationAcquisition/SXElectricityInformationAcquisition.sln
@@ -19,12 +19,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MotionFramework", "MotionFr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{4d0abe3e-2eff-5141-cb61-b756eb38b78b}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{76df232d-8837-10f6-4eb2-65d4b80d2c66}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{c5ee6955-1356-fe62-795c-07a46b224741}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{bae393ca-b3f2-035c-979c-ff7e0d806194}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{db9a3453-d36d-6192-985b-3e8cc856b5bd}"
 EndProject
 Global
@@ -50,12 +50,12 @@ Global
 		{27e42685-adfb-0aa0-06e3-f5025d183005}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4d0abe3e-2eff-5141-cb61-b756eb38b78b}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{76df232d-8837-10f6-4eb2-65d4b80d2c66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{c5ee6955-1356-fe62-795c-07a46b224741}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{bae393ca-b3f2-035c-979c-ff7e0d806194}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{db9a3453-d36d-6192-985b-3e8cc856b5bd}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection